]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 17 Nov 2011 02:11:32 +0000 (02:11 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 17 Nov 2011 02:11:32 +0000 (02:11 +0000)
47 files changed:
Magick++/lib/Image.cpp
MagickCore/attribute.c
MagickCore/cache.c
MagickCore/color.c
MagickCore/colormap.c
MagickCore/colorspace.c
MagickCore/compare.c
MagickCore/composite.c
MagickCore/compress.c
MagickCore/decorate.c
MagickCore/display.c
MagickCore/distort.c
MagickCore/draw.c
MagickCore/histogram.c
MagickCore/identify.c
MagickCore/image.c
MagickCore/layer.c
MagickCore/magick-config.h
MagickCore/morphology.c
MagickCore/paint.c
MagickCore/pixel-accessor.h
MagickCore/pixel-private.h
MagickCore/pixel.c
MagickCore/quantum-import.c
MagickCore/resample.c
MagickCore/shear.c
MagickCore/version.h
MagickCore/xwindow.c
MagickWand/pixel-wand.c
MagickWand/pixel-wand.h
coders/debug.c
coders/gif.c
coders/jbig.c
coders/jpeg.c
coders/map.c
coders/miff.c
coders/null.c
coders/palm.c
coders/png.c
coders/psd.c
coders/svg.c
coders/ttf.c
coders/txt.c
coders/wpg.c
coders/xc.c
coders/xpm.c
coders/xwd.c

index a9ebc5b1e193cd3bb3339ab615793d43353a28db..ef44e139c18ec90be3d6eafc7e11e70dee8502c9 100644 (file)
@@ -3553,7 +3553,7 @@ void Magick::Image::pixelColor ( const ssize_t x_, const ssize_t y_,
     // Set pixel value
   Quantum *pixel = pixels.get(x_, y_, 1, 1 );
   PixelInfo packet = color_;
-  MagickCore::SetPixelPixelInfo(constImage(),&packet,pixel);
+  MagickCore::SetPixelInfoPixel(constImage(),&packet,pixel);
   // Tell ImageMagick that pixels have been updated
   pixels.sync();
 
index 168d42dc9bf6adfaec8f289e8b890ce4b76c111c..fc2771af8bac0239f5cb98a4695da45a673950cc 100644 (file)
@@ -156,15 +156,15 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
       image_view=DestroyCacheView(image_view);
       return(bounds);
     }
-  SetPixelInfo(image,p,&target[0]);
+  GetPixelInfoPixel(image,p,&target[0]);
   GetPixelInfo(image,&target[1]);
   p=GetCacheViewVirtualPixels(image_view,(ssize_t) image->columns-1,0,1,1,
     exception);
-  SetPixelInfo(image,p,&target[1]);
+  GetPixelInfoPixel(image,p,&target[1]);
   GetPixelInfo(image,&target[2]);
   p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) image->rows-1,1,1,
     exception);
-  SetPixelInfo(image,p,&target[2]);
+  GetPixelInfoPixel(image,p,&target[2]);
   status=MagickTrue;
   GetPixelInfo(image,&zero);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -199,7 +199,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
     pixel=zero;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelInfo(image,p,&pixel);
+      GetPixelInfoPixel(image,p,&pixel);
       if ((x < bounding_box.x) &&
           (IsFuzzyEquivalencePixelInfo(&pixel,&target[0]) == MagickFalse))
         bounding_box.x=x;
index f5b23fcfa40488c3263e36b0e662e459336039d9..0647326775796cc1c87c7e2eb30741fde7e7ac79 100644 (file)
@@ -2295,7 +2295,7 @@ MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
   GetPixelInfo(image,pixel);
   if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  SetPixelInfo(image,p,pixel);
+  GetPixelInfoPixel(image,p,pixel);
   return(MagickTrue);
 }
 \f
@@ -3864,8 +3864,8 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
   {
     if ((p == (const Quantum *) NULL) || (r == (const Quantum *) NULL))
       break;
-    SetPixelInfo(image,p,&alpha);
-    SetPixelInfo(image,q,&beta);
+    GetPixelInfoPixel(image,p,&alpha);
+    GetPixelInfoPixel(image,q,&beta);
     MagickPixelCompositeMask(&beta,(MagickRealType) GetPixelIntensity(image,r),
       &alpha,alpha.alpha,&beta);
     SetPixelRed(image,ClampToQuantum(beta.red),q);
index 9760f8ec030e719935c3ae241176835979b3b28e..34b884ca0fd9a4ea58f8c3746024b1b5c633360c 100644 (file)
@@ -1662,9 +1662,9 @@ MagickExport MagickBooleanType IsEquivalentImage(const Image *image,
         for (i=0; i < (ssize_t) target_image->columns; i++)
         {
           p=GetCacheViewVirtualPixels(image_view,x+i,y+j,1,1,exception);
-          SetPixelInfo(image,p,&pixel);
+          GetPixelInfoPixel(image,p,&pixel);
           q=GetCacheViewVirtualPixels(target_view,i,j,1,1,exception);
-          SetPixelInfo(image,q,&target);
+          GetPixelInfoPixel(image,q,&target);
           if (IsFuzzyEquivalencePixelInfo(&pixel,&target) == MagickFalse)
             break;
         }
index db7c7214bf05f631bd1be94e36912c4286679433..2e577b4af6e19ec32ec53c41421eb44827145197 100644 (file)
@@ -225,7 +225,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
       if (index < 0)
         index+=(ssize_t) image->colors;
       SetPixelIndex(image,(Quantum) index,q);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -362,7 +362,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image,
     {
       index=(Quantum) pixels[(ssize_t) GetPixelIndex(image,q)];
       SetPixelIndex(image,index,q);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index f4aa655c1896dd6e6c281416adf8f173c90a1935..6aaf516c520039efa991de8e0f02d1998ea9c3eb 100644 (file)
@@ -330,9 +330,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
         pixel=zero;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetPixelInfo(image,q,&pixel);
+          GetPixelInfoPixel(image,q,&pixel);
           ConvertRGBToCMYK(&pixel);
-          SetPixelPixelInfo(image,&pixel,q);
+          SetPixelInfoPixel(image,&pixel,q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1759,9 +1759,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
         pixel=zero;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetPixelInfo(image,q,&pixel);
+          GetPixelInfoPixel(image,q,&pixel);
           ConvertCMYKToRGB(&pixel);
-          SetPixelPixelInfo(image,&pixel,q);
+          SetPixelInfoPixel(image,&pixel,q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
index 4b5bd0fa1c433bf77d9c4d104afd3b0091e50eb2..e380b1ed68c911229f4ce4cc90fcc66609c069d9 100644 (file)
@@ -245,9 +245,9 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
           difference=MagickTrue;
       }
       if (difference == MagickFalse)
-        SetPixelPixelInfo(highlight_image,&lowlight,r);
+        SetPixelInfoPixel(highlight_image,&lowlight,r);
       else
-        SetPixelPixelInfo(highlight_image,&highlight,r);
+        SetPixelInfoPixel(highlight_image,&highlight,r);
       p+=GetPixelChannels(image);
       q+=GetPixelChannels(reconstruct_image);
       r+=GetPixelChannels(highlight_image);
index f54ad4e560c045b35bf7dd64f6f8e4c29b6dc047..c99afb631882537356cd0645cc4e4172fbee87f4 100644 (file)
@@ -1855,7 +1855,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             GetPixelGreen(composite_image,p));
           (void) ResamplePixelColor(resample_filter,(double) x_offset+x,
             (double) y_offset+y,&pixel);
-          SetPixelPixelInfo(destination_image,&pixel,q);
+          SetPixelInfoPixel(destination_image,&pixel,q);
           p+=GetPixelChannels(composite_image);
           q+=GetPixelChannels(destination_image);
         }
@@ -2027,7 +2027,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           pixel.alpha=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale*
             pixel.alpha)*(1.0-QuantumScale*
             GetPixelAlpha(composite_image,p)));
-          SetPixelPixelInfo(destination_image,&pixel,q);
+          SetPixelInfoPixel(destination_image,&pixel,q);
           p+=GetPixelChannels(composite_image);
           q+=GetPixelChannels(destination_image);
         }
index 39ef70c0a4941c7b9710de485132717624c1cd09..9c48be3a51786c0421236b569b2615f5deea62e3 100644 (file)
@@ -635,7 +635,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image,
     {
       index=(Quantum) (*p++);
       SetPixelIndex(image,index,q);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index 4771b9ea035a4aee5e84c0997401a47f052fefc4..0514d40400d70df5d9958ce7719e6dd78bc54818 100644 (file)
@@ -303,14 +303,14 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < (ssize_t) (frame_image->columns-y); x++)
             {
               if (x < y)
-                SetPixelPixelInfo(frame_image,&highlight,q);
+                SetPixelInfoPixel(frame_image,&highlight,q);
               else
-                SetPixelPixelInfo(frame_image,&accentuate,q);
+                SetPixelInfoPixel(frame_image,&accentuate,q);
               q+=GetPixelChannels(frame_image);
             }
             for ( ; x < (ssize_t) frame_image->columns; x++)
             {
-              SetPixelPixelInfo(frame_image,&shadow,q);
+              SetPixelInfoPixel(frame_image,&shadow,q);
               q+=GetPixelChannels(frame_image);
             }
           }
@@ -318,18 +318,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           {
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&highlight,q);
+              SetPixelInfoPixel(frame_image,&highlight,q);
               q+=GetPixelChannels(frame_image);
             }
             width=frame_image->columns-2*frame_info->outer_bevel;
             for (x=0; x < (ssize_t) width; x++)
             {
-              SetPixelPixelInfo(frame_image,&matte,q);
+              SetPixelInfoPixel(frame_image,&matte,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&shadow,q);
+              SetPixelInfoPixel(frame_image,&shadow,q);
               q+=GetPixelChannels(frame_image);
             }
           }
@@ -337,12 +337,12 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           {
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&highlight,q);
+              SetPixelInfoPixel(frame_image,&highlight,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
             {
-              SetPixelPixelInfo(frame_image,&matte,q);
+              SetPixelInfoPixel(frame_image,&matte,q);
               q+=GetPixelChannels(frame_image);
             }
             width=image->columns+((size_t) frame_info->inner_bevel << 1)-
@@ -350,25 +350,25 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < (ssize_t) width; x++)
             {
               if (x < y)
-                SetPixelPixelInfo(frame_image,&shadow,q);
+                SetPixelInfoPixel(frame_image,&shadow,q);
               else
-                SetPixelPixelInfo(frame_image,&trough,q);
+                SetPixelInfoPixel(frame_image,&trough,q);
               q+=GetPixelChannels(frame_image);
             }
             for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
             {
-              SetPixelPixelInfo(frame_image,&highlight,q);
+              SetPixelInfoPixel(frame_image,&highlight,q);
               q+=GetPixelChannels(frame_image);
             }
             width=frame_info->width-frame_info->x-image->columns-bevel_width;
             for (x=0; x < (ssize_t) width; x++)
             {
-              SetPixelPixelInfo(frame_image,&matte,q);
+              SetPixelInfoPixel(frame_image,&matte,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&shadow,q);
+              SetPixelInfoPixel(frame_image,&shadow,q);
               q+=GetPixelChannels(frame_image);
             }
           }
@@ -403,17 +403,17 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
       }
     for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
     {
-      SetPixelPixelInfo(frame_image,&highlight,q);
+      SetPixelInfoPixel(frame_image,&highlight,q);
       q+=GetPixelChannels(frame_image);
     }
     for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
     {
-      SetPixelPixelInfo(frame_image,&matte,q);
+      SetPixelInfoPixel(frame_image,&matte,q);
       q+=GetPixelChannels(frame_image);
     }
     for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
     {
-      SetPixelPixelInfo(frame_image,&shadow,q);
+      SetPixelInfoPixel(frame_image,&shadow,q);
       q+=GetPixelChannels(frame_image);
     }
     /*
@@ -423,7 +423,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
         (image->matte != MagickFalse)))
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetPixelPixelInfo(frame_image,&interior,q);
+        SetPixelInfoPixel(frame_image,&interior,q);
         q+=GetPixelChannels(frame_image);
       }
     else
@@ -455,18 +455,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
       }
     for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
     {
-      SetPixelPixelInfo(frame_image,&highlight,q);
+      SetPixelInfoPixel(frame_image,&highlight,q);
       q+=GetPixelChannels(frame_image);
     }
     width=frame_info->width-frame_info->x-image->columns-bevel_width;
     for (x=0; x < (ssize_t) width; x++)
     {
-      SetPixelPixelInfo(frame_image,&matte,q);
+      SetPixelInfoPixel(frame_image,&matte,q);
       q+=GetPixelChannels(frame_image);
     }
     for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
     {
-      SetPixelPixelInfo(frame_image,&shadow,q);
+      SetPixelInfoPixel(frame_image,&shadow,q);
       q+=GetPixelChannels(frame_image);
     }
     if (SyncCacheViewAuthenticPixels(frame_view,exception) == MagickFalse)
@@ -508,36 +508,36 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           {
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&highlight,q);
+              SetPixelInfoPixel(frame_image,&highlight,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
             {
-              SetPixelPixelInfo(frame_image,&matte,q);
+              SetPixelInfoPixel(frame_image,&matte,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < y; x++)
             {
-              SetPixelPixelInfo(frame_image,&shadow,q);
+              SetPixelInfoPixel(frame_image,&shadow,q);
               q+=GetPixelChannels(frame_image);
             }
             for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
             {
               if (x >= (ssize_t) (image->columns+2*frame_info->inner_bevel-y))
-                SetPixelPixelInfo(frame_image,&highlight,q);
+                SetPixelInfoPixel(frame_image,&highlight,q);
               else
-                SetPixelPixelInfo(frame_image,&accentuate,q);
+                SetPixelInfoPixel(frame_image,&accentuate,q);
               q+=GetPixelChannels(frame_image);
             }
             width=frame_info->width-frame_info->x-image->columns-bevel_width;
             for (x=0; x < (ssize_t) width; x++)
             {
-              SetPixelPixelInfo(frame_image,&matte,q);
+              SetPixelInfoPixel(frame_image,&matte,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&shadow,q);
+              SetPixelInfoPixel(frame_image,&shadow,q);
               q+=GetPixelChannels(frame_image);
             }
           }
@@ -546,18 +546,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           {
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&highlight,q);
+              SetPixelInfoPixel(frame_image,&highlight,q);
               q+=GetPixelChannels(frame_image);
             }
             width=frame_image->columns-2*frame_info->outer_bevel;
             for (x=0; x < (ssize_t) width; x++)
             {
-              SetPixelPixelInfo(frame_image,&matte,q);
+              SetPixelInfoPixel(frame_image,&matte,q);
               q+=GetPixelChannels(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
-              SetPixelPixelInfo(frame_image,&shadow,q);
+              SetPixelInfoPixel(frame_image,&shadow,q);
               q+=GetPixelChannels(frame_image);
             }
           }
@@ -565,15 +565,15 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           {
             for (x=0; x < y; x++)
             {
-              SetPixelPixelInfo(frame_image,&highlight,q);
+              SetPixelInfoPixel(frame_image,&highlight,q);
               q+=GetPixelChannels(frame_image);
             }
             for ( ; x < (ssize_t) frame_image->columns; x++)
             {
               if (x >= (ssize_t) (frame_image->columns-y))
-                SetPixelPixelInfo(frame_image,&shadow,q);
+                SetPixelInfoPixel(frame_image,&shadow,q);
               else
-                SetPixelPixelInfo(frame_image,&trough,q);
+                SetPixelInfoPixel(frame_image,&trough,q);
               q+=GetPixelChannels(frame_image);
             }
           }
index c924544e9efd7c92349e0747a1e2dc93dd91cf29..94d41aeebbb46e7ff7613d4d59ca7890caab1962 100644 (file)
@@ -13295,7 +13295,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info,
             break;
           for (j=0; j < (int) width; j++)
           {
-            SetPixelPixelInfo(image,&pixel,s);
+            SetPixelInfoPixel(image,&pixel,s);
             s+=GetPixelChannels(image);
           }
           if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index 2c24a8beb1d15c0db7ecad2bb0b1bce52f27614e..326e3c6da43e3fcaf075c55ea6a200f52ee28e2d 100644 (file)
@@ -2648,7 +2648,7 @@ if ( d.x == 0.5 && d.y == 0.5 ) {
 
         if ( validity <= 0.0 ) {
           /* result of distortion is an invalid pixel - don't resample */
-          SetPixelPixelInfo(distort_image,&invalid,q);
+          SetPixelInfoPixel(distort_image,&invalid,q);
         }
         else {
           /* resample the source image to find its correct color */
@@ -2660,7 +2660,7 @@ if ( d.x == 0.5 && d.y == 0.5 ) {
             CompositePixelInfoBlend(&pixel,validity,&invalid,(1.0-validity),
               &pixel);
           }
-          SetPixelPixelInfo(distort_image,&pixel,q);
+          SetPixelInfoPixel(distort_image,&pixel,q);
         }
         q+=GetPixelChannels(distort_image);
       }
@@ -2921,7 +2921,7 @@ MagickExport Image *SparseColorImage(const Image *image,
       GetPixelInfo(sparse_image,&pixel);
       for (i=0; i < (ssize_t) image->columns; i++)
       {
-        SetPixelInfo(image,q,&pixel);
+        GetPixelInfoPixel(image,q,&pixel);
         switch (sparse_method)
         {
           case BarycentricColorInterpolate:
@@ -3070,7 +3070,7 @@ MagickExport Image *SparseColorImage(const Image *image,
         if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
             (image->matte != MagickFalse))
           pixel.alpha*=QuantumRange;
-        SetPixelPixelInfo(sparse_image,&pixel,q);
+        SetPixelInfoPixel(sparse_image,&pixel,q);
         q+=GetPixelChannels(sparse_image);
       }
       sync=SyncCacheViewAuthenticPixels(sparse_view,exception);
index 99a34ec1a3ddd38046e3798cd681150a823f1d31..54ab11da6c25ce3fdedb6e871eeb816b62468463 100644 (file)
@@ -1198,10 +1198,10 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
         inverse_affine.ty;
       (void) InterpolatePixelInfo(source,source_view,UndefinedInterpolatePixel,
         point.x,point.y,&pixel,exception);
-      SetPixelInfo(image,q,&composite);
+      GetPixelInfoPixel(image,q,&composite);
       CompositePixelInfoOver(&pixel,pixel.alpha,&composite,composite.alpha,
         &composite);
-      SetPixelPixelInfo(image,&composite,q);
+      SetPixelInfoPixel(image,&composite,q);
       x_offset++;
       q+=GetPixelChannels(image);
     }
@@ -3280,7 +3280,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image,
       offset/=length;
     for (x=bounding_box.x; x < (ssize_t) bounding_box.width; x++)
     {
-      SetPixelInfo(image,q,&pixel);
+      GetPixelInfoPixel(image,q,&pixel);
       switch (gradient->spread)
       {
         case UndefinedSpread:
@@ -3414,7 +3414,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image,
       }
       CompositePixelInfoOver(&composite,composite.alpha,&pixel,pixel.alpha,
         &pixel);
-      SetPixelPixelInfo(image,&pixel,q);
+      SetPixelInfoPixel(image,&pixel,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3883,7 +3883,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
               (y == (ssize_t) ceil(primitive_info->point.y-0.5)))
             {
               (void) GetStrokeColor(draw_info,x,y,&pixel,exception);
-              SetPixelPixelInfo(image,&pixel,q);
+              SetPixelInfoPixel(image,&pixel,q);
             }
           q+=GetPixelChannels(image);
         }
@@ -4169,7 +4169,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             break;
           GetPixelInfo(image,&pixel);
           (void) GetFillColor(draw_info,x,y,&pixel,exception);
-          SetPixelPixelInfo(image,&pixel,q);
+          SetPixelInfoPixel(image,&pixel,q);
           (void) SyncCacheViewAuthenticPixels(image_view,exception);
           break;
         }
