(no commit message)

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 9fc284b7e9e387a6e744ef031ee91c839c489e62..42a6f710fada451c056fcfcd4909b9bb11f40171 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -3488,7 +3488,7 @@ Magick::Color Magick::Image::pixelColor ( const ssize_t x_,
   if ( pixel )
     {
       PixelPacket packet;
-      MagickCore::GetPixelPacket(constImage(),pixel,&packet);
+      MagickCore::GetPixelPacketPixel(constImage(),pixel,&packet);
       return Color( packet );
     }
 

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 7a4e2cd143440e177abb0eae06afffa45bce4847..4e951b968c3f538b95a2ce4aa383ceb1512a1aee 100644 (file)
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -673,7 +673,7 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
     cache_view->nexus_info[id],exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(cache_view->image,p,pixel);
+  GetPixelPacketPixel(cache_view->image,p,pixel);
   if (GetPixelCacheColorspace(cache_view->image->cache) == CMYKColorspace)
     pixel->black=GetPixelBlack(cache_view->image,p);
   return(MagickTrue);
@@ -730,7 +730,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
     exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(cache_view->image,p,pixel);
+  GetPixelPacketPixel(cache_view->image,p,pixel);
   if (GetPixelCacheColorspace(cache_view->image->cache) == CMYKColorspace)
     pixel->black=GetPixelBlack(cache_view->image,p);
   return(MagickTrue);
@@ -790,7 +790,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
     cache_view->nexus_info[id],exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(cache_view->image,p,pixel);
+  GetPixelPacketPixel(cache_view->image,p,pixel);
   if (GetPixelCacheColorspace(cache_view->image->cache) == CMYKColorspace)
     pixel->black=GetPixelBlack(cache_view->image,p);
   return(MagickTrue);

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index c64769d49c81a5dbefe8aae3f8e66ac0c938362b..b84ffe51ac3d93387cdf167b9f5cc4fe48bce9d9 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -2141,7 +2141,7 @@ MagickExport MagickBooleanType GetOneAuthenticPixel(Image *image,
   q=GetAuthenticPixelsCache(image,x,y,1UL,1UL,exception);
   if (q == (Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,q,pixel);
+  GetPixelPacketPixel(image,q,pixel);
   return(MagickTrue);
 }
 \f
@@ -2199,7 +2199,7 @@ static MagickBooleanType GetOneAuthenticPixelFromCache(Image *image,
     exception);
   if (q == (Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,q,pixel);
+  GetPixelPacketPixel(image,q,pixel);
   return(MagickTrue);
 }
 \f
@@ -2326,7 +2326,7 @@ MagickExport MagickBooleanType GetOneVirtualMethodPixel(const Image *image,
     cache_info->nexus_info[id],exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,p,pixel);
+  GetPixelPacketPixel(image,p,pixel);
   if (image->colorspace == CMYKColorspace)
     pixel->black=GetPixelBlack(image,p);
   return(MagickTrue);
@@ -2390,7 +2390,7 @@ MagickExport MagickBooleanType GetOneVirtualPixel(const Image *image,
     1UL,1UL,cache_info->nexus_info[id],exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,p,pixel);
+  GetPixelPacketPixel(image,p,pixel);
   if (image->colorspace == CMYKColorspace)
     pixel->black=GetPixelBlack(image,p);
   return(MagickTrue);
@@ -2454,7 +2454,7 @@ static MagickBooleanType GetOneVirtualPixelFromCache(const Image *image,
     cache_info->nexus_info[id],exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,p,pixel);
+  GetPixelPacketPixel(image,p,pixel);
   if (image->colorspace == CMYKColorspace)
     pixel->black=GetPixelBlack(image,p);
   return(MagickTrue);

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 89fab2cedd3ee4d9501bd678644ec49bc56d117b..a1cb7052542711b0a511ca1e1ee691a962405d28 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -3770,7 +3770,7 @@ static MagickBooleanType XColorEditImage(Display *display,
                     break;
                   for (x=0; x < (int) (*image)->columns; x++)
                   {
-                    GetPixelPacket(*image,q,&pixel);
+                    GetPixelPacketPixel(*image,q,&pixel);
                     if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target))
                       {
                         SetPixelRed(*image,ScaleShortToQuantum(
@@ -10113,7 +10113,7 @@ static MagickBooleanType XMatteEditImage(Display *display,
                 break;
               for (x=0; x < (int) (*image)->columns; x++)
               {
-                GetPixelPacket(*image,q,&pixel);
+                GetPixelPacketPixel(*image,q,&pixel);
                 if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target))
                   SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
                 q+=GetPixelChannels(*image);

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 1ec4a23db9a2309a6314d798bd21aec8fca8ade0..d45ed33c319c529284f02b921113dacb95e43033 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4228,7 +4228,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              GetPixelPacket(image,q,&pixel);
+              GetPixelPacketPixel(image,q,&pixel);
               if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
                 {
                   q+=GetPixelChannels(image);
@@ -4344,7 +4344,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              GetPixelPacket(image,q,&pixel);
+              GetPixelPacketPixel(image,q,&pixel);
               if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
                 {
                   q+=GetPixelChannels(image);

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index f6735fab54297599d79f2bfcf7c623128dacaf2d..24a561d7cff9d2565fad27442e17127fb1018130 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -198,7 +198,7 @@ static inline PixelTrait GetPixelRedTraits(const Image *image)
   return(image->channel_map[RedPixelChannel].traits);
 }
 
-static inline void GetPixelPacket(const Image *image,const Quantum *pixel,
+static inline void GetPixelPacketPixel(const Image *image,const Quantum *pixel,
   PixelPacket *packet)
 {
   packet->red=pixel[image->channel_map[RedPixelChannel].channel];

diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index cab87d9c87dc231f93c7b7579ddd72c170a96473..8eb43f92ac50974bbfb82830c31a3e76888a9ce7 100644 (file)
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -594,7 +594,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info,
             PixelPacket
               packet;
 
-            GetPixelPacket(image,q+count*GetPixelChannels(image),&packet);
+            GetPixelPacketPixel(image,q+count*GetPixelChannels(image),&packet);
             if (IsPixelEquivalent(image,q,&packet) == MagickFalse)
               break;
           }
@@ -838,7 +838,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
         PixelPacket
           packet;
 
-        GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+        GetPixelPacketPixel(image,p+count*GetPixelChannels(image),&packet);
         if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
           break;
       }
@@ -933,7 +933,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
         PixelPacket
           packet;
 
-        GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+        GetPixelPacketPixel(image,p+count*GetPixelChannels(image),&packet);
         if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
           break;
       }

diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index bc0c380fdfc49ecb1388c05f084add7589f97efe..0d90a0881b6b5b5707695b1298c67c65b04c4063 100644 (file)
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -451,7 +451,7 @@ static MagickBooleanType GetOneAuthenticPixelFromStream(Image *image,
   q=GetAuthenticPixelsStream(image,x,y,1,1,exception);
   if (q != (Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,q,pixel);
+  GetPixelPacketPixel(image,q,pixel);
   return(MagickTrue);
 }
 \f
@@ -501,7 +501,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
   p=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,p,pixel);
+  GetPixelPacketPixel(image,p,pixel);
   if (image->colorspace == CMYKColorspace)
     pixel->black=GetPixelBlack(image,p);
   return(MagickTrue);

diff --git a/coders/png.c b/coders/png.c
index aa5f73be05eb3fd7529ec4ad59e40cff5781a7c8..8b162679c3456c3cf3bd992cc8f045c19eadf9ff 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -8079,7 +8079,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                  {
                    if (number_opaque == 0)
                      {
-                       GetPixelPacket(image, q, opaque);
+                       GetPixelPacketPixel(image, q, opaque);
                        opaque[0].alpha=OpaqueAlpha;
                        number_opaque=1;
                      }
@@ -8094,7 +8094,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        number_opaque < 259)
                      {
                        number_opaque++;
-                       GetPixelPacket(image, q, opaque+i);
+                       GetPixelPacketPixel(image, q, opaque+i);
                        opaque[i].alpha=OpaqueAlpha;
                      }
                  }
@@ -8105,7 +8105,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                  {
                    if (number_transparent == 0)
                      {
-                       GetPixelPacket(image, q, transparent);
+                       GetPixelPacketPixel(image, q, transparent);
                        ping_trans_color.red=(unsigned short)
                          GetPixelRed(image,q);
                        ping_trans_color.green=(unsigned short)
@@ -8127,7 +8127,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        number_transparent < 259)
                      {
                        number_transparent++;
-                       GetPixelPacket(image,q,transparent+i);
+                       GetPixelPacketPixel(image,q,transparent+i);
                      }
                  }
              }
@@ -8137,7 +8137,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                  {
                    if (number_semitransparent == 0)
                      {
-                       GetPixelPacket(image,q,semitransparent);
+                       GetPixelPacketPixel(image,q,semitransparent);
                        number_semitransparent = 1;
                      }
 
@@ -8153,7 +8153,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        number_semitransparent < 259)
                      {
                        number_semitransparent++;
-                       GetPixelPacket(image, q, semitransparent+i);
+                       GetPixelPacketPixel(image, q, semitransparent+i);
                      }
                  }
              }

diff --git a/coders/ps.c b/coders/ps.c
index 1f08428e50c9415d6a5928679e23a42ef450ad39..945b1ebd73e0fa71bc30302b35428b73a6496c49 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1883,7 +1883,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image,
                 p=GetVirtualPixels(image,0,y,image->columns,1,exception);
                 if (p == (const Quantum *) NULL)
                   break;
-                GetPixelPacket(image,p,&pixel);
+                GetPixelPacketPixel(image,p,&pixel);
                 length=255;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
@@ -1907,7 +1907,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image,
                         }
                       length=0;
                     }
-                  GetPixelPacket(image,p,&pixel);
+                  GetPixelPacketPixel(image,p,&pixel);
                   p+=GetPixelChannels(image);
                 }
                 WriteRunlengthPacket(image,pixel,length,p);