(no commit message)

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index ae0f1c4c30ddfe9f0a3a393c79f6b864e28a4b39..8fdb1391a48609fe00935986b5ee5f02fbdf144c 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -2692,8 +2692,7 @@ Magick::Image Magick::Image::clipMask ( void  ) const
 {
    ExceptionInfo exceptionInfo;
    GetExceptionInfo( &exceptionInfo );
-   MagickCore::Image* image =
-     GetImageClipMask( constImage(), &exceptionInfo );
+   MagickCore::Image* image = GetImageMask( constImage(), &exceptionInfo );
    throwException( exceptionInfo );
    (void) DestroyExceptionInfo( &exceptionInfo );
    return Magick::Image( image );

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 1d592ba0f7834fa2c654cdbc720c63e1d5749fbc..6e0e681bfabb438ac2d3002d052cfebd142dff47 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -751,10 +751,10 @@ namespace Magick
   using MagickCore::GetGeometry;
   using MagickCore::GetImageBoundingBox;
   using MagickCore::GetImageDepth;
+  using MagickCore::GetImageMask;
   using MagickCore::GetImageMean;
   using MagickCore::GetImageKurtosis;
   using MagickCore::GetImageRange;
-  using MagickCore::GetImageClipMask;
   using MagickCore::GetImageDepth;
   using MagickCore::GetImageInfo;
   using MagickCore::GetImageInfoFile;

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 6d638e0409053dceed0faeafa8bef326b6b2f944..a2f9b30c7589de2cc7bac833b0ceb89c3c01d7d3 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -1631,12 +1631,12 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
           offset->x=x;
           offset->y=y;
         }
-      if (GetPixelMask(image,q) != 0)
+      if (GetPixelMask(similarity_image,q) != 0)
         {
-          q+=GetPixelChannels(image);
+          q+=GetPixelChannels(similarity_image);
           continue;
         }
-      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(similarity_image); i++)
       {
         PixelChannel
           channel;

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index b12212d18d076d691d9091d587fb48111e64cc1b..71acbb3e4a6dd030f9abd56ea5ae46361fe0c7a4 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -392,13 +392,13 @@ static MagickBooleanType CompositeOverImage(Image *image,
               Sc: source color.
               Dc: destination color.
           */
-          (void) GetOneVirtualPixel(composite_image,x-x_offset,y-y_offset,
-            source,exception);
           if (GetPixelMask(image,q) != 0)
             {
               q+=GetPixelChannels(image);
               continue;
             }
+          (void) GetOneVirtualPixel(composite_image,x-x_offset,y-y_offset,
+            source,exception);
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             PixelChannel
@@ -424,6 +424,15 @@ static MagickBooleanType CompositeOverImage(Image *image,
           Sa:  normalized source alpha.
           Da:  normalized destination alpha.
       */
+      if (GetPixelMask(composite_image,p) != 0)
+        {
+          p+=GetPixelChannels(composite_image);
+          channels=GetPixelChannels(composite_image);
+          if (p >= (pixels+channels*composite_image->columns))
+            p=pixels;
+          q+=GetPixelChannels(image);
+          continue;
+        }
       Sa=QuantumScale*GetPixelAlpha(composite_image,p);
       Da=QuantumScale*GetPixelAlpha(image,q);
       alpha=Sa*(-Da)+Sa+Da;

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 6459f39becf74d8896848f7c7d566f9057f3ca06..e396ba46482b002248eebc92c0ba64d923cd5ebd 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -674,13 +674,13 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius,
         break;
       center=(ssize_t) GetPixelChannels(image)*(width-j)*
         ((width-j)/2L)+GetPixelChannels(image)*((width-j)/2);
-      if (GetPixelMask(image,q) != 0)
+      if (GetPixelMask(sharp_image,q) != 0)
         {
           q+=GetPixelChannels(sharp_image);
           r+=GetPixelChannels(edge_image);
           continue;
         }
-      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(sharp_image); i++)
       {
         MagickRealType
           alpha,

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index a574ee91e1438cb2bf5285622457568a1e5c6fcc..8b4eda5b9a546014136d3620ce200da225e829e5 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1101,7 +1101,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status)
 #endif
-  for (i=0; i < number_channels; i++)
+  for (i=0; i < (ssize_t) number_channels; i++)
   {
     double
       intensity;
@@ -1590,7 +1590,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status)
 #endif
-  for (i=0; i < (size_t) number_channels; i++)
+  for (i=0; i < (ssize_t) number_channels; i++)
   {
     MagickRealType
       intensity;
@@ -1834,16 +1834,16 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma,
       for (i=0; i < (ssize_t) image->colors; i++)
       {
         if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].red=gamma_map[
+          image->colormap[i].red=(MagickRealType) gamma_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))];
         if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].green=gamma_map[
+          image->colormap[i].green=(MagickRealType) gamma_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green))];
         if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].blue=gamma_map[
+          image->colormap[i].blue=(MagickRealType) gamma_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue))];
         if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].alpha=gamma_map[
+          image->colormap[i].alpha=(MagickRealType) gamma_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].alpha))];
       }
     }

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index b9c7150d2211b410cf1aadca44b20a863f3a8e4f..fd46f8907dab5a724c8bef8b0da5be5cd6c92ca8 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -659,9 +659,9 @@ MagickExport Image *EvaluateImages(const Image *images,
             register ssize_t
               i;
 
-            if (GetPixelMask(evaluate_image,p) != 0)
+            if (GetPixelMask(next,p) != 0)
               {
-                p+=GetPixelChannels(evaluate_image);
+                p+=GetPixelChannels(next);
                 continue;
               }
             for (i=0; i < (ssize_t) GetPixelChannels(next); i++)

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 535559c1df13e2a9d095878fe70bc6090bce4ed7..a1420e9d825947740e3f73a477964a393654c440 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -567,12 +567,12 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image,
       ssize_t
         n;
 
-      n=0;
       if (GetPixelMask(image,q) != 0)
         {
           q+=GetPixelChannels(image);
           continue;
         }
+      n=0;
       for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         PixelChannel

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index fa99fce761d2531824d37ed290ad21d9dcad7921..0969de2b578766f9376daebf59e38a2bbcb864ee 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -190,11 +190,6 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
           register ssize_t
             i;
 
-          if (GetPixelMask(image,p) != 0)
-            {
-              q+=GetPixelChannels(chop_image);
-              continue;
-            }
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             PixelChannel
@@ -266,12 +261,6 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
           register ssize_t
             i;
 
-         if (GetPixelMask(image,p) != 0)
-           {
-             p+=GetPixelChannels(image);
-             q+=GetPixelChannels(chop_image);
-             continue;
-           }
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             PixelChannel