@@ -4209,7 +4209,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
                   continue;
                 }
               (void) GetFillColor(draw_info,x,y,&pixel,exception);
-              SetPixelPixelInfo(image,&pixel,q);
+              SetPixelInfoPixel(image,&pixel,q);
               q+=GetPixelChannels(image);
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -4261,7 +4261,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               (void) GetFillColor(draw_info,x,y,&pixel,exception);
-              SetPixelPixelInfo(image,&pixel,q);
+              SetPixelInfoPixel(image,&pixel,q);
               q+=GetPixelChannels(image);
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
index 816268bdb7976e212b52ca85fadb61e2aa9ce76b..269c13d47d222407a8d75245817977189cab532f 100644 (file)
@@ -239,7 +239,7 @@ static CubeInfo *ClassifyImageColors(const Image *image,
       index=MaxTreeDepth-1;
       for (level=1; level < MaxTreeDepth; level++)
       {
-        SetPixelInfo(image,p,&pixel);
+        GetPixelInfoPixel(image,p,&pixel);
         id=ColorToNodeId(image,&pixel,index);
         if (node_info->child[id] == (NodeInfo *) NULL)
           {
@@ -705,7 +705,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image,
       index=MaxTreeDepth-1;
       for (level=1; level < MaxTreeDepth; level++)
       {
-        SetPixelInfo(image,p,&pixel);
+        GetPixelInfoPixel(image,p,&pixel);
         id=ColorToNodeId(image,&pixel,index);
         if (node_info->child[id] == (NodeInfo *) NULL)
           {
@@ -865,7 +865,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image,
       index=MaxTreeDepth-1;
       for (level=1; level < MaxTreeDepth; level++)
       {
-        SetPixelInfo(image,p,&pixel);
+        GetPixelInfoPixel(image,p,&pixel);
         id=ColorToNodeId(image,&pixel,index);
         if (node_info->child[id] == (NodeInfo *) NULL)
           {
index ea5a3a9303a12aab34660d86e4b5abe045659bc7..1cffefe20207df3bec8dd2b57219dc6aaa6d8ea2 100644 (file)
@@ -604,7 +604,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
                 pixel;
 
               GetPixelInfo(image,&pixel);
-              SetPixelInfo(image,p,&pixel);
+              GetPixelInfoPixel(image,p,&pixel);
               (void) QueryColorname(image,&pixel,SVGCompliance,tuple,
                 exception);
               (void) FormatLocaleFile(file,"  Alpha: %s ",tuple);
index 6ec59fa2a948b58e0b268b5b1e6d40c10e5e1e80..69317a8fdbc3291801368d948a18212a1a5e2779 100644 (file)
@@ -2073,7 +2073,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelPixelInfo(image,background,q);
+      SetPixelInfoPixel(image,background,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2467,7 +2467,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           if (GetPixelAlpha(image,q) == TransparentAlpha)
-            SetPixelPixelInfo(image,&background,q);
+            SetPixelInfoPixel(image,&background,q);
           q+=GetPixelChannels(image);
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2597,7 +2597,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
   if (image->background_color.alpha != OpaqueAlpha)
     image->matte=MagickTrue;
   background=image->background_color;
-  SetPacketPixelInfo(image,&background,&pixel);
+  SetPixelInfo(image,&background,&pixel);
   /*
     Set image background color.
   */
@@ -2622,7 +2622,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelPixelInfo(image,&background,q);
+      SetPixelInfoPixel(image,&background,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2703,7 +2703,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelPixelInfo(image,color,q);
+      SetPixelInfoPixel(image,color,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -4033,7 +4033,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception)
     {
       index=PushColormapIndex(image,(size_t) GetPixelIndex(image,q),
         &range_exception);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index 637158967716b867d90242f2aeb7aa72b5af1b67..b9b6603f5e8bb623a90c366fb07a5626da66a24a 100644 (file)
@@ -626,8 +626,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       break;
     for (y=0; y < (ssize_t) image1->rows; y++)
     {
-      SetPixelInfo(image1,p,&pixel1);
-      SetPixelInfo(image2,q,&pixel2);
+      GetPixelInfoPixel(image1,p,&pixel1);
+      GetPixelInfoPixel(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
       p+=GetPixelChannels(image1);
@@ -657,8 +657,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       break;
     for (y=0; y < (ssize_t) image1->rows; y++)
     {
-      SetPixelInfo(image1,p,&pixel1);
-      SetPixelInfo(image2,q,&pixel2);
+      GetPixelInfoPixel(image1,p,&pixel1);
+      GetPixelInfoPixel(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
       p+=GetPixelChannels(image1);
@@ -677,8 +677,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       break;
     for (x=0; x < (ssize_t) image1->columns; x++)
     {
-      SetPixelInfo(image1,p,&pixel1);
-      SetPixelInfo(image2,q,&pixel2);
+      GetPixelInfoPixel(image1,p,&pixel1);
+      GetPixelInfoPixel(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
       p+=GetPixelChannels(image1);
@@ -697,8 +697,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       break;
     for (x=0; x < (ssize_t) image1->columns; x++)
     {
-      SetPixelInfo(image1,p,&pixel1);
-      SetPixelInfo(image2,q,&pixel2);
+      GetPixelInfoPixel(image1,p,&pixel1);
+      GetPixelInfoPixel(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
       p+=GetPixelChannels(image1);
index 9df57932b9830642868a9293b9403cdbfb14319f..1d5e0df2dbb3e6930448d8c4165a69936611522a 100644 (file)
@@ -12,7 +12,9 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -75,7 +77,9 @@
 #endif
 
 /* Define if you have FFTW library */
-/* #undef FFTW_DELEGATE */
+#ifndef MAGICKCORE_FFTW_DELEGATE
+#define MAGICKCORE_FFTW_DELEGATE 1
+#endif
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
 #endif
 
 /* Define to 1 if you have the <CL/cl.h> header file. */
-/* #undef HAVE_CL_CL_H */
+#ifndef MAGICKCORE_HAVE_CL_CL_H
+#define MAGICKCORE_HAVE_CL_CL_H 1
+#endif
 
 /* Define to 1 if you have the <complex.h> header file. */
 #ifndef MAGICKCORE_HAVE_COMPLEX_H
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
 #endif
 
 /* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
 #endif
 
 /* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/octave/3.4.2:/usr/lib64/qt-3.3/lib:/usr/lib64/tracker-0.12:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
 
 /* Name of package */
 #ifndef MAGICKCORE_PACKAGE
 #endif
 
 /* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
 #endif
 
 /* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-/* #undef WMF_DELEGATE */
+#ifndef MAGICKCORE_WMF_DELEGATE
+#define MAGICKCORE_WMF_DELEGATE 1
+#endif
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 /* #undef _MINIX */
 
 /* Define this for the OpenCL Accelerator */
-/* #undef _OPENCL */
+#ifndef MAGICKCORE__OPENCL
+#define MAGICKCORE__OPENCL 1
+#endif
 
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */
index 462b1f335194a638e8d0088df68df4a8225b62b3..d8694c045c6dea7dea403054bb531acb8f8e596a 100644 (file)
@@ -3406,7 +3406,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
 
       /* Starting Defaults */
       GetPixelInfo(image,&result);
-      SetPixelInfo(image,q,&result);
+      GetPixelInfoPixel(image,q,&result);
       if ( method != VoronoiMorphology )
         result.alpha = QuantumRange - result.alpha;
 
@@ -3464,7 +3464,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 if ( IsNan(*k) ) continue;
                 if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image),
                       &result);
                     result.alpha += *k;
                   }
@@ -3479,7 +3479,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 if ( IsNan(*k) ) continue;
                 if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image),
                       &result);
                     result.alpha += *k;
                   }
@@ -3492,7 +3492,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
       /* Assign the resulting pixel values - Clamping Result */
       switch ( method ) {
         case VoronoiMorphology:
-          SetPixelPixelInfo(image,&result,q);
+          SetPixelInfoPixel(image,&result,q);
           break;
         default:
           if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
@@ -3590,7 +3590,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
 
       /* Default - previously modified pixel */
       GetPixelInfo(image,&result);
-      SetPixelInfo(image,q,&result);
+      GetPixelInfoPixel(image,q,&result);
       if ( method != VoronoiMorphology )
         result.alpha = QuantumRange - result.alpha;
 
@@ -3648,7 +3648,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 if ( IsNan(*k) ) continue;
                 if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image),
                       &result);
                     result.alpha += *k;
                   }
@@ -3663,7 +3663,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 if ( IsNan(*k) ) continue;
                 if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image),
                       &result);
                     result.alpha += *k;
                   }
@@ -3676,7 +3676,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
       /* Assign the resulting pixel values - Clamping Result */
       switch ( method ) {
         case VoronoiMorphology:
-          SetPixelPixelInfo(image,&result,q);
+          SetPixelInfoPixel(image,&result,q);
           break;
         default:
           if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
index 75f1a15190308a6f52bf6e74314d0508fbc4ed39..a6ca982ed03c81539c6a02f8f41f4e7c79801cc6 100644 (file)
@@ -237,7 +237,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
     {
       if (GetPixelAlpha(image,q) == TransparentAlpha)
         break;
-      SetPixelInfo(image,p,&pixel);
+      GetPixelInfoPixel(image,p,&pixel);
       if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
         break;
       SetPixelAlpha(floodplane_image,TransparentAlpha,q);
@@ -270,7 +270,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
               {
                 if (GetPixelAlpha(image,q) == TransparentAlpha)
                   break;
-                SetPixelInfo(image,p,&pixel);
+                GetPixelInfoPixel(image,p,&pixel);
                 if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
                   break;
                 SetPixelAlpha(floodplane_image,TransparentAlpha,q);
@@ -299,7 +299,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
           {
             if (GetPixelAlpha(image,q) == TransparentAlpha)
               break;
-            SetPixelInfo(image,p,&pixel);
+            GetPixelInfoPixel(image,p,&pixel);
             if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
               break;
             p+=GetPixelChannels(image);
@@ -801,7 +801,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image,
     pixel=zero;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelInfo(image,q,&pixel);
+      GetPixelInfoPixel(image,q,&pixel);
       if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
         {
           if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
@@ -938,7 +938,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image,
     pixel=zero;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelInfo(image,q,&pixel);
+      GetPixelInfoPixel(image,q,&pixel);
       if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
         SetPixelAlpha(image,opacity,q);
       q+=GetPixelChannels(image);
@@ -1067,7 +1067,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
     GetPixelInfo(image,&pixel);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelInfo(image,q,&pixel);
+      GetPixelInfoPixel(image,q,&pixel);
       match=((pixel.red >= low->red) && (pixel.red <= high->red) &&
         (pixel.green >= low->green) && (pixel.green <= high->green) &&
         (pixel.blue  >= low->blue) && (pixel.blue <= high->blue)) ? MagickTrue :
index 90d3e7e454fa977ed354ef313c2d60de90f61a98..ab71d0f40949353dc73e9447df22deb4fe5c94fa 100644 (file)
@@ -29,120 +29,138 @@ extern "C" {
 
 #undef index
 
-static inline Quantum GetPixelAlpha(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelAlpha(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
+  if (image->channel_map[AlphaPixelChannel].traits == UndefinedPixelTrait)
+    return(OpaqueAlpha);
   return(pixel[image->channel_map[AlphaPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelAlphaTraits(const Image *image)
+static inline PixelTrait GetPixelAlphaTraits(const Image *restrict image)
 {
   return(image->channel_map[AlphaPixelChannel].traits);
 }
 
-static inline Quantum GetPixelBlack(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelBlack(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
+  if (image->channel_map[BlackPixelChannel].traits == UndefinedPixelTrait)
+    return(0);
   return(pixel[image->channel_map[BlackPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelBlackTraits(const Image *image)
+static inline PixelTrait GetPixelBlackTraits(const Image *restrict image)
 {
   return(image->channel_map[BlackPixelChannel].traits);
 }
 
-static inline Quantum GetPixelBlue(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelBlue(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[BluePixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelBlueTraits(const Image *image)
+static inline PixelTrait GetPixelBlueTraits(const Image *restrict image)
 {
   return(image->channel_map[BluePixelChannel].traits);
 }
 
-static inline Quantum GetPixelCb(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelCb(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[CbPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelCbTraits(const Image *image)
+static inline PixelTrait GetPixelCbTraits(const Image *restrict image)
 {
   return(image->channel_map[CbPixelChannel].traits);
 }
 
-static inline Quantum GetPixelChannel(const Image *image,
-  const PixelChannel channel,const Quantum *pixel)
+static inline Quantum GetPixelChannel(const Image *restrict image,
+  const PixelChannel channel,const Quantum *restrict pixel)
 {
+  if (image->channel_map[channel].traits == UndefinedPixelTrait)
+    return(0);
   return(pixel[image->channel_map[channel].channel]);
 }
 
-static inline PixelChannel GetPixelChannelMapChannel(const Image *image,
-  const PixelChannel channel)
+static inline PixelChannel GetPixelChannelMapChannel(
+  const Image *restrict image,const PixelChannel channel)
 {
   return(image->channel_map[channel].channel);
 }
 
-static inline PixelTrait GetPixelChannelMapTraits(const Image *image,
+static inline PixelTrait GetPixelChannelMapTraits(const Image *restrict image,
   const PixelChannel channel)
 {
   return(image->channel_map[channel].traits);
 }
 
-static inline size_t GetPixelChannels(const Image *image)
+static inline size_t GetPixelChannels(const Image *restrict image)
 {
   return(image->number_channels);
 }
 
-static inline Quantum GetPixelCr(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelCr(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[CrPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelCrTraits(const Image *image)
+static inline PixelTrait GetPixelCrTraits(const Image *restrict image)
 {
   return(image->channel_map[CrPixelChannel].traits);
 }
 
-static inline Quantum GetPixelCyan(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelCyan(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[CyanPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelCyanTraits(const Image *image)
+static inline PixelTrait GetPixelCyanTraits(const Image *restrict image)
 {
   return(image->channel_map[CyanPixelChannel].traits);
 }
 
-static inline Quantum GetPixelGray(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelGray(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[GrayPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelGrayTraits(const Image *image)
+static inline PixelTrait GetPixelGrayTraits(const Image *restrict image)
 {
   return(image->channel_map[GrayPixelChannel].traits);
 }
 
-static inline Quantum GetPixelGreen(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelGreen(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[GreenPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelGreenTraits(const Image *image)
+static inline PixelTrait GetPixelGreenTraits(const Image *restrict image)
 {
   return(image->channel_map[GreenPixelChannel].traits);
 }
 
-static inline Quantum GetPixelIndex(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelIndex(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
+  if (image->channel_map[IndexPixelChannel].traits == UndefinedPixelTrait)
+    return(0);
   return(pixel[image->channel_map[IndexPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelIndexTraits(const Image *image)
+static inline PixelTrait GetPixelIndexTraits(const Image *restrict image)
 {
   return(image->channel_map[IndexPixelChannel].traits);
 }
 
-static inline Quantum GetPixelInfoIntensity(const PixelInfo *pixel_info)
+static inline Quantum GetPixelInfoIntensity(
+  const PixelInfo *restrict pixel_info)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*
@@ -153,7 +171,8 @@ static inline Quantum GetPixelInfoIntensity(const PixelInfo *pixel_info)
 #endif
 }
 
-static inline Quantum GetPixelInfoLuminance(const PixelInfo *pixel_info)
+static inline Quantum GetPixelInfoLuminance(
+  const PixelInfo *restrict pixel_info)
 {
   Quantum
     luminance;
@@ -168,75 +187,91 @@ static inline Quantum GetPixelInfoLuminance(const PixelInfo *pixel_info)
   return((Quantum) luminance);
 }
 
-static inline Quantum GetPixelMagenta(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelMagenta(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[MagentaPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelMagentaTraits(const Image *image)
+static inline PixelTrait GetPixelMagentaTraits(const Image *restrict image)
 {
   return(image->channel_map[MagentaPixelChannel].traits);
 }
 
-static inline size_t GetPixelMetaChannels(const Image *image)
+static inline size_t GetPixelMetaChannels(const Image *restrict image)
 {
   return(image->number_meta_channels);
 }
 
-static inline size_t GetPixelMetacontentExtent(const Image *image)
+static inline size_t GetPixelMetacontentExtent(const Image *restrict image)
 {
   return(image->metacontent_extent);
 }
 
-static inline Quantum GetPixelRed(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelRed(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[RedPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelRedTraits(const Image *image)
+static inline PixelTrait GetPixelRedTraits(const Image *restrict image)
 {
   return(image->channel_map[RedPixelChannel].traits);
 }
 
-static inline void GetPixelInfoPixel(const Image *image,const Quantum *pixel,
-  PixelInfo *packet)
+static inline void GetPixelInfoPixel(const Image *restrict image,
+  const Quantum *restrict pixel,PixelInfo *restrict pixel_info)
 {
-  packet->red=(double) pixel[image->channel_map[RedPixelChannel].channel];
-  packet->green=(double) pixel[image->channel_map[GreenPixelChannel].channel];
-  packet->blue=(double) pixel[image->channel_map[BluePixelChannel].channel];
-  packet->alpha=OpaqueAlpha;
+  pixel_info->red=(MagickRealType)
+    pixel[image->channel_map[RedPixelChannel].channel];
+  pixel_info->green=(MagickRealType)
+    pixel[image->channel_map[GreenPixelChannel].channel];
+  pixel_info->blue=(MagickRealType)
+    pixel[image->channel_map[BluePixelChannel].channel];
+  pixel_info->black=0;
+  if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
+    pixel_info->black=(MagickRealType)
+      pixel[image->channel_map[BlackPixelChannel].channel];
+  pixel_info->alpha=OpaqueAlpha;
   if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    packet->alpha=(double) pixel[image->channel_map[AlphaPixelChannel].channel];
+    pixel_info->alpha=(MagickRealType)
+      pixel[image->channel_map[AlphaPixelChannel].channel];
+  pixel_info->index=0;
+  if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait)
+    pixel_info->index=(MagickRealType)
+      pixel[image->channel_map[IndexPixelChannel].channel];
 }
 
-static inline PixelTrait GetPixelTraits(const Image *image,
+static inline PixelTrait GetPixelTraits(const Image *restrict image,
   const PixelChannel channel)
 {
   return(image->channel_map[channel].traits);
 }
 
-static inline Quantum GetPixelY(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelY(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[YPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelYTraits(const Image *image)
+static inline PixelTrait GetPixelYTraits(const Image *restrict image)
 {
   return(image->channel_map[YPixelChannel].traits);
 }
 
-static inline Quantum GetPixelYellow(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelYellow(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
   return(pixel[image->channel_map[YellowPixelChannel].channel]);
 }
 
-static inline PixelTrait GetPixelYellowTraits(const Image *image)
+static inline PixelTrait GetPixelYellowTraits(const Image *restrict image)
 {
   return(image->channel_map[YellowPixelChannel].traits);
 }
 
-static inline MagickBooleanType IsPixelEquivalent(const Image *image,
-  const Quantum *p,const PixelInfo *q)
+static inline MagickBooleanType IsPixelEquivalent(const Image *restrict image,
+  const Quantum *restrict p,const PixelInfo *restrict q)
 {
   if (((double) p[image->channel_map[RedPixelChannel].channel] == q->red) &&
       ((double) p[image->channel_map[GreenPixelChannel].channel] == q->green) &&
@@ -245,8 +280,8 @@ static inline MagickBooleanType IsPixelEquivalent(const Image *image,
   return(MagickFalse);
 }
 
-static inline MagickBooleanType IsPixelGray(const Image *image,
-  const Quantum *pixel)
+static inline MagickBooleanType IsPixelGray(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   if ((pixel[image->channel_map[RedPixelChannel].channel] ==
@@ -271,8 +306,8 @@ static inline MagickBooleanType IsPixelGray(const Image *image,
   return(MagickFalse);
 }
 
-static inline MagickBooleanType IsPixelInfoEquivalent(const PixelInfo *p,
-  const PixelInfo *q)
+static inline MagickBooleanType IsPixelInfoEquivalent(
+  const PixelInfo *restrict p,const PixelInfo *restrict q)
 {
   if ((p->matte != MagickFalse) && (q->matte == MagickFalse) &&
       (fabs(p->alpha-OpaqueAlpha) > 0.5))
@@ -298,8 +333,8 @@ static inline MagickBooleanType IsPixelInfoEquivalent(const PixelInfo *p,
   return(MagickTrue);
 }
 
-static inline MagickBooleanType IsPixelMonochrome(const Image *image,
-  const Quantum *pixel)
+static inline MagickBooleanType IsPixelMonochrome(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   if (((pixel[image->channel_map[RedPixelChannel].channel] == 0) ||
@@ -330,10 +365,12 @@ static inline MagickBooleanType IsPixelMonochrome(const Image *image,
   return(MagickFalse);
 }
 
-static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel)
+static inline MagickBooleanType IsPixelInfoGray(
+  const PixelInfo *restrict pixel_info)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if ((pixel->red == pixel->green) && (pixel->green == pixel->blue))
+  if ((pixel_info->red == pixel_info->green) &&
+      (pixel_info->green == pixel_info->blue))
     return(MagickTrue);
 #else
   {
@@ -341,8 +378,8 @@ static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel)
       alpha,
       beta;
 
-    alpha=pixel->red-(double) pixel->green;
-    beta=pixel->green-(double) pixel->blue;
+    alpha=pixel_info->red-(double) pixel_info->green;
+    beta=pixel_info->green-(double) pixel_info->blue;
     if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
       return(MagickTrue);
   }
@@ -351,11 +388,12 @@ static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel)
 }
 
 static inline MagickBooleanType IsPixelInfoMonochrome(
-  const PixelInfo *pixel)
+  const PixelInfo *restrict pixel_info)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if (((pixel->red == 0) || (pixel->red == (Quantum) QuantumRange)) &&
-      (pixel->red == pixel->green) && (pixel->green == pixel->blue))
+  if (((pixel_info->red == 0) || (pixel_info->red == (Quantum) QuantumRange)) &&
+      (pixel_info->red == pixel_info->green) &&
+      (pixel_info->green == pixel_info->blue))
     return(MagickTrue);
 #else
   {
@@ -363,10 +401,10 @@ static inline MagickBooleanType IsPixelInfoMonochrome(
       alpha,
       beta;
 
-    alpha=pixel->red-(double) pixel->green;
-    beta=pixel->green-(double) pixel->blue;
-    if (((fabs(pixel->red) <= MagickEpsilon) ||
-         (fabs(pixel->red-QuantumRange) <= MagickEpsilon)) &&
+    alpha=pixel_info->red-(double) pixel_info->green;
+    beta=pixel_info->green-(double) pixel_info->blue;
+    if (((fabs(pixel_info->red) <= MagickEpsilon) ||
+         (fabs(pixel_info->red-QuantumRange) <= MagickEpsilon)) &&
         (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
       return(MagickTrue);
     }
@@ -374,27 +412,11 @@ static inline MagickBooleanType IsPixelInfoMonochrome(
   return(MagickFalse);
 }
 
-static inline void SetPacketPixelInfo(const Image *image,
-  const PixelInfo *pixel_info,PixelInfo *packet)
+static inline void SetPixelAlpha(const Image *restrict image,
+  const Quantum alpha,Quantum *restrict pixel)
 {
-  packet->red=pixel_info->red;
-  packet->green=pixel_info->green;
-  packet->blue=pixel_info->blue;
-  packet->black=0;
-  if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
-    packet->black=pixel_info->black;
-  packet->alpha=OpaqueAlpha;
   if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    packet->alpha=pixel_info->alpha;
-  packet->index=0;
-  if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait)
-    packet->index=pixel_info->index;
-}
-
-static inline void SetPixelAlpha(const Image *image,const Quantum alpha,
-  Quantum *pixel)
-{
-  pixel[image->channel_map[AlphaPixelChannel].channel]=alpha;
+    pixel[image->channel_map[AlphaPixelChannel].channel]=alpha;
 }
 
 static inline void SetPixelAlphaTraits(Image *image,const PixelTrait traits)
@@ -402,10 +424,11 @@ static inline void SetPixelAlphaTraits(Image *image,const PixelTrait traits)
   image->channel_map[AlphaPixelChannel].traits=traits;
 }
 
-static inline void SetPixelBlack(const Image *image,const Quantum black,
-  Quantum *pixel)
+static inline void SetPixelBlack(const Image *restrict image,
+  const Quantum black,Quantum *restrict pixel)
 {
-  pixel[image->channel_map[BlackPixelChannel].channel]=black;
+  if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
+    pixel[image->channel_map[BlackPixelChannel].channel]=black;
 }
 
 static inline void SetPixelBlackTraits(Image *image,const PixelTrait traits)
@@ -413,8 +436,8 @@ static inline void SetPixelBlackTraits(Image *image,const PixelTrait traits)
   image->channel_map[BlackPixelChannel].traits=traits;
 }
 
-static inline void SetPixelBlue(const Image *image,const Quantum blue,
-  Quantum *pixel)
+static inline void SetPixelBlue(const Image *restrict image,const Quantum blue,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[BluePixelChannel].channel]=blue;
 }
@@ -424,8 +447,8 @@ static inline void SetPixelBlueTraits(Image *image,const PixelTrait traits)
   image->channel_map[BluePixelChannel].traits=traits;
 }
 
-static inline void SetPixelCb(const Image *image,const Quantum cb,
-  Quantum *pixel)
+static inline void SetPixelCb(const Image *restrict image,const Quantum cb,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[CbPixelChannel].channel]=cb;
 }
@@ -435,13 +458,14 @@ static inline void SetPixelCbTraits(Image *image,const PixelTrait traits)
   image->channel_map[CbPixelChannel].traits=traits;
 }
 
-static inline void SetPixelChannel(const Image *image,
-  const PixelChannel channel,const Quantum quantum,Quantum *pixel)
+static inline void SetPixelChannel(const Image *restrict image,
+  const PixelChannel channel,const Quantum quantum,Quantum *restrict pixel)
 {
-  pixel[image->channel_map[channel].channel]=quantum;
+  if (image->channel_map[channel].traits != UndefinedPixelTrait)
+    pixel[image->channel_map[channel].channel]=quantum;
 }
 
-static inline void SetPixelChannelMapChannel(const Image *image,
+static inline void SetPixelChannelMapChannel(const Image *restrict image,
   const PixelChannel channel,const PixelChannel channels)
 {
   image->channel_map[channel].channel=channels;
@@ -464,8 +488,8 @@ static inline void SetPixelChannelMapTraits(Image *image,
   image->channel_map[channel].traits=traits;
 }
 
-static inline void SetPixelCr(const Image *image,const Quantum cr,
-  Quantum *pixel)
+static inline void SetPixelCr(const Image *restrict image,const Quantum cr,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[CrPixelChannel].channel]=cr;
 }
@@ -475,14 +499,14 @@ static inline void SetPixelCrTraits(Image *image,const PixelTrait traits)
   image->channel_map[CrPixelChannel].traits=traits;
 }
 
-static inline void SetPixelCyan(const Image *image,const Quantum cyan,
-  Quantum *pixel)
+static inline void SetPixelCyan(const Image *restrict image,const Quantum cyan,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[CyanPixelChannel].channel]=cyan;
 }
 
-static inline void SetPixelGray(const Image *image,const Quantum gray,
-  Quantum *pixel)
+static inline void SetPixelGray(const Image *restrict image,const Quantum gray,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[GrayPixelChannel].channel]=gray;
 }
@@ -492,8 +516,8 @@ static inline void SetPixelGrayTraits(Image *image,const PixelTrait traits)
   image->channel_map[GrayPixelChannel].traits=traits;
 }
 
-static inline void SetPixelGreen(const Image *image,const Quantum green,
-  Quantum *pixel)
+static inline void SetPixelGreen(const Image *restrict image,
+  const Quantum green,Quantum *restrict pixel)
 {
   pixel[image->channel_map[GreenPixelChannel].channel]=green;
 }
@@ -503,10 +527,11 @@ static inline void SetPixelGreenTraits(Image *image,const PixelTrait traits)
   image->channel_map[GreenPixelChannel].traits=traits;
 }
 
-static inline void SetPixelIndex(const Image *image,const Quantum index,
-  Quantum *pixel)
+static inline void SetPixelIndex(const Image *restrict image,
+  const Quantum index,Quantum *restrict pixel)
 {
-  pixel[image->channel_map[IndexPixelChannel].channel]=index;
+  if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait)
+    pixel[image->channel_map[IndexPixelChannel].channel]=index;
 }
 
 static inline void SetPixelIndexTraits(Image *image,const PixelTrait traits)
@@ -514,31 +539,42 @@ static inline void SetPixelIndexTraits(Image *image,const PixelTrait traits)
   image->channel_map[IndexPixelChannel].traits=traits;
 }
 
-static inline void SetPixelInfo(const Image *image,const Quantum *pixel,
-  PixelInfo *pixel_info)
+static inline void SetPixelInfo(const Image *restrict image,
+  const PixelInfo *restrict p,PixelInfo *restrict q)
 {
-  pixel_info->red=(MagickRealType)
-    pixel[image->channel_map[RedPixelChannel].channel];
-  pixel_info->green=(MagickRealType)
-    pixel[image->channel_map[GreenPixelChannel].channel];
-  pixel_info->blue=(MagickRealType)
-    pixel[image->channel_map[BluePixelChannel].channel];
-  pixel_info->black=0;
+  q->red=p->red;
+  q->green=p->green;
+  q->blue=p->blue;
+  q->black=0;
   if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
-    pixel_info->black=(MagickRealType)
-      pixel[image->channel_map[BlackPixelChannel].channel];
-  pixel_info->alpha=OpaqueAlpha;
+    q->black=p->black;
+  q->alpha=OpaqueAlpha;
   if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    pixel_info->alpha=(MagickRealType)
-      pixel[image->channel_map[AlphaPixelChannel].channel];
-  pixel_info->index=0;
+    q->alpha=p->alpha;
+  q->index=0;
   if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait)
-    pixel_info->index=(MagickRealType)
-      pixel[image->channel_map[IndexPixelChannel].channel];
+    q->index=p->index;
 }
 
-static inline void SetPixelMagenta(const Image *image,const Quantum magenta,
-  Quantum *pixel)
+static inline void SetPixelInfoPixel(const Image *restrict image,
+  const PixelInfo *restrict pixel_info,Quantum *restrict pixel)
+{
+  pixel[image->channel_map[RedPixelChannel].channel]=
+    ClampToQuantum(pixel_info->red);
+  pixel[image->channel_map[GreenPixelChannel].channel]=
+    ClampToQuantum(pixel_info->green);
+  pixel[image->channel_map[BluePixelChannel].channel]=
+    ClampToQuantum(pixel_info->blue);
+  if (image->colorspace == CMYKColorspace)
+    pixel[image->channel_map[BlackPixelChannel].channel]=
+      ClampToQuantum(pixel_info->black);
+  if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
+    pixel[image->channel_map[AlphaPixelChannel].channel]=
+      ClampToQuantum(pixel_info->alpha);
+}
+
+static inline void SetPixelMagenta(const Image *restrict image,
+  const Quantum magenta,Quantum *restrict pixel)
 {
   pixel[image->channel_map[MagentaPixelChannel].channel]=magenta;
 }
@@ -559,8 +595,8 @@ static inline void SetPixelMetacontentExtent(Image *image,const size_t extent)
   image->metacontent_extent=extent;
 }
 
-static inline void SetPixelRed(const Image *image,const Quantum red,
-  Quantum *pixel)
+static inline void SetPixelRed(const Image *restrict image,const Quantum red,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[RedPixelChannel].channel]=red;
 }
@@ -570,25 +606,8 @@ static inline void SetPixelRedTraits(Image *image,const PixelTrait traits)
   image->channel_map[RedPixelChannel].traits=traits;
 }
 
-static inline void SetPixelPixelInfo(const Image *image,
-  const PixelInfo *pixel_info,Quantum *pixel)
-{
-  pixel[image->channel_map[RedPixelChannel].channel]=
-    ClampToQuantum(pixel_info->red);
-  pixel[image->channel_map[GreenPixelChannel].channel]=
-    ClampToQuantum(pixel_info->green);
-  pixel[image->channel_map[BluePixelChannel].channel]=
-    ClampToQuantum(pixel_info->blue);
-  if (image->colorspace == CMYKColorspace)
-    pixel[image->channel_map[BlackPixelChannel].channel]=
-      ClampToQuantum(pixel_info->black);
-  if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    pixel[image->channel_map[AlphaPixelChannel].channel]=
-      ClampToQuantum(pixel_info->alpha);
-}
-
-static inline void SetPixelYellow(const Image *image,const Quantum yellow,
-  Quantum *pixel)
+static inline void SetPixelYellow(const Image *restrict image,
+  const Quantum yellow,Quantum *restrict pixel)
 {
   pixel[image->channel_map[YellowPixelChannel].channel]=yellow;
 }
@@ -598,7 +617,8 @@ static inline void SetPixelYellowTraits(Image *image,const PixelTrait traits)
   image->channel_map[YellowPixelChannel].traits=traits;
 }
 
-static inline void SetPixelY(const Image *image,const Quantum y,Quantum *pixel)
+static inline void SetPixelY(const Image *restrict image,const Quantum y,
+  Quantum *restrict pixel)
 {
   pixel[image->channel_map[YPixelChannel].channel]=y;
 }
@@ -608,7 +628,8 @@ static inline void SetPixelYTraits(Image *image,const PixelTrait traits)
   image->channel_map[YPixelChannel].traits=traits;
 }
 
-static inline Quantum GetPixelIntensity(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelIntensity(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   if ((pixel[image->channel_map[RedPixelChannel].channel] ==
@@ -638,7 +659,8 @@ static inline Quantum GetPixelIntensity(const Image *image,const Quantum *pixel)
 #endif
 }
 
-static inline Quantum GetPixelLuminance(const Image *image,const Quantum *pixel)
+static inline Quantum GetPixelLuminance(const Image *restrict image,
+  const Quantum *restrict pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (0.21267*pixel[image->channel_map[RedPixelChannel].channel]+
index dc517bcf33637429ae58eea4203165ccd4b9f1f0..50e849dea8a590d411eab438fa31848ba78d679c 100644 (file)
@@ -87,7 +87,7 @@ static inline MagickBooleanType IsMonochromePixel(const PixelInfo *pixel)
   return(MagickFalse);
 }
 
-static inline void SetPixelInfo(const Image *image,
+static inline void GetPixelInfo(const Image *image,
   const MagickPixelInfo *pixel,PixelInfo *color,IndexPacket *index)
 {
   SetPixelRed(color,ClampToQuantum(pixel->red));
index ccae297eac060437d2a618cd8e36034978684e08..193d63e4e08eba5ee2507b107893676da39c5d17 100644 (file)
@@ -4983,7 +4983,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
       filter_view=AcquireCacheView(filter_image);
       p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception);
       if (p != (const Quantum *) NULL)
-        SetPixelInfo(image,p,pixel);
+        GetPixelInfoPixel(image,p,pixel);
       filter_view=DestroyCacheView(filter_view);
       filter_image=DestroyImage(filter_image);
       break;
@@ -4996,7 +4996,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      SetPixelInfo(image,p,pixel);
+      GetPixelInfoPixel(image,p,pixel);
       break;
     }
     case MeshInterpolatePixel:
@@ -5128,7 +5128,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      SetPixelInfo(image,p,pixel);
+      GetPixelInfoPixel(image,p,pixel);
       break;
     }
     case SplineInterpolatePixel:
index 8d132e3ca5b398a04b625a9d37338b93face655c..91ff45d895e08f2e57ecdcffb095ab3197bfe6fa 100644 (file)
@@ -344,7 +344,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   0x00 : 0x01);
               SetPixelIndex(image,PushColormapIndex(image,pixel,
                 &range_exception),q);
-              SetPixelPixelInfo(image,image->colormap+(ssize_t)
+              SetPixelInfoPixel(image,image->colormap+(ssize_t)
                 GetPixelIndex(image,q),q);
               q+=channels;
             }
@@ -360,7 +360,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 0x00 : 0x01);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             q+=channels;
           }
@@ -376,13 +376,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             pixel=(unsigned char) ((*p >> 4) & 0xf);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             q+=channels;
             pixel=(unsigned char) ((*p) & 0xf);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p++;
             q+=channels;
@@ -392,7 +392,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             pixel=(unsigned char) ((*p++ >> 4) & 0xf);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             q+=channels;
           }
@@ -408,7 +408,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushCharPixel(p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p+=quantum_info->pad;
             q+=channels;
@@ -428,7 +428,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(
                   (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)),
                   &range_exception),q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                SetPixelInfoPixel(image,image->colormap+(ssize_t)
                   GetPixelIndex(image,q),q);
                 p+=quantum_info->pad;
                 q+=channels;
@@ -440,7 +440,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushShortPixel(endian,p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p+=quantum_info->pad;
             q+=channels;
@@ -462,7 +462,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 p=PushFloatPixel(&quantum_state,p,&pixel);
                 SetPixelIndex(image,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception),q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                SetPixelInfoPixel(image,image->colormap+(ssize_t)
                   GetPixelIndex(image,q),q);
                 p+=quantum_info->pad;
                 q+=channels;
@@ -474,7 +474,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushLongPixel(endian,p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p+=quantum_info->pad;
             q+=channels;
@@ -493,7 +493,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 p=PushDoublePixel(&quantum_state,p,&pixel);
                 SetPixelIndex(image,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception),q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                SetPixelInfoPixel(image,image->colormap+(ssize_t)
                   GetPixelIndex(image,q),q);
                 p+=quantum_info->pad;
                 q+=channels;
@@ -508,7 +508,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p+=quantum_info->pad;
             q+=channels;
@@ -589,7 +589,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             pixel=(unsigned char) ((*p >> 4) & 0xf);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             pixel=(unsigned char) ((*p) & 0xf);
             SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
@@ -608,7 +608,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushCharPixel(p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p=PushCharPixel(p,&pixel);
             SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
@@ -630,7 +630,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(
                   (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)),
                   &range_exception),q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                SetPixelInfoPixel(image,image->colormap+(ssize_t)
                   GetPixelIndex(image,q),q);
                 p=PushShortPixel(endian,p,&pixel);
                 SetPixelAlpha(image,ClampToQuantum((MagickRealType)
@@ -645,7 +645,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushShortPixel(endian,p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p=PushShortPixel(endian,p,&pixel);
             SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
@@ -669,7 +669,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 p=PushFloatPixel(&quantum_state,p,&pixel);
                 SetPixelIndex(image,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception),q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                SetPixelInfoPixel(image,image->colormap+(ssize_t)
                   GetPixelIndex(image,q),q);
                 p=PushFloatPixel(&quantum_state,p,&pixel);
                 SetPixelAlpha(image,ClampToQuantum(pixel),q);
@@ -683,7 +683,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushLongPixel(endian,p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p=PushLongPixel(endian,p,&pixel);
             SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
@@ -704,7 +704,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                 p=PushDoublePixel(&quantum_state,p,&pixel);
                 SetPixelIndex(image,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception),q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                SetPixelInfoPixel(image,image->colormap+(ssize_t)
                   GetPixelIndex(image,q),q);
                 p=PushDoublePixel(&quantum_state,p,&pixel);
                 SetPixelAlpha(image,ClampToQuantum(pixel),q);
@@ -722,7 +722,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
             SetPixelIndex(image,PushColormapIndex(image,pixel,
               &range_exception),q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t)
+            SetPixelInfoPixel(image,image->colormap+(ssize_t)
               GetPixelIndex(image,q),q);
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
             SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
index 2ef80675d3a2de14beade9bfb12ff6f6f8f5e83c..7f7674a70718bf86d9ea8f23db508d0b56361ce1 100644 (file)
@@ -485,7 +485,7 @@ MagickExport MagickBooleanType ResamplePixelColor(
             *pixel=resample_filter->average_pixel; /* FAILED */
             break;
           }
-          SetPixelInfo(resample_filter->image,pixels,
+          GetPixelInfoPixel(resample_filter->image,pixels,
             &(resample_filter->average_pixel));
           average_view=DestroyCacheView(average_view);
           average_image=DestroyImage(average_image);
index 1fe0d73736146125809ec25ec1b6718c52a0e165..423b08fc0b44c11ca6c25a4d5380de488ed3fa45 100644 (file)
@@ -1554,25 +1554,25 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
           if ((x_offset+i) < step)
             {
               p+=GetPixelChannels(image);
-              SetPixelInfo(image,p,&pixel);
+              GetPixelInfoPixel(image,p,&pixel);
               q+=GetPixelChannels(image);
               continue;
             }
-          SetPixelInfo(image,p,&source);
+          GetPixelInfoPixel(image,p,&source);
           CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
             &source,(MagickRealType) GetPixelAlpha(image,p),area,&destination);
-          SetPixelPixelInfo(image,&destination,q);
-          SetPixelInfo(image,p,&pixel);
+          SetPixelInfoPixel(image,&destination,q);
+          GetPixelInfoPixel(image,p,&pixel);
           p+=GetPixelChannels(image);
           q+=GetPixelChannels(image);
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
-        SetPixelPixelInfo(image,&destination,q);
+        SetPixelInfoPixel(image,&destination,q);
         q+=GetPixelChannels(image);
         for (i=0; i < (step-1); i++)
         {
-          SetPixelPixelInfo(image,&background,q);
+          SetPixelInfoPixel(image,&background,q);
           q+=GetPixelChannels(image);
         }
         break;
@@ -1590,20 +1590,20 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
           q-=GetPixelChannels(image);
           if ((size_t) (x_offset+width+step-i) >= image->columns)
             continue;
-          SetPixelInfo(image,p,&source);
+          GetPixelInfoPixel(image,p,&source);
           CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
             &source,(MagickRealType) GetPixelAlpha(image,p),area,&destination);
-          SetPixelPixelInfo(image,&destination,q);
-          SetPixelInfo(image,p,&pixel);
+          SetPixelInfoPixel(image,&destination,q);
+          GetPixelInfoPixel(image,p,&pixel);
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
         q-=GetPixelChannels(image);
-        SetPixelPixelInfo(image,&destination,q);
+        SetPixelInfoPixel(image,&destination,q);
         for (i=0; i < (step-1); i++)
         {
           q-=GetPixelChannels(image);
-          SetPixelPixelInfo(image,&background,q);
+          SetPixelInfoPixel(image,&background,q);
         }
         break;
       }
@@ -1769,26 +1769,26 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
           if ((y_offset+i) < step)
             {
               p+=GetPixelChannels(image);
-              SetPixelInfo(image,p,&pixel);
+              GetPixelInfoPixel(image,p,&pixel);
               q+=GetPixelChannels(image);
               continue;
             }
-          SetPixelInfo(image,p,&source);
+          GetPixelInfoPixel(image,p,&source);
           CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
             &source,(MagickRealType) GetPixelAlpha(image,p),area,
             &destination);
-          SetPixelPixelInfo(image,&destination,q);
-          SetPixelInfo(image,p,&pixel);
+          SetPixelInfoPixel(image,&destination,q);
+          GetPixelInfoPixel(image,p,&pixel);
           p+=GetPixelChannels(image);
           q+=GetPixelChannels(image);
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
-        SetPixelPixelInfo(image,&destination,q);
+        SetPixelInfoPixel(image,&destination,q);
         q+=GetPixelChannels(image);
         for (i=0; i < (step-1); i++)
         {
-          SetPixelPixelInfo(image,&background,q);
+          SetPixelInfoPixel(image,&background,q);
           q+=GetPixelChannels(image);
         }
         break;
@@ -1806,21 +1806,21 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
           q-=GetPixelChannels(image);
           if ((size_t) (y_offset+height+step-i) >= image->rows)
             continue;
-          SetPixelInfo(image,p,&source);
+          GetPixelInfoPixel(image,p,&source);
           CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
             &source,(MagickRealType) GetPixelAlpha(image,p),area,
             &destination);
-          SetPixelPixelInfo(image,&destination,q);
-          SetPixelInfo(image,p,&pixel);
+          SetPixelInfoPixel(image,&destination,q);
+          GetPixelInfoPixel(image,p,&pixel);
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
         q-=GetPixelChannels(image);
-        SetPixelPixelInfo(image,&destination,q);
+        SetPixelInfoPixel(image,&destination,q);
         for (i=0; i < (step-1); i++)
         {
           q-=GetPixelChannels(image);
-          SetPixelPixelInfo(image,&background,q);
+          SetPixelInfoPixel(image,&background,q);
         }
         break;
       }
index b6dbbb721d66e8c8d5dc4a8a833de38ccab94552..1057efb565bdc61a3052ed27f9e5b176b43f0f88 100644 (file)
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5982"
+#define MagickSVNRevision  "exported"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
index 6fa824d311d50d0aaf44b0a17dca90cef07a4cf8..6556d43ba1f66d19bb286440856d40550b95c83e 100644 (file)
@@ -2516,7 +2516,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display,
           /*
             Set this pixel to the background color.
           */
-          SetPixelPixelInfo(draw_image,&draw_image->background_color,q);
+          SetPixelInfoPixel(draw_image,&draw_image->background_color,q);
           SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil ==
             OpaqueStencil ? TransparentAlpha : OpaqueAlpha),q);
         }
@@ -4506,7 +4506,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
               {
                 index=(Quantum) XGetPixel(ximage,x,y);
                 SetPixelIndex(composite_image,index,q);
-                SetPixelPixelInfo(composite_image,
+                SetPixelInfoPixel(composite_image,
                   composite_image->colormap+(ssize_t) index,q);
                 q+=GetPixelChannels(composite_image);
               }
index 0d6c6e64d2de5103b361e9df571e266d2d9ff825..f34736cc15d029901df90679452cde2ca38198f6 100644 (file)
@@ -2094,11 +2094,11 @@ WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  PixelSetPixelInfo() sets the color of the pixel wand.
+%  PixelGetPixelInfoPixel() sets the color of the pixel wand.
 %
 %  The format of the PixelSetPixelInfo method is:
 %
-%      PixelSetPixelInfo(PixelWand *wand,const PixelInfo *color)
+%      PixelGetPixelInfoPixel(PixelWand *wand,const PixelInfo *color)
 %
 %  A description of each parameter follows:
 %
@@ -2107,7 +2107,7 @@ WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta)
 %    o color: the pixel wand color.
 %
 */
-WandExport void PixelSetPixelInfo(PixelWand *wand,
+WandExport void PixelGetPixelInfoPixel(PixelWand *wand,
   const PixelInfo *color)
 {
   assert(wand != (const PixelWand *) NULL);
index b288a600f2c74c086a742deccbce2157dc7528ec..e7d014cd163f714e50bfa5ce064df01dc42d6f75 100644 (file)
@@ -100,7 +100,7 @@ extern WandExport void
   PixelSetIndex(PixelWand *,const Quantum),
   PixelSetMagenta(PixelWand *,const double),
   PixelSetMagentaQuantum(PixelWand *,const Quantum),
-  PixelSetPixelInfo(PixelWand *,const PixelInfo *),
+  PixelGetPixelInfoPixel(PixelWand *,const PixelInfo *),
   PixelSetAlpha(PixelWand *,const double),
   PixelSetAlphaQuantum(PixelWand *,const Quantum),
   PixelSetQuantumPacket(PixelWand *,const PixelInfo *),
index b287e6caaefaf32be737c3a8670448dc49bb4770..9da08b50139d052606bf07447102e3c508fa4662 100644 (file)
@@ -226,7 +226,7 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info,
         (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
           x,(double) y);
         (void) WriteBlobString(image,buffer);
-        SetPixelInfo(image,p,&pixel);
+        GetPixelInfoPixel(image,p,&pixel);
         (void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ",
           (double) pixel.red,(double) pixel.green,(double) pixel.blue);
         if (pixel.colorspace == CMYKColorspace)
index 3794ccf3fc333164184c8725102a5905f85d704d..73b314cd0c2300c47f774709da567487a3d6c3d1 100644 (file)
@@ -443,7 +443,7 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity,
         break;
       index=ConstrainColormapIndex(image,(size_t) c,exception);
       SetPixelIndex(image,index,q);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha :
         OpaqueAlpha,q);
       x++;
index 58113afc7e067f64cba6f0beabe3d7ef162e6e07..9395e9494a3cb148e06d37b1a3cba678d3f026e9 100644 (file)
@@ -235,7 +235,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
       if (bit == 8)
         bit=0;
       SetPixelIndex(image,index,q);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       q+=GetPixelChannels(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 18d630e55543ca9ae9dc75ba39671598520fb604..67c7e5b49c8c93dce92d9842d86fb25989d78141 100644 (file)
@@ -1293,7 +1293,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
               pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
             index=ConstrainColormapIndex(image,pixel,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             p++;
             q+=GetPixelChannels(image);
           }
@@ -1331,7 +1331,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
         {
           index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p),exception);
           SetPixelIndex(image,index,q);
-          SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+          SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
           p++;
           q+=GetPixelChannels(image);
         }
index 82199a25a123bb94924463b69c599e3f372d0178..bd680b2b1b81b883361299ab3f4117ae9cdc7797 100644 (file)
@@ -227,7 +227,7 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           p++;
         }
       SetPixelIndex(image,index,q);
-      SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+      SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
       q+=GetPixelChannels(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index f3b28773c7de81db160dad1b34696f0138f59ecc..cb9b6bf73aaa6c47dfaa0c5cafac4ea22bbda71f 100644 (file)
@@ -2409,11 +2409,11 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
         case RLECompression:
         {
           length=0;
-          SetPixelInfo(image,p,&pixel);
+          GetPixelInfoPixel(image,p,&pixel);
           p+=GetPixelChannels(image);
           for (x=1; x < (ssize_t) image->columns; x++)
           {
-            SetPixelInfo(image,p,&target);
+            GetPixelInfoPixel(image,p,&target);
             if ((length < 255) &&
                 (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse))
               length++;
@@ -2422,7 +2422,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
                 q=PopRunlengthPacket(image,q,length,&pixel,exception);
                 length=0;
               }
-            SetPixelInfo(image,p,&pixel);
+            GetPixelInfoPixel(image,p,&pixel);
             p+=GetPixelChannels(image);
           }
           q=PopRunlengthPacket(image,q,length,&pixel,exception);
index 842d1d93851516902eeb2c96a0b868deedb4ab26..65f912a7333d593d10fd55af4207b45bcb3df595 100644 (file)
@@ -138,7 +138,7 @@ static Image *ReadNULLImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelPixelInfo(image,&background,q);
+      SetPixelInfoPixel(image,&background,q);
       q+=GetPixelChannels(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 8baf5412e6b3cd2a34aba5b0f1680dc4c190522b..abc3a7be1f7637c0f12c691f17352567e2c3b598 100644 (file)
@@ -489,7 +489,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
               ThrowReaderException(CorruptImageError,"CorruptImage");
             index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit));
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             if (bit)
               bit-=bits_per_pixel;
             else
index cc10247c8101e19b36488ba4c74245bdbc44f59b..81b7a4c8cf50062a37ffbf60cd6242a95196b6c4 100644 (file)
@@ -8521,7 +8521,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
           {
               if (GetPixelAlpha(image,r) < OpaqueAlpha/2)
                 {
-                  SetPixelPixelInfo(image,&image->background_color,r);
+                  SetPixelInfoPixel(image,&image->background_color,r);
                   SetPixelAlpha(image,TransparentAlpha,r);
                 }
               else
index 0207dd6fb71593ae00832f4ea4f3f6872d3cfe05..679126bb16d571946e85845d7ce77d835a5cf259 100644 (file)
@@ -652,7 +652,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
                 SetPixelIndex(image,ScaleQuantumToChar(pixel),q);
               else
                 SetPixelIndex(image,ScaleQuantumToShort(pixel),q);
-              SetPixelPixelInfo(image,image->colormap+(ssize_t)
+              SetPixelInfoPixel(image,image->colormap+(ssize_t)
                 GetPixelIndex(image,q),q);
               if (image->depth == 1)
                 {
@@ -667,7 +667,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
                   {
                     SetPixelIndex(image,(((unsigned char) pixel) &
                       (0x01 << (7-bit))) != 0 ? 0 : 255,q);
-                    SetPixelPixelInfo(image,image->colormap+(ssize_t)
+                    SetPixelInfoPixel(image,image->colormap+(ssize_t)
                       GetPixelIndex(image,q),q);
                     q+=GetPixelChannels(image);
                     x++;
index 779d2244a6b67fb0152f2ef9472a1b6c253570aa..8a9a12063cee98bd37c76b043589fe73f2cbd329 100644 (file)
@@ -3403,7 +3403,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetPixelInfo(image,p,&pixel);
+        GetPixelInfoPixel(image,p,&pixel);
         (void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception);
         (void) FormatLocaleString(message,MaxTextExtent,
           "  <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",
index 170d754d4f4273547d50257757be539ed0a210bc..fdaf912a1eefe3efb774fc5131cad31d5759fc03 100644 (file)
@@ -237,7 +237,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelPixelInfo(image,&background_color,q);
+      SetPixelInfoPixel(image,&background_color,q);
       q+=GetPixelChannels(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 412a30cc64a64df999485a5b617d5a11c5adeb39..56c7154cb9fa7f18b8e83498594609c73b527dcb 100644 (file)
@@ -668,7 +668,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
         (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
           x,(double) y);
         (void) WriteBlobString(image,buffer);
-        SetPixelInfo(image,p,&pixel);
+        GetPixelInfoPixel(image,p,&pixel);
         (void) CopyMagickString(tuple,"(",MaxTextExtent);
         ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
           tuple);
index 0e1b8ec5e54d3126686f3bb879f34916e206cbf6..743049d4fd003f37b1bd76d68e81a0fba1541cdb 100644 (file)
@@ -292,7 +292,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
           {
             index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
           }
           p++;
@@ -303,7 +303,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
             {
               index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
               SetPixelIndex(image,index,q);
-              SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+              SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
               q+=GetPixelChannels(image);
             }
             p++;
@@ -321,19 +321,19 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
         {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x3,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
             index=ConstrainColormapIndex(image,(*p >> 2) & 0x3,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
             index=ConstrainColormapIndex(image,(*p) & 0x3,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             p++;
             q+=GetPixelChannels(image);
         }
@@ -341,14 +341,14 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
           {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
             if ((image->columns % 4) >= 1)
 
               {
                 index=ConstrainColormapIndex(image,(*p >> 4) & 0x3,exception);
                 SetPixelIndex(image,index,q);
-                SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+                SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
                 q+=GetPixelChannels(image);
                 if ((image->columns % 4) >= 2)
 
@@ -356,7 +356,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
                     index=ConstrainColormapIndex(image,(*p >> 2) & 0x3,
                       exception);
                     SetPixelIndex(image,index,q);
-                    SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+                    SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
                     q+=GetPixelChannels(image);
                   }
               }
@@ -376,11 +376,11 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
           { 
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
             index=ConstrainColormapIndex(image,(*p) & 0x0f,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             p++;
             q+=GetPixelChannels(image);
           }
@@ -388,7 +388,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             p++;
             q+=GetPixelChannels(image);
           }
@@ -405,7 +405,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp,
           {
             index=ConstrainColormapIndex(image,*p,exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             p++;
             q+=GetPixelChannels(image);
           }
index 1664ae8c454a4d5c151be0882f230a04eda8c941..59b81700d323997dfd96b4df96add7dc3bab4794 100644 (file)
@@ -137,7 +137,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
   image->colorspace=color.colorspace;
   image->matte=color.matte;
   pixel.black=0;
-  SetPacketPixelInfo(image,&color,&pixel);
+  SetPixelInfo(image,&color,&pixel);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
@@ -145,7 +145,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelPixelInfo(image,&pixel,q);
+      SetPixelInfoPixel(image,&pixel,q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(image,pixel.black,q);
       q+=GetPixelChannels(image);
index dc579abd2045622805bc74c04a871890216fd25e..1e69e60a2f2663d49e5a890f4786b63371f025fd 100644 (file)
@@ -405,7 +405,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
           if (image->storage_class == PseudoClass)
             SetPixelIndex(image,j,r);
-          SetPixelPixelInfo(image,image->colormap+j,r);
+          SetPixelInfoPixel(image,image->colormap+j,r);
           p+=width;
           r+=GetPixelChannels(image);
         }
index ab47d874d03dd5eea0b7d30377dc6dc0615c6c4b..2154a7eec5e3621caf83515a44d89d95382d257c 100644 (file)
@@ -476,7 +476,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x,
               (int) y),exception);
             SetPixelIndex(image,index,q);
-            SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+            SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
             q+=GetPixelChannels(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)