(no commit message)

diff --git a/coders/png.c b/coders/png.c
index dd34b6d249e991b43c46e59d624a69df665f5612..b9426108a9466c74602414b256748d513a2fb2bd 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -511,7 +511,8 @@ static MagickBooleanType
            ((((size_t) image->background_color.green >> 8) & 0xff)
           == ((size_t) image->background_color.green & 0xff)) &&
            ((((size_t) image->background_color.blue >> 8) & 0xff)
-          == ((size_t) image->background_color.blue & 0xff)));
+          == ((size_t) image->background_color.blue & 0xff))) ? MagickTrue :
+          MagickFalse;
 
         if (ok_to_reduce != MagickFalse && image->storage_class == PseudoClass)
           {
@@ -527,7 +528,8 @@ static MagickBooleanType
                   ((((size_t) image->colormap[indx].blue >> 8) & 0xff)
                   == ((size_t) image->colormap[indx].blue & 0xff)) &&
                   ((((size_t) image->colormap[indx].opacity >> 8) & 0xff)
-                  == ((size_t) image->colormap[indx].opacity & 0xff)));
+                  == ((size_t) image->colormap[indx].opacity & 0xff))) ?
+                  MagickTrue : MagickFalse;
                 if (ok_to_reduce == MagickFalse)
                   break;
               }
@@ -563,7 +565,7 @@ static MagickBooleanType
                   ((size_t) p->blue & 0xff)) &&
                   (((!image->matte ||
                   (((size_t) p->opacity >> 8) & 0xff) ==
-                  ((size_t) p->opacity & 0xff)))));
+                  ((size_t) p->opacity & 0xff))))) ? MagickTrue : MagickFalse;
 
                 if (ok_to_reduce == MagickFalse)
                   break;
@@ -6730,7 +6732,7 @@ static MagickBooleanType OptimizePNGColormap(Image *image, IndexPacket
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
           "    i     (red,green,blue,opacity)");
 
-      for (i=0; i < image->colors; i++)
+      for (i=0; i < (ssize_t) image->colors; i++)
       {
         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
             "    %d  (%d,%d,%d,%d)",
@@ -6867,9 +6869,9 @@ static MagickBooleanType CompressColormapTransFirst(Image *image)
     ping_number_colors=(size_t) 0;
     remap_needed = MagickFalse;
 
-    for (i=0; i<image->colors; i++)
+    for (i=0; i<(ssize_t) image->colors; i++)
     {
-      colormap[ping_plte_map[i]] = image->colormap[i];
+      colormap[(ssize_t) ping_plte_map[i]] = image->colormap[i];
 
       if (ping_plte_map[i] != i)
         remap_needed = MagickTrue;
@@ -6912,7 +6914,7 @@ static MagickBooleanType CompressColormapTransFirst(Image *image)
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
         "    i  plte_map (red,green,blue,opacity)");
 
-    for (i=0; i < image->colors; i++)
+    for (i=0; i < (ssize_t) image->colors; i++)
     {
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
           "    %d    %d   (%d,%d,%d,%d)",
@@ -6925,7 +6927,7 @@ static MagickBooleanType CompressColormapTransFirst(Image *image)
     }
 
 
-    for (i=0; i<image->colors; i++)
+    for (i=0; i< (ssize_t) image->colors; i++)
     {
       image->colormap[i] = colormap[i];
     }
@@ -6936,7 +6938,7 @@ static MagickBooleanType CompressColormapTransFirst(Image *image)
         "    After Remap:");
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
         "    i      (red,green,blue,opacity)");
-    for (i=0; i < image->colors; i++)
+    for (i=0; i < (ssize_t) image->colors; i++)
     {
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
           "    %d    (%d,%d,%d,%d)",
@@ -8062,7 +8064,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               "  Setting up bKGD chunk with index=%d",(int) i);
           }
 
-        if (i < number_colors)
+        if (i < (ssize_t) number_colors)
           {
             ping_have_bKGD = MagickTrue;
             if (logging)
@@ -8348,7 +8350,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
       if (logging)
         {
-          for (i=0; i< number_colors; i++)
+          for (i=0; i< (ssize_t) number_colors; i++)
           {
             if (ping_num_trans != 0)
               (void) LogMagickEvent(CoderEvent,GetMagickModule(),

diff --git a/coders/svg.c b/coders/svg.c
index fe94f240a4b8a3398bf1e06ed6215da702924702..4d1893aa80c6e3dbfe843c129f68b34f79a51cc7 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -949,7 +949,7 @@ static void SVGStartElement(void *context,const xmlChar *name,
           break;
       }
     }
-  if (strchr(name,':') != (char *) NULL)
+  if (strchr((char *) name,':') != (char *) NULL)
     {
       /*
         Skip over namespace.
@@ -2148,7 +2148,7 @@ static void SVGEndElement(void *context,const xmlChar *name)
   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
     "  SAX.endElement(%s)",name);
   svg_info=(SVGInfo *) context;
-  if (strchr(name,':') != (char *) NULL)
+  if (strchr((char *) name,':') != (char *) NULL)
     {
       /*
         Skip over namespace.

diff --git a/config/configure.xml b/config/configure.xml
index f9971141dbabb11b627431425353c8e5959f6fad..dd4877ca481a23dcd234baeab374ad79bdefc50d 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x665"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,5,10"/>
-  <configure name="RELEASE_DATE" value="2010-11-20"/>
+  <configure name="RELEASE_DATE" value="2010-11-21"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/transform.c b/magick/transform.c
index 13ae7ad35aff1b0e9505708fe51367228a8fa3ed..2ecfa9224a5b23012f0babe0466db5aa8b32cda2 100644 (file)
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -1601,7 +1601,7 @@ MagickExport Image *SpliceImage(const Image *image,
       continue;
     p=GetCacheViewVirtualPixels(image_view,0,y-(ssize_t) splice_geometry.height,
       image->columns,1,exception);
-    if ((y < 0) || (y >= splice_image->rows))
+    if ((y < 0) || (y >= (ssize_t) splice_image->rows))
       continue;
     q=QueueCacheViewAuthenticPixels(splice_view,0,y,splice_image->columns,1,
       exception);

diff --git a/magick/version.h b/magick/version.h
index c45c4a93c9bf7be648dc1dd3390a9118a76feda6..b9b57dff9e3f28dd7b574504f7212f4b7a0500ed 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MagickLibAddendum  "-10"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-11-20"
+#define MagickReleaseDate  "2010-11-21"
 #define MagickChangeDate   "20101117"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)