From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 29 May 2010 23:39:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9361
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca13f4cea30f26037dc9e9e65ca7666efb492a38;p=imagemagick

---

diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp
index 62fe799f1..0cecc974d 100644
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 #define AbsoluteValue(x)  ((x) < 0 ? -(x) : (x))
 
-int Magick::operator == ( const Magick::Geometry& left_,
+ssize_t Magick::operator == ( const Magick::Geometry& left_,
 			  const Magick::Geometry& right_ )
 {
   return (
@@ -39,17 +39,17 @@ int Magick::operator == ( const Magick::Geometry& left_,
 	  ( left_.less()      == right_.less() )
 	  );
 }
-int Magick::operator != ( const Magick::Geometry& left_,
+ssize_t Magick::operator != ( const Magick::Geometry& left_,
 			  const Magick::Geometry& right_ )
 {
   return ( ! (left_ == right_) );
 }
-int Magick::operator >  ( const Magick::Geometry& left_,
+ssize_t Magick::operator >  ( const Magick::Geometry& left_,
 			  const Magick::Geometry& right_ )
 {
   return ( !( left_ < right_ ) && ( left_ != right_ ) );
 }
-int Magick::operator <  ( const Magick::Geometry& left_,
+ssize_t Magick::operator <  ( const Magick::Geometry& left_,
 			  const Magick::Geometry& right_ )
 {
   return (
@@ -58,12 +58,12 @@ int Magick::operator <  ( const Magick::Geometry& left_,
 	  ( right_.width() * right_.height() )
 	  );
 }
-int Magick::operator >= ( const Magick::Geometry& left_,
+ssize_t Magick::operator >= ( const Magick::Geometry& left_,
 			  const Magick::Geometry& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-int Magick::operator <= ( const Magick::Geometry& left_,
+ssize_t Magick::operator <= ( const Magick::Geometry& left_,
 			  const Magick::Geometry& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
diff --git a/Magick++/lib/Magick++/Geometry.h b/Magick++/lib/Magick++/Geometry.h
index 62e61df18..b8370322d 100644
--- a/Magick++/lib/Magick++/Geometry.h
+++ b/Magick++/lib/Magick++/Geometry.h
@@ -32,8 +32,8 @@ namespace Magick
     
     Geometry ( size_t width_,
 	       size_t height_,
-	       ssize_t xOff_ = 0,
-	       ssize_t yOff_ = 0,
+	       size_t xOff_ = 0,
+	       size_t yOff_ = 0,
 	       bool xNegative_ = false,
 	       bool yNegative_ = false );
     Geometry ( const std::string &geometry_ );
@@ -51,12 +51,12 @@ namespace Magick
     size_t  height ( void ) const;
     
     // X offset from origin
-    void          xOff ( ssize_t xOff_ );
-    ssize_t  xOff ( void ) const;
+    void          xOff ( size_t xOff_ );
+    size_t  xOff ( void ) const;
     
     // Y offset from origin
-    void          yOff ( ssize_t yOff_ );
-    ssize_t  yOff ( void ) const;
+    void          yOff ( size_t yOff_ );
+    size_t  yOff ( void ) const;
     
     // Sign of X offset negative? (X origin at right)
     void          xNegative ( bool xNegative_ );
@@ -109,8 +109,8 @@ namespace Magick
   private:
     size_t  _width;
     size_t  _height;
-    ssize_t  _xOff;
-    ssize_t  _yOff;
+    size_t  _xOff;
+    size_t  _yOff;
     bool          _xNegative;
     bool          _yNegative;
     bool          _isValid;
@@ -158,21 +158,21 @@ inline size_t Magick::Geometry::height ( void ) const
 }
 
 // X offset from origin
-inline void Magick::Geometry::xOff ( ssize_t xOff_ )
+inline void Magick::Geometry::xOff ( size_t xOff_ )
 {
   _xOff = xOff_;
 }
-inline ssize_t Magick::Geometry::xOff ( void ) const
+inline size_t Magick::Geometry::xOff ( void ) const
 {
   return _xOff;
 }
 
 // Y offset from origin
-inline void Magick::Geometry::yOff ( ssize_t yOff_ )
+inline void Magick::Geometry::yOff ( size_t yOff_ )
 {
   _yOff = yOff_;
 }
-inline ssize_t Magick::Geometry::yOff ( void ) const
+inline size_t Magick::Geometry::yOff ( void ) const
 {
   return _yOff;
 }
diff --git a/magick/feature.c b/magick/feature.c
index 9205ebefc..b756f0b6c 100644
--- a/magick/feature.c
+++ b/magick/feature.c
@@ -247,14 +247,17 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image,
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      grays[ScaleQuantumToMap(p->red)].red=ScaleQuantumToMap(p->red);
-      grays[ScaleQuantumToMap(p->green)].green=ScaleQuantumToMap(p->green);
-      grays[ScaleQuantumToMap(p->blue)].blue=ScaleQuantumToMap(p->blue);
+      grays[ScaleQuantumToMap(p->red)].red=(unsigned long)
+        ScaleQuantumToMap(p->red);
+      grays[ScaleQuantumToMap(p->green)].green=(unsigned long)
+        ScaleQuantumToMap(p->green);
+      grays[ScaleQuantumToMap(p->blue)].blue=(unsigned long)
+        ScaleQuantumToMap(p->blue);
       if (image->matte != MagickFalse)
-        grays[ScaleQuantumToMap(p->opacity)].opacity=
+        grays[ScaleQuantumToMap(p->opacity)].opacity=(unsigned long)
           ScaleQuantumToMap(p->opacity);
       if (image->colorspace == CMYKColorspace)
-        grays[ScaleQuantumToMap(indexes[x])].index=
+        grays[ScaleQuantumToMap(indexes[x])].index=(unsigned long)
           ScaleQuantumToMap(indexes[x]);
       p++;
     }