From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 7 Apr 2011 13:26:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7758
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecf4bd539fe0591d67bf1ec961ac68b5490171f;p=imagemagick

---

diff --git a/coders/png.c b/coders/png.c
index 32566392c..4271b689c 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2883,9 +2883,9 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   for (j = 0; j < 2; j++)
   {
     if (j == 0)
-      status = (png_get_text(ping,ping_info,&text,&num_text) != 0);
+      status = png_get_text(ping,ping_info,&text,&num_text) != 0 ? MagickTrue : MagickFalse;
     else
-      status = (png_get_text(ping,end_info,&text,&num_text) != 0);
+      status = png_get_text(ping,end_info,&text,&num_text) != 0 ? MagickTrue : MagickFalse;
 
     if (status != MagickFalse)
       for (i=0; i < (ssize_t) num_text; i++)
@@ -8685,7 +8685,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
         if (image_depth > MAGICKCORE_QUANTUM_DEPTH)
           image_depth=MAGICKCORE_QUANTUM_DEPTH;
 
-        if ((image_colors == 0) || ((ssize_t) image_colors-1 > MaxColormapSize))
+        if ((image_colors == 0) || ((ssize_t) (image_colors-1) > MaxColormapSize))
           image_colors=(int) (one << image_depth);
 
         if (image_depth > 8)
diff --git a/config/configure.xml b/config/configure.xml
index 7274f9552..711a7eba5 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,5"/>
   <configure name="SVN_REVISION" value="4138" />
-  <configure name="RELEASE_DATE" value="2011-04-06"/>
+  <configure name="RELEASE_DATE" value="2011-04-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/magick/morphology.c b/magick/morphology.c
index 94c9b9e28..16b5dc11f 100644
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -2498,7 +2498,7 @@ static void CalcKernelMetaData(KernelInfo *kernel)
 ** It returns the number of pixels that changed between the images
 ** for result convergence determination.
 */
-static size_t MorphologyPrimitive(const Image *image, Image *result_image,
+static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
      const MorphologyMethod method, const ChannelType channel,
      const KernelInfo *kernel,const double bias,ExceptionInfo *exception)
 {
@@ -2757,7 +2757,7 @@ static size_t MorphologyPrimitive(const Image *image, Image *result_image,
     result_image->type=image->type;
     q_view=DestroyCacheView(q_view);
     p_view=DestroyCacheView(p_view);
-    return(status ? (size_t) changed : 0);
+    return(status ? (ssize_t) changed : 0);
   }
 
   /*
@@ -3268,7 +3268,7 @@ static size_t MorphologyPrimitive(const Image *image, Image *result_image,
 ** Because of this 'iterative' handling this function can not make use
 ** of multi-threaded, parellel processing.
 */
-static size_t MorphologyPrimitiveDirect(const Image *image,
+static ssize_t MorphologyPrimitiveDirect(const Image *image,
      const MorphologyMethod method, const ChannelType channel,
      const KernelInfo *kernel,ExceptionInfo *exception)
 {
@@ -3356,7 +3356,7 @@ static size_t MorphologyPrimitiveDirect(const Image *image,
     */
     if (status == MagickFalse)
       break;
-    p=GetCacheViewVirtualPixels(virt_view, -offx,  y-offy, virt_width, offy+1,
+    p=GetCacheViewVirtualPixels(virt_view, -offx,  y-offy, virt_width, (size_t) offy+1,
          exception);
     q=GetCacheViewAuthenticPixels(auth_view, 0, y, image->columns, 1,
          exception);
@@ -3368,7 +3368,7 @@ static size_t MorphologyPrimitiveDirect(const Image *image,
     q_indexes=GetCacheViewAuthenticIndexQueue(auth_view);
 
     /* offset to origin in 'p'. while 'q' points to it directly */
-    r = virt_width*offy + offx;
+    r = (ssize_t) virt_width*offy + offx;
 
     for (x=0; x < (ssize_t) image->columns; x++)
     {
@@ -3502,7 +3502,7 @@ static size_t MorphologyPrimitiveDirect(const Image *image,
     ** Only the bottom half of the kernel will be processes as we
     ** up the image.
     */
-    p=GetCacheViewVirtualPixels(virt_view, -offx, y, virt_width, kernel->y+1,
+    p=GetCacheViewVirtualPixels(virt_view, -offx, y, virt_width, (size_t) kernel->y+1,
          exception);
     q=GetCacheViewAuthenticPixels(auth_view, 0, y, image->columns, 1,
          exception);
@@ -3623,7 +3623,7 @@ static size_t MorphologyPrimitiveDirect(const Image *image,
   } /* y */
   auth_view=DestroyCacheView(auth_view);
   virt_view=DestroyCacheView(virt_view);
-  return(status ? (ssize_t)changed : -1);
+  return(status ? (ssize_t) changed : -1);
 }
 
 /* Apply a Morphology by calling theabove low level primitive application
@@ -3702,6 +3702,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
   /* initialise for cleanup */
   curr_image = (Image *) image;
   curr_compose = image->compose;
+  (void) curr_compose;
   work_image = save_image = rslt_image = (Image *) NULL;
   reflected_kernel = (KernelInfo *) NULL;
 
diff --git a/magick/version.h b/magick/version.h
index 11fa9de7a..a91d75b5d 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -34,8 +34,8 @@ extern "C" {
 #define MagickLibAddendum  "-5"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-04-06"
-#define MagickChangeDate   "20110403"
+#define MagickReleaseDate  "2011-04-07"
+#define MagickChangeDate   "20110407"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "