From: dirk <dirk@git.imagemagick.org>
Date: Wed, 24 Sep 2014 05:04:01 +0000 (+0000)
Subject: Fixed compiler warnings.
X-Git-Tag: 7.0.1-0~1980
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=130da8409cb096ee6288a3ae7684ee5c7a328b0c;p=imagemagick

Fixed compiler warnings.
---

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 9df2b1119..e46af3f96 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -324,7 +324,10 @@ Magick::Quantum Magick::Color::quantumRed(void) const
 }
 
 Magick::Color::Color(PixelInfo* rep_,PixelType pixelType_)
-  : _pixel(rep_),_pixelOwn(false),_isValid(true),_pixelType(pixelType_)
+  : _pixel(rep_),
+    _isValid(true),
+    _pixelOwn(false),
+    _pixelType(pixelType_)
 {
 }
 
diff --git a/Magick++/lib/Magick++/Statistic.h b/Magick++/lib/Magick++/Statistic.h
index dad76dffb..5a18121f1 100644
--- a/Magick++/lib/Magick++/Statistic.h
+++ b/Magick++/lib/Magick++/Statistic.h
@@ -203,9 +203,9 @@ namespace Magick
     double _skewness;
     double _standardDeviation;
     double _sum;
-    double _sumSquared;
     double _sumCubed;
     double _sumFourthPower;
+    double _sumSquared;
     double _variance;
   };
 
diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index ccca4dc7b..2bef4d420 100644
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -153,8 +153,8 @@ void Magick::PixelData::init(Magick::Image &image_,const ::ssize_t x_,
   _length=0;
   _size=0;
   if ((x_ < 0) || (width_ == 0) || (y_ < 0) || (height_ == 0) ||
-      (x_ > image_.columns()) || ((width_ + x_) > (::ssize_t)image_.columns())
-      || (y_ > image_.rows()) || ((height_ + y_) > (::ssize_t)image_.rows())
+      (x_ > image_.columns()) || ((width_ + x_) > image_.columns())
+      || (y_ > image_.rows()) || ((height_ + y_) > image_.rows())
       || (map_.length() == 0))
     return;
 
diff --git a/Magick++/lib/Statistic.cpp b/Magick++/lib/Statistic.cpp
index 1de723c1a..f19f6c851 100644
--- a/Magick++/lib/Statistic.cpp
+++ b/Magick++/lib/Statistic.cpp
@@ -15,8 +15,8 @@
 using namespace std;
 
 Magick::ChannelMoments::ChannelMoments(void)
-  : _huInvariants(8),
-    _channel(SyncPixelChannel),
+  : _channel(SyncPixelChannel),
+    _huInvariants(8),
     _centroidX(0.0),
     _centroidY(0.0),
     _ellipseAxisX(0.0),
@@ -28,8 +28,8 @@ Magick::ChannelMoments::ChannelMoments(void)
 }
 
 Magick::ChannelMoments::ChannelMoments(const ChannelMoments &channelMoments_)
-  : _huInvariants(channelMoments_._huInvariants),
-    _channel(channelMoments_._channel),
+  : _channel(channelMoments_._channel),
+    _huInvariants(channelMoments_._huInvariants),
     _centroidX(channelMoments_._centroidX),
     _centroidY(channelMoments_._centroidY),
     _ellipseAxisX(channelMoments_._ellipseAxisX),
@@ -99,8 +99,8 @@ bool Magick::ChannelMoments::isValid() const
 
 Magick::ChannelMoments::ChannelMoments(const PixelChannel channel_,
   const MagickCore::ChannelMoments *channelMoments_)
-  : _huInvariants(),
-    _channel(channel_),
+  : _channel(channel_),
+    _huInvariants(),
     _centroidX(channelMoments_->centroid.x),
     _centroidY(channelMoments_->centroid.y),
     _ellipseAxisX(channelMoments_->ellipse_axis.x),