From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 9 Oct 2010 01:40:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8717
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb66d9ce1d174e871ae1ac4ee9b300d1f0d5cddd;p=imagemagick

---

diff --git a/magick/quantize.c b/magick/quantize.c
index 36bfb13ad..b1a7413e1 100644
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -790,7 +790,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
       /*
         Start at the root and descend the color cube tree.
       */
-      for (count=1; (x+count) < (ssize_t) image->columns; count++)
+      for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++)
         if (IsSameColor(image,p,p+count) == MagickFalse)
           break;
       AssociateAlphaPixel(cube_info,p,&pixel);
@@ -879,7 +879,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
       /*
         Start at the root and descend the color cube tree.
       */
-      for (count=1; (x+count) < (ssize_t) image->columns; count++)
+      for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++)
         if (IsSameColor(image,p,p+count) == MagickFalse)
           break;
       AssociateAlphaPixel(cube_info,p,&pixel);
diff --git a/magick/resample.c b/magick/resample.c
index b2e2246fa..46f39aa58 100644
--- a/magick/resample.c
+++ b/magick/resample.c
@@ -1057,14 +1057,14 @@ MagickExport MagickBooleanType ResamplePixelColor(
                       weight*resample_filter->image->background_color.green;
               resample_filter->average_pixel.blue +=
                       weight*resample_filter->image->background_color.blue;
-              resample_filter->average_pixel.matte +=
+              resample_filter->average_pixel.opacity +=
                       resample_filter->image->background_color.opacity;
               divisor_c += weight;
 
               resample_filter->average_pixel.red /= divisor_c;
               resample_filter->average_pixel.green /= divisor_c;
               resample_filter->average_pixel.blue /= divisor_c;
-              resample_filter->average_pixel.matte /= 2;
+              resample_filter->average_pixel.opacity /= 2;
 
             }
         }
diff --git a/magick/resize.c b/magick/resize.c
index 8caa8a52f..3129f1d32 100644
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -1103,7 +1103,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
           0.0);
       }
       /* output the above once only for each image, and each setting */
-      (void) DeleteImageArtifact(image,"filter:verbose");
+      (void) DeleteImageArtifact((Image *) image,"filter:verbose");
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     }
 #endif
diff --git a/magick/version.h b/magick/version.h
index 6fc208eed..952246a02 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2010-10-08"
-#define MagickChangeDate   "20101005"
+#define MagickChangeDate   "20101008"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "