(no commit message)

diff --git a/magick/distort.c b/magick/distort.c
index 307521c4e3c058062969d11119286ae74405154b..9afc2deac9001704baca316673feb5ae0faa12ed 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1556,7 +1556,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
         d.y = (coeff[2]-coeff[3])*sa;
         ExpandBounds(d);
         /* Orthogonal points along top of arc */
-        for( a=ceil((coeff[0]-coeff[1]/2.0)/MagickPI2)*MagickPI2;
+        for( a=(double) (ceil((double) ((coeff[0]-coeff[1]/2.0)/MagickPI2))*MagickPI2);
                a<(coeff[0]+coeff[1]/2.0); a+=MagickPI2 ) {
           ca = cos(a); sa = sin(a);
           d.x = coeff[2]*ca;
@@ -1568,7 +1568,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
           to appropriate scaling factors, to allow faster processing
           in the mapping function.
         */
-        coeff[1] = Magick2PI*image->columns/coeff[1];
+        coeff[1] = (double) (Magick2PI*image->columns/coeff[1]);
         coeff[3] = (double)image->rows/coeff[3];
         break;
       }
@@ -2159,7 +2159,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
           case ArcDistortion:
           {
             /* what is the angle and radius in the destination image */
-            s.x  = (atan2(d.y,d.x) - coeff[0])/Magick2PI;
+            s.x  = (double) ((atan2(d.y,d.x) - coeff[0])/Magick2PI);
             s.x -= MagickRound(s.x);     /* angle */
             s.y  = hypot(d.x,d.y);       /* radius */
 
@@ -2170,7 +2170,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
             */
             if ( s.y > MagickEpsilon )
               ScaleFilter( resample_filter[id],
-                  coeff[1]/(Magick2PI*s.y), 0, 0, coeff[3] );
+                  (double) (coeff[1]/(Magick2PI*s.y)), 0, 0, coeff[3] );
             else
               ScaleFilter( resample_filter[id],
                   distort_image->columns*2, 0, 0, coeff[3] );
@@ -2195,7 +2195,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
             */
             if ( s.y > MagickEpsilon )
               ScaleFilter( resample_filter[id],
-                  coeff[6]/(Magick2PI*s.y), 0, 0, coeff[7] );
+                (double) (coeff[6]/(Magick2PI*s.y)), 0, 0, coeff[7] );
             else
               ScaleFilter( resample_filter[id],
                   distort_image->columns*2, 0, 0, coeff[7] );

diff --git a/magick/profile.c b/magick/profile.c
index 7b51df5c4852e4a4d0d964e38b5d9b158576a891..d35c69554d34997bde0786fef507af4eb377d306 100644 (file)
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1828,15 +1828,17 @@ MagickExport MagickBooleanType SyncImageProfiles(Image *image)
   EndianType
     endian;
 
+  int
+    offset;
+
   ssize_t
     id,
     level;
 
   size_t
-    length;
-
-  ssize_t
-    offset;
+    entry,
+    length,
+    number_entries;
 
   static int
     format_bytes[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8};
@@ -1848,10 +1850,6 @@ MagickExport MagickBooleanType SyncImageProfiles(Image *image)
     *directory,
     *exif;
 
-  size_t
-    entry,
-    number_entries;
-
   /*
     Set EXIF resolution tag.
   */
@@ -1912,8 +1910,10 @@ MagickExport MagickBooleanType SyncImageProfiles(Image *image)
     number_entries=ReadProfileShort(endian,directory);
     for ( ; entry < number_entries; entry++)
     {
+      int
+        components;
+
       ssize_t
-        components,
         format,
         tag_value;
 
@@ -1935,7 +1935,7 @@ MagickExport MagickBooleanType SyncImageProfiles(Image *image)
         p=q+8;
       else
         {
-          ssize_t
+          int
             offset;
 
           /*

diff --git a/magick/shear.c b/magick/shear.c
index 7236712e2120d8df1450291fe3f909835344c564..58a217d4322e5ad4a844378511a928a05ca0d026 100644 (file)
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -963,7 +963,8 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold,
   /*
     Auto-crop image.
   */
-  GetImageBackgroundColor(clone_image,StringToLong(artifact),exception);
+  GetImageBackgroundColor(clone_image,(ssize_t) StringToLong(artifact),
+    exception);
   deskew_image=AffineTransformImage(clone_image,&affine_matrix,exception);
   clone_image=DestroyImage(clone_image);
   if (deskew_image == (Image *) NULL)