(no commit message)

diff --git a/magick/cache-view.c b/magick/cache-view.c
index f770b2c5a15faa5fcc5bf9de1a592a3845fa38b8..d0e7a3916e312a0cc02812b1bb3296537893257f 100644 (file)
--- a/magick/cache-view.c
+++ b/magick/cache-view.c
@@ -303,12 +303,12 @@ MagickExport ExceptionInfo *GetCacheViewException(const CacheView *cache_view)
 */
 MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
 {
+  int
+    id;
+
   MagickSizeType
     extent;
 
-  ssize_t
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   if (cache_view->debug != MagickFalse)
@@ -316,7 +316,7 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
       cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   extent=GetPixelCacheNexusExtent(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(extent);
@@ -391,19 +391,19 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
   Cache
     cache;
 
+  int
+    id;
+
   PixelPacket
     *pixels;
 
-  ssize_t
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   cache=GetImagePixelCache(cache_view->image,MagickTrue,exception);
   if (cache == (Cache) NULL)
     return((PixelPacket *) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
   return(pixels);
@@ -447,12 +447,12 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
   Cache
     cache;
 
+  int
+    id;
+
   PixelPacket
     *pixels;
 
-  ssize_t
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   cache=GetImagePixelCache(cache_view->image,MagickTrue,exception);
@@ -460,7 +460,7 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
     return(MagickFalse);
   *pixel=cache_view->image->background_color;
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
     cache_view->nexus_info[id],exception);
   if (pixels == (const PixelPacket *) NULL)
@@ -498,14 +498,14 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
   IndexPacket
     *indexes;
 
-  ssize_t
+  int
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   indexes=GetPixelCacheNexusIndexes(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(indexes);
@@ -538,17 +538,17 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
 */
 MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
 {
+  int
+    id;
+
   PixelPacket
     *pixels;
 
-  ssize_t
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetPixelCacheNexusPixels(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(pixels);
@@ -585,14 +585,14 @@ MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
   const IndexPacket
     *indexes;
 
-  ssize_t
+  int
     id;
 
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   indexes=GetVirtualIndexesFromNexus(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(indexes);
@@ -629,14 +629,14 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
   const PixelPacket
     *pixels;
 
-  ssize_t
+  int
     id;
 
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsNexus(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(pixels);
@@ -681,13 +681,13 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixels(
   const PixelPacket
     *pixels;
 
-  ssize_t
+  int
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
@@ -733,14 +733,14 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
   const PixelPacket
     *pixels;
 
-  ssize_t
+  int
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   *pixel=cache_view->image->background_color;
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,1,1,cache_view->nexus_info[id],
     exception);
@@ -793,14 +793,14 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
   const PixelPacket
     *pixels;
 
-  ssize_t
+  int
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   *pixel=cache_view->image->background_color;
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,
     1,cache_view->nexus_info[id],exception);
   if (pixels == (const PixelPacket *) NULL)
@@ -848,19 +848,19 @@ MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
   Cache
     cache;
 
+  int
+    id;
+
   PixelPacket
     *pixels;
 
-  ssize_t
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   cache=GetImagePixelCache(cache_view->image,MagickFalse,exception);
   if (cache == (Cache) NULL)
     return((PixelPacket *) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
   return(pixels);
@@ -971,16 +971,16 @@ MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
 MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
   CacheView *cache_view,ExceptionInfo *exception)
 {
+  int
+    id;
+
   MagickBooleanType
     status;
 
-  ssize_t
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   id=GetOpenMPThreadId();
-  assert(id < (ssize_t) cache_view->number_threads);
+  assert(id < (int) cache_view->number_threads);
   status=SyncAuthenticPixelCacheNexus(cache_view->image,
     cache_view->nexus_info[id],exception);
   return(status);

diff --git a/magick/effect.c b/magick/effect.c
index 59de1640947323716a2d4273d9bb9d8a190284f3..5cbbed35ede737d25b758b9b9d512a43c697afa8 100644 (file)
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -237,8 +237,8 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
     {
       for (u=(-j); u <= j; u++)
       {
-        kernel[i][k]=exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
-          (2.0*MagickPI*MagickSigma*MagickSigma);
+        kernel[i][k]=(double) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+          MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
         normalize+=kernel[i][k];
         k++;
       }
@@ -554,8 +554,8 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
     {
       for (u=(-j); u <= j; u++)
       {
-        kernel[i][k]=(-exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
-          (2.0*MagickPI*MagickSigma*MagickSigma));
+        kernel[i][k]=(double) (-exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+          MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
         normalize+=kernel[i][k];
         k++;
       }
@@ -796,8 +796,8 @@ static double *GetBlurKernel(const size_t width,const double sigma)
   i=0;
   for (k=(-j); k <= j; k++)
   {
-    kernel[i]=exp(-((double) k*k)/(2.0*MagickSigma*MagickSigma))/
-      (MagickSQ2PI*MagickSigma);
+    kernel[i]=(double) (exp(-((double) k*k)/(2.0*MagickSigma*MagickSigma))/
+      (MagickSQ2PI*MagickSigma));
     normalize+=kernel[i];
     i++;
   }
@@ -2111,9 +2111,9 @@ MagickExport Image *EmbossImage(const Image *image,const double radius,
   {
     for (u=(-j); u <= j; u++)
     {
-      kernel[i]=((u < 0) || (v < 0) ? -8.0 : 8.0)*
+      kernel[i]=(double) (((u < 0) || (v < 0) ? -8.0 : 8.0)*
         exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
-        (2.0*MagickPI*MagickSigma*MagickSigma);
+        (2.0*MagickPI*MagickSigma*MagickSigma));
       if (u != k)
         kernel[i]=0.0;
       i++;
@@ -2549,8 +2549,8 @@ MagickExport Image *GaussianBlurImageChannel(const Image *image,
   for (v=(-j); v <= j; v++)
   {
     for (u=(-j); u <= j; u++)
-      kernel[i++]=exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
-        (2.0*MagickPI*MagickSigma*MagickSigma);
+      kernel[i++]=(double) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+        MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
   }
   blur_image=ConvolveImageChannel(image,channel,width,kernel,exception);
   kernel=(double *) RelinquishMagickMemory(kernel);
@@ -3095,8 +3095,8 @@ static double *GetMotionBlurKernel(const size_t width,const double sigma)
   normalize=0.0;
   for (i=0; i < (ssize_t) width; i++)
   {
-    kernel[i]=exp((-((double) i*i)/(double) (2.0*MagickSigma*MagickSigma)))/
-      (MagickSQ2PI*MagickSigma);
+    kernel[i]=(double) (exp((-((double) i*i)/(double) (2.0*MagickSigma*
+      MagickSigma)))/(MagickSQ2PI*MagickSigma));
     normalize+=kernel[i];
   }
   for (i=0; i < (ssize_t) width; i++)
@@ -4502,8 +4502,8 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
   for (v=(-j); v <= j; v++)
   {
     for (u=(-j); u <= j; u++)
-      kernel[i++]=exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
-        (2.0*MagickPI*MagickSigma*MagickSigma);
+      kernel[i++]=(double) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+        MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
   }
   if (image->debug != MagickFalse)
     {
@@ -5096,8 +5096,8 @@ MagickExport Image *SharpenImageChannel(const Image *image,
   {
     for (u=(-j); u <= j; u++)
     {
-      kernel[i]=(-exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
-        (2.0*MagickPI*MagickSigma*MagickSigma));
+      kernel[i]=(double) (-exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+        MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
       normalize+=kernel[i];
       i++;
     }

diff --git a/magick/enhance.c b/magick/enhance.c
index 55eb065075b2fc8cf5ca22c1da88b2c9ea809599..5581e1e93c35e9b8ccf9a44d72aad9e1d8410474 100644 (file)
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -290,7 +290,7 @@ MagickExport MagickBooleanType BrightnessContrastImageChannel(Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   alpha=contrast;
-  slope=tan(MagickPI*(alpha/100.0+1.0)/4.0);
+  slope=tan((double) (MagickPI*(alpha/100.0+1.0)/4.0));
   if (slope < 0.0)
     slope=0.0;
   intercept=brightness/100.0+((100-brightness)/200.0)*(1.0-slope);
@@ -918,7 +918,8 @@ static void Contrast(const int sign,Quantum *red,Quantum *green,Quantum *blue)
   saturation=0.0;
   brightness=0.0;
   ConvertRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness);
-  brightness+=0.5*sign*(0.5*(sin(MagickPI*(brightness-0.5))+1.0)-brightness);
+  brightness+=0.5*sign*(0.5*(sin((double) (MagickPI*(brightness-0.5))+1.0))-
+    brightness);
   if (brightness > 1.0)
     brightness=1.0;
   else

diff --git a/magick/fx.c b/magick/fx.c
index a201feec258cd6bc1044febfdfe717e0319f6fb6..f3d639124c67d29669d8ee6ade2c0434305385a1 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -5360,7 +5360,8 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }
   for (i=0; i < (ssize_t) wave_image->columns; i++)
-    sine_map[i]=fabs(amplitude)+amplitude*sin((2*MagickPI*i)/wave_length);
+    sine_map[i]=fabs(amplitude)+amplitude*sin((double) ((2.0*MagickPI*i)/
+      wave_length));
   /*
     Wave image.
   */

diff --git a/magick/layer.c b/magick/layer.c
index b29a1bb3f39713b2c3ecb52ba81da141f17f71f1..e3ad302dd58f6816edbfb41f753a18d9efbf59c2 100644 (file)
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -2044,7 +2044,8 @@ MagickExport Image *MergeImageLayers(Image *image,
       image->page.y -= page.y;
       image->page.width = width;
       image->page.height = height;
-      proceed=SetImageProgress(image,MergeLayersTag,scene,number_images);
+      proceed=SetImageProgress(image,MergeLayersTag,(MagickOffsetType) scene,
+        number_images);
       if (proceed == MagickFalse)
         break;
       image=GetNextImageInList(image);

diff --git a/magick/resize.c b/magick/resize.c
index 392f1ed1e4ac09aac9b21d3dcc47302eb4dd81d4..0a7a0451ec427de03d7b6a76f38b53341709649a 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -144,8 +144,8 @@ static MagickRealType Bessel(const MagickRealType x,
     http://www.ph.ed.ac.uk/%7ewjh/teaching/mo/slides/lens/lens.pdf.
   */
   if (x == 0.0)
-    return(0.25*MagickPIL);
-  return(BesselOrderOne(MagickPIL*x)/(x+x));
+    return((MagickRealType) (0.25*MagickPIL));
+  return(BesselOrderOne((MagickRealType) (MagickPIL*x))/(x+x));
 }
 
 static MagickRealType Blackman(const MagickRealType x,
@@ -157,7 +157,7 @@ static MagickRealType Blackman(const MagickRealType x,
     Refactored by Chantal Racette and Nicolas Robidoux to one trig
     call and five flops.
   */
-  const double pix = MagickPIL*x;
+  const double pix = (double) (MagickPIL*x);
   const MagickRealType cospix = cos(pix);
   return(0.34+cospix*(0.5+cospix*0.16));
 }
@@ -169,8 +169,8 @@ static MagickRealType Bohman(const MagickRealType x,
     Bohman: 2rd Order cosine windowing function:
       (1-x) cos(pi x) + sin(pi x) / pi.
   */
-  const double pix = MagickPIL*x;
-  return((1-x)*cos(pix)+(1.0/MagickPIL)*sin(pix));
+  const double pix = (double) (MagickPIL*x);
+  return((MagickRealType) ((1-x)*cos(pix)+(1.0/MagickPIL)*sin(pix)));
 }
 
 static MagickRealType Box(const MagickRealType magick_unused(x),
@@ -247,7 +247,7 @@ static MagickRealType Hanning(const MagickRealType x,
   /*
     Cosine window function: .5 + .5 cos(pi x).
   */
-  const double pix = MagickPIL*x;
+  const double pix = (double) (MagickPIL*x);
   const MagickRealType cospix = cos(pix);
   return(0.5+0.5*cospix);
 }
@@ -258,7 +258,7 @@ static MagickRealType Hamming(const MagickRealType x,
   /*
     Offset cosine window function: .54 + .46 cos(pi x).
   */
-  const double pix = MagickPIL*x;
+  const double pix = (double) (MagickPIL*x);
   const MagickRealType cospix = cos(pix);
   return(0.54+0.46*cospix);
 }
@@ -334,7 +334,7 @@ static MagickRealType Sinc(const MagickRealType x,
   if (x == 0.0)
     return(1.0);
   {
-    const MagickRealType pix = MagickPIL*x;
+    const MagickRealType pix = (MagickRealType) (MagickPIL*x);
     const MagickRealType sinpix = sin((double) pix);
     return(sinpix/pix);
   }
@@ -352,7 +352,7 @@ static MagickRealType SincPolynomial(const MagickRealType x,
   const MagickRealType xx = x*x;
   if (xx > 16.0)
     {
-      const MagickRealType pix = MagickPIL*x;
+      const MagickRealType pix = (MagickRealType) (MagickPIL*x);
       const MagickRealType sinpix = sin((double) pix);
       return(sinpix/pix);
     }
@@ -759,7 +759,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
           Paul Heckbert's paper on EWA resampling.
           FUTURE: to be reviewed.
         */
-        resize_filter->blur*=2.0*log(2.0)/sqrt(2.0/MagickPI);
+        resize_filter->blur*=2.0*log(2.0)/sqrt((double) (2.0/MagickPI));
         break;
       }
       case BesselFilter: