(no commit message)

diff --git a/ChangeLog b/ChangeLog
index eedfed2ab7a5927dd10fafb2d67276232445e7e7..df4a329706f72107103cf1f4cedc2e8117e0c7ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
   * Respect -compose option for the montage utility (bug report by Anthony).
   * A 256 column gradient produces a 256 color GIF image (bug report by
     Anthony).
+  * Register / unregister CALS format in static.c (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=16103).
 
 2010-04-17  6.6.1-5 Cristy  <quetzlzacatenango@image...>
   * Only write one ICC profile to PSD image.

diff --git a/magick/effect.c b/magick/effect.c
index 5057448ef8a9cee869d0f96a930fa8331f60678b..c4c37ffc9272e1f107dffbca7f8e4af7d2d9c759 100644 (file)
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -316,7 +316,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
         v;
 
       gamma=0.0;
-      i=(long) ceil(width*QuantumScale*PixelIntensity(r)-0.5);
+      i=(long) ceil((double) width*QuantumScale*PixelIntensity(r)-0.5);
       if (i < 0)
         i=0;
       else
@@ -631,7 +631,8 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
         v;
 
       gamma=0.0;
-      i=(long) ceil(width*(QuantumRange-QuantumScale*PixelIntensity(r))-0.5);
+      i=(long) ceil((double) width*(QuantumRange-QuantumScale*
+        PixelIntensity(r))-0.5);
       if (i < 0)
         i=0;
       else
@@ -3167,8 +3168,8 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
   point.y=(double) width*cos(DegreesToRadians(angle));
   for (i=0; i < (long) width; i++)
   {
-    offset[i].x=(long) ceil((i*point.y)/hypot(point.x,point.y)-0.5);
-    offset[i].y=(long) ceil((i*point.x)/hypot(point.x,point.y)-0.5);
+    offset[i].x=(long) ceil((double) (i*point.y)/hypot(point.x,point.y)-0.5);
+    offset[i].y=(long) ceil((double) (i*point.x)/hypot(point.x,point.y)-0.5);
   }
   /*
     Motion blur image.

diff --git a/magick/image.c b/magick/image.c
index e80932c782612bfa879abb1dbf492bf8fe1a3588..bc38f07072fe4cef8127c899d58b62846521dd93 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -4094,10 +4094,10 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
           {
             if (units == PixelsPerInchResolution)
               {
-                image->x_resolution=(unsigned long) (100.0*2.54*
-                  image->x_resolution+0.5)/100.0;
-                image->y_resolution=(unsigned long) (100.0*2.54*
-                  image->y_resolution+0.5)/100.0;
+                image->x_resolution=(double) ((unsigned long) (100.0*2.54*
+                  image->x_resolution+0.5))/100.0;
+                image->y_resolution=(double) ((unsigned long) (100.0*2.54*
+                  image->y_resolution+0.5))/100.0;
               }
             break;
           }

diff --git a/magick/static.c b/magick/static.c
index f5e57fe8eb4b62baa40e77d68c16f6256b7e1ff3..ba2e8ec6dc0dad0e6591f549a92860e6ba62990b 100644 (file)
--- a/magick/static.c
+++ b/magick/static.c
@@ -167,6 +167,7 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterARTImage();
   (void) RegisterAVSImage();
   (void) RegisterBMPImage();
+  (void) RegisterCALSImage();
   (void) RegisterCAPTIONImage();
   (void) RegisterCINImage();
   (void) RegisterCIPImage();
@@ -333,6 +334,7 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterAVSImage();
   UnregisterBMPImage();
   UnregisterBRAILLEImage();
+  UnregisterCALSImage();
   UnregisterCAPTIONImage();
   UnregisterCINImage();
   UnregisterCIPImage();

diff --git a/magick/static.h b/magick/static.h
index 6740531a47a5d8feec812aec2a77865ea2ef74fb..dec9e4488a2b7e745ed51888bea411aa409f8b27 100644 (file)
--- a/magick/static.h
+++ b/magick/static.h
@@ -33,6 +33,7 @@ extern ModuleExport unsigned long
   RegisterBIEImage(void),
   RegisterBMPImage(void),
   RegisterBRAILLEImage(void),
+  RegisterCALSImage(void),
   RegisterCAPTIONImage(void),
   RegisterCINImage(void),
   RegisterCIPImage(void),
@@ -179,6 +180,7 @@ extern ModuleExport void
   UnregisterBIEImage(void),
   UnregisterBMPImage(void),
   UnregisterBRAILLEImage(void),
+  UnregisterCALSImage(void),
   UnregisterCAPTIONImage(void),
   UnregisterCINImage(void),
   UnregisterCIPImage(void),