]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 25 Jun 2011 12:26:44 +0000 (12:26 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 25 Jun 2011 12:26:44 +0000 (12:26 +0000)
130 files changed:
PerlMagick/Magick.xs
coders/aai.c
coders/avs.c
coders/bgr.c
coders/bmp.c
coders/braille.c
coders/clipboard.c
coders/cmyk.c
coders/cut.c
coders/dcm.c
coders/dds.c
coders/dib.c
coders/djvu.c
coders/dps.c
coders/emf.c
coders/exr.c
coders/fits.c
coders/fpx.c
coders/gif.c
coders/gray.c
coders/hald.c
coders/hdr.c
coders/histogram.c
coders/hrz.c
coders/icon.c
coders/jbig.c
coders/jp2.c
coders/jpeg.c
coders/mac.c
coders/map.c
coders/mat.c
coders/matte.c
coders/miff.c
coders/mono.c
coders/mtv.c
coders/otb.c
coders/palm.c
coders/pcd.c
coders/pcl.c
coders/pcx.c
coders/pdb.c
coders/pdf.c
coders/pict.c
coders/pix.c
coders/plasma.c
coders/png.c
coders/pnm.c
coders/ps.c
coders/ps2.c
coders/ps3.c
coders/psd.c
coders/raw.c
coders/rgb.c
coders/rla.c
coders/rle.c
coders/scr.c
coders/sct.c
coders/sgi.c
coders/stegano.c
coders/sun.c
coders/svg.c
coders/tga.c
coders/tiff.c
coders/tim.c
coders/txt.c
coders/uil.c
coders/uyvy.c
coders/viff.c
coders/wbmp.c
coders/webp.c
coders/wpg.c
coders/xbm.c
coders/xc.c
coders/xcf.c
coders/xpm.c
coders/xwd.c
coders/ycbcr.c
coders/yuv.c
config/configure.xml
filters/analyze.c
magick/annotate.c
magick/attribute.c
magick/cache.c
magick/color-private.h
magick/color.c
magick/colormap.c
magick/colorspace.c
magick/compare.c
magick/composite-private.h
magick/composite.c
magick/compress.c
magick/decorate.c
magick/deprecate.c
magick/distort.c
magick/draw.c
magick/effect.c
magick/enhance.c
magick/feature.c
magick/fourier.c
magick/fx.c
magick/histogram.c
magick/identify.c
magick/image.c
magick/layer.c
magick/mac.c
magick/morphology.c
magick/nt-feature.c
magick/paint.c
magick/pixel-private.h
magick/pixel.c
magick/pixel.h
magick/prepress.c
magick/profile.c
magick/quantize.c
magick/quantum-export.c
magick/quantum-import.c
magick/resize.c
magick/segment.c
magick/shear.c
magick/statistic.c
magick/stream.c
magick/threshold.c
magick/transform.c
magick/version.h
magick/xwindow.c
wand/deprecate.c
wand/drawing-wand.c
wand/mogrify.c
wand/pixel-iterator.c
wand/wand-view.c

index a2ef0daf1cb35510260d8afb36269e821b9b01cd..3d0904e679fe277e7f249802f51c2b05f5483f23 100644 (file)
@@ -1590,7 +1590,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
                 indexes=GetCacheViewAuthenticIndexQueue(image_view);
                 items=sscanf(SvPV(sval,na),"%ld",&index);
                 if ((index >= 0) && (index < (ssize_t) image->colors))
-                  SetIndexPixelComponent(indexes,index);
+                  SetPixelIndex(indexes,index);
                 (void) SyncCacheViewAuthenticPixels(image_view,exception);
               }
             image_view=DestroyCacheView(image_view);
@@ -1836,14 +1836,14 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
                     if ((flags & ChiValue) != 0)
                       pixel.index=geometry_info.chi;
                   }
-                SetRedPixelComponent(q,ClampToQuantum(pixel.red));
-                SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
-                SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
-                SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+                SetPixelRed(q,ClampToQuantum(pixel.red));
+                SetPixelGreen(q,ClampToQuantum(pixel.green));
+                SetPixelBlue(q,ClampToQuantum(pixel.blue));
+                SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
                 if (((image->colorspace == CMYKColorspace) ||
                      (image->storage_class == PseudoClass)) &&
                     (indexes != (IndexPacket *) NULL))
-                  SetIndexPixelComponent(indexes,ClampToQuantum(pixel.index));
+                  SetPixelIndex(indexes,ClampToQuantum(pixel.index));
                 (void) SyncCacheViewAuthenticPixels(image_view,exception);
               }
             image_view=DestroyCacheView(image_view);
@@ -4875,7 +4875,7 @@ Get(ref,...)
                 {
                   indexes=GetCacheViewVirtualIndexQueue(image_view);
                   (void) FormatLocaleString(name,MaxTextExtent,QuantumFormat,
-                    GetIndexPixelComponent(indexes));
+                    GetPixelIndex(indexes));
                   s=newSVpv(name,0);
                   PUSHs(s ? sv_2mortal(s) : &sv_undef);
                 }
@@ -5137,14 +5137,14 @@ Get(ref,...)
               if (image->colorspace != CMYKColorspace)
                 (void) FormatLocaleString(tuple,MaxTextExtent,QuantumFormat ","
                   QuantumFormat "," QuantumFormat "," QuantumFormat,
-                  GetRedPixelComponent(p),GetGreenPixelComponent(p),
-                  GetBluePixelComponent(p),GetOpacityPixelComponent(p));
+                  GetPixelRed(p),GetPixelGreen(p),
+                  GetPixelBlue(p),GetPixelOpacity(p));
               else
                 (void) FormatLocaleString(tuple,MaxTextExtent,QuantumFormat ","
                   QuantumFormat "," QuantumFormat "," QuantumFormat ","
-                  QuantumFormat,GetRedPixelComponent(p),
-                  GetGreenPixelComponent(p),GetBluePixelComponent(p),
-                  GetIndexPixelComponent(indexes),GetOpacityPixelComponent(p));
+                  QuantumFormat,GetPixelRed(p),
+                  GetPixelGreen(p),GetPixelBlue(p),
+                  GetPixelIndex(indexes),GetPixelOpacity(p));
               s=newSVpv(tuple,0);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
               continue;
@@ -6267,16 +6267,16 @@ GetPixel(ref,...)
         if (normalize != MagickFalse)
           scale=1.0/QuantumRange;
         if ((channel & RedChannel) != 0)
-          PUSHs(sv_2mortal(newSVnv(scale*GetRedPixelComponent(p))));
+          PUSHs(sv_2mortal(newSVnv(scale*GetPixelRed(p))));
         if ((channel & GreenChannel) != 0)
-          PUSHs(sv_2mortal(newSVnv(scale*GetGreenPixelComponent(p))));
+          PUSHs(sv_2mortal(newSVnv(scale*GetPixelGreen(p))));
         if ((channel & BlueChannel) != 0)
-          PUSHs(sv_2mortal(newSVnv(scale*GetBluePixelComponent(p))));
+          PUSHs(sv_2mortal(newSVnv(scale*GetPixelBlue(p))));
         if (((channel & IndexChannel) != 0) &&
             (image->colorspace == CMYKColorspace))
-          PUSHs(sv_2mortal(newSVnv(scale*GetIndexPixelComponent(indexes))));
+          PUSHs(sv_2mortal(newSVnv(scale*GetPixelIndex(indexes))));
         if ((channel & OpacityChannel) != 0)
-          PUSHs(sv_2mortal(newSVnv(scale*GetOpacityPixelComponent(p))));
+          PUSHs(sv_2mortal(newSVnv(scale*GetPixelOpacity(p))));
       }
 
   PerlException:
@@ -13401,32 +13401,32 @@ SetPixel(ref,...)
           scale=QuantumRange;
         if (((channel & RedChannel) != 0) && (i <= av_len(av)))
           {
-            SetRedPixelComponent(q,ClampToQuantum(scale*SvNV(*(
+            SetPixelRed(q,ClampToQuantum(scale*SvNV(*(
               av_fetch(av,i,0)))));
             i++;
           }
         if (((channel & GreenChannel) != 0) && (i <= av_len(av)))
           {
-            SetGreenPixelComponent(q,ClampToQuantum(scale*SvNV(*(
+            SetPixelGreen(q,ClampToQuantum(scale*SvNV(*(
               av_fetch(av,i,0)))));
             i++;
           }
         if (((channel & BlueChannel) != 0) && (i <= av_len(av)))
           {
-            SetBluePixelComponent(q,ClampToQuantum(scale*SvNV(*(
+            SetPixelBlue(q,ClampToQuantum(scale*SvNV(*(
               av_fetch(av,i,0)))));
             i++;
           }
         if ((((channel & IndexChannel) != 0) &&
             (image->colorspace == CMYKColorspace)) && (i <= av_len(av)))
           {
-            SetIndexPixelComponent(indexes,ClampToQuantum(scale*
+            SetPixelIndex(indexes,ClampToQuantum(scale*
               SvNV(*(av_fetch(av,i,0)))));
             i++;
           }
         if (((channel & OpacityChannel) != 0) && (i <= av_len(av)))
           {
-            SetOpacityPixelComponent(q,ClampToQuantum(scale*
+            SetPixelOpacity(q,ClampToQuantum(scale*
               SvNV(*(av_fetch(av,i,0)))));
             i++;
           }
index 234e1437c12bccded0782b04b2ac1875c29e75fd..4e838b74b0223f6ed3f03271fced88a2083c7fc3 100644 (file)
@@ -172,12 +172,12 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-        SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-        SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+        SetPixelBlue(q,ScaleCharToQuantum(*p++));
+        SetPixelGreen(q,ScaleCharToQuantum(*p++));
+        SetPixelRed(q,ScaleCharToQuantum(*p++));
         if (*p == 254)
           *p=255;
-        SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+        SetPixelAlpha(q,ScaleCharToQuantum(*p++));
         if (q->opacity != OpaqueOpacity)
           image->matte=MagickTrue;
         q++;
@@ -377,11 +377,11 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image)
       q=pixels;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+        *q++=ScaleQuantumToChar(GetPixelBlue(p));
+        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+        *q++=ScaleQuantumToChar(GetPixelRed(p));
         *q=ScaleQuantumToChar((Quantum) (QuantumRange-(image->matte !=
-          MagickFalse ? GetOpacityPixelComponent(p) : OpaqueOpacity)));
+          MagickFalse ? GetPixelOpacity(p) : OpaqueOpacity)));
         if (*q == 255)
           *q=254;
         p++;
index 11bd2abf7a9520ecd6813e6f4e4bf67e6abd6dba..1e0176409c67bb913b6e50db5860b11f7694ac87 100644 (file)
@@ -172,10 +172,10 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
-        SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-        SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-        SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+        SetPixelAlpha(q,ScaleCharToQuantum(*p++));
+        SetPixelRed(q,ScaleCharToQuantum(*p++));
+        SetPixelGreen(q,ScaleCharToQuantum(*p++));
+        SetPixelBlue(q,ScaleCharToQuantum(*p++));
         if (q->opacity != OpaqueOpacity)
           image->matte=MagickTrue;
         q++;
@@ -376,10 +376,10 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image)
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         *q++=ScaleQuantumToChar((Quantum) (QuantumRange-(image->matte !=
-          MagickFalse ? GetOpacityPixelComponent(p) : OpaqueOpacity)));
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+          MagickFalse ? GetPixelOpacity(p) : OpaqueOpacity)));
+        *q++=ScaleQuantumToChar(GetPixelRed(p));
+        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+        *q++=ScaleQuantumToChar(GetPixelBlue(p));
         p++;
       }
       count=WriteBlob(image,(size_t) (q-pixels),pixels);
index 7e3f3c98b33cfcd54b7c228f20453553dfd9804c..d7244a24b164d9acf34756be48e41ae8fde6d425 100644 (file)
@@ -246,12 +246,12 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
-                SetOpacityPixelComponent(q,OpaqueOpacity);
+                SetPixelRed(q,GetPixelRed(p));
+                SetPixelGreen(q,GetPixelGreen(p));
+                SetPixelBlue(q,GetPixelBlue(p));
+                SetPixelOpacity(q,OpaqueOpacity);
                 if (image->matte != MagickFalse)
-                  SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                  SetPixelOpacity(q,GetPixelOpacity(p));
                 p++;
                 q++;
               }
@@ -332,27 +332,27 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                   {
                     case RedQuantum:
                     {
-                      SetRedPixelComponent(q,GetRedPixelComponent(p));
+                      SetPixelRed(q,GetPixelRed(p));
                       break;
                     }
                     case GreenQuantum:
                     {
-                      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                      SetPixelGreen(q,GetPixelGreen(p));
                       break;
                     }
                     case BlueQuantum:
                     {
-                      SetBluePixelComponent(q,GetBluePixelComponent(p));
+                      SetPixelBlue(q,GetPixelBlue(p));
                       break;
                     }
                     case OpacityQuantum:
                     {
-                      SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                      SetPixelOpacity(q,GetPixelOpacity(p));
                       break;
                     }
                     case AlphaQuantum:
                     {
-                      SetAlphaPixelComponent(q,GetAlphaPixelComponent(p));
+                      SetPixelAlpha(q,GetPixelAlpha(p));
                       break;
                     }
                     default:
@@ -423,7 +423,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -475,7 +475,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -527,7 +527,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -588,7 +588,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
@@ -675,7 +675,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -746,7 +746,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -817,7 +817,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -890,7 +890,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
index 57e634b25294af8db15a2548839eb8867ac2201b..1681da48c56733ccf138e4885336610404e39e0d 100644 (file)
@@ -1010,7 +1010,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (bit=0; bit < 8; bit++)
             {
               index=(IndexPacket) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
-              SetIndexPixelComponent(indexes+x+bit,index);
+              SetPixelIndex(indexes+x+bit,index);
               q++;
             }
             p++;
@@ -1020,7 +1020,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
               for (bit=0; bit < (image->columns % 8); bit++)
               {
                 index=(IndexPacket) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
-                SetIndexPixelComponent(indexes+x+bit,index);
+                SetPixelIndex(indexes+x+bit,index);
               }
               p++;
             }
@@ -1052,15 +1052,15 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             index=ConstrainColormapIndex(image,*p & 0x0f);
-            SetIndexPixelComponent(indexes+x+1,index);
+            SetPixelIndex(indexes+x+1,index);
             p++;
           }
           if ((image->columns % 2) != 0)
             {
               index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
-              SetIndexPixelComponent(indexes+x,index);
+              SetPixelIndex(indexes+x,index);
               p++;
             }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1094,7 +1094,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (x = (ssize_t)image->columns; x != 0; --x)
           {
             index=ConstrainColormapIndex(image,*p);
-            SetIndexPixelComponent(indexes,index);
+            SetPixelIndex(indexes,index);
             indexes++;
             p++;
             q++;
@@ -1160,13 +1160,13 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             opacity=((pixel & bmp_info.alpha_mask) << shift.opacity) >> 16;
             if (quantum_bits.opacity <= 8)
               opacity|=((opacity & 0xff00) >> 8);
-            SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short) red));
-            SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelRed(q,ScaleShortToQuantum((unsigned short) red));
+            SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
               green));
-            SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short) blue));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelBlue(q,ScaleShortToQuantum((unsigned short) blue));
+            SetPixelOpacity(q,OpaqueOpacity);
             if (image->matte != MagickFalse)
-              SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+              SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
                 opacity));
             q++;
           }
@@ -1197,10 +1197,10 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-            SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelBlue(q,ScaleCharToQuantum(*p++));
+            SetPixelGreen(q,ScaleCharToQuantum(*p++));
+            SetPixelRed(q,ScaleCharToQuantum(*p++));
+            SetPixelOpacity(q,OpaqueOpacity);
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1256,13 +1256,13 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             opacity=((pixel & bmp_info.alpha_mask) << shift.opacity) >> 16;
             if (quantum_bits.opacity == 8)
               opacity|=(opacity >> 8);
-            SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short) red));
-            SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelRed(q,ScaleShortToQuantum((unsigned short) red));
+            SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
               green));
-            SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short) blue));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelBlue(q,ScaleShortToQuantum((unsigned short) blue));
+            SetPixelOpacity(q,OpaqueOpacity);
             if (image->matte != MagickFalse)
-              SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+              SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
                 opacity));
             q++;
           }
@@ -1655,7 +1655,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             byte<<=1;
-            byte|=GetIndexPixelComponent(indexes+x) != 0 ? 0x01 : 0x00;
+            byte|=GetPixelIndex(indexes+x) != 0 ? 0x01 : 0x00;
             bit++;
             if (bit == 8)
               {
@@ -1702,7 +1702,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             byte<<=4;
-            byte|=((size_t) GetIndexPixelComponent(indexes+x) & 0x0f);
+            byte|=((size_t) GetPixelIndex(indexes+x) & 0x0f);
             nibble++;
             if (nibble == 2)
               {
@@ -1741,7 +1741,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           indexes=GetVirtualIndexQueue(image);
           q=pixels+(image->rows-y-1)*bytes_per_line;
           for (x=0; x < (ssize_t) image->columns; x++)
-            *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+            *q++=(unsigned char) GetPixelIndex(indexes+x);
           for ( ; x < (ssize_t) bytes_per_line; x++)
             *q++=0x00;
           if (image->previous == (Image *) NULL)
@@ -1767,9 +1767,9 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           q=pixels+(image->rows-y-1)*bytes_per_line;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
             p++;
           }
           for (x=3L*(ssize_t) image->columns; x < (ssize_t) bytes_per_line; x++)
@@ -1797,10 +1797,10 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           q=pixels+(image->rows-y-1)*bytes_per_line;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar(QuantumRange-GetOpacityPixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar(QuantumRange-GetPixelOpacity(p));
             p++;
           }
           if (image->previous == (Image *) NULL)
index 7976d2787c28e8ca0f5a5dbd2f2ef66e5cea8323..be405b2a09c73a635f1fab2f0ba613171b745e62 100644 (file)
@@ -274,9 +274,9 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info,
       {
 #define do_cell(dx,dy,bit) do { \
         if (image->storage_class == PseudoClass) \
-          cell |= (GetIndexPixelComponent(indexes+x+dx+dy*image->columns) == polarity) << bit; \
+          cell |= (GetPixelIndex(indexes+x+dx+dy*image->columns) == polarity) << bit; \
         else \
-          cell |= (GetGreenPixelComponent(p+x+dx+dy*image->columns) == 0) << bit; \
+          cell |= (GetPixelGreen(p+x+dx+dy*image->columns) == 0) << bit; \
 } while (0) 
 
         do_cell(0,0,0);
index 40bfbbfa66980a372d1f595536facef4bc4e6458..4b8bbae6f7f0b1d54847620c6682d4e4521ae55a 100644 (file)
@@ -213,10 +213,10 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info,
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,ScaleCharToQuantum(pBits->rgbRed));
-          SetGreenPixelComponent(q,ScaleCharToQuantum(pBits->rgbGreen));
-          SetBluePixelComponent(q,ScaleCharToQuantum(pBits->rgbBlue));
-          SetOpacityPixelComponent(q,OpaqueOpacity);
+          SetPixelRed(q,ScaleCharToQuantum(pBits->rgbRed));
+          SetPixelGreen(q,ScaleCharToQuantum(pBits->rgbGreen));
+          SetPixelBlue(q,ScaleCharToQuantum(pBits->rgbBlue));
+          SetPixelOpacity(q,OpaqueOpacity);
           pBits++;
           q++;
         }
index 50ad3bd7f39d3d10ac0b231ab3e90db2d7f991a8..4ed1cef8930d2d5113fb126fd006ab57186a4844 100644 (file)
@@ -254,14 +254,14 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               indexes=GetAuthenticIndexQueue(image);
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
-                SetBlackPixelComponent(indexes+x,GetBlackPixelComponent(
+                SetPixelRed(q,GetPixelRed(p));
+                SetPixelGreen(q,GetPixelGreen(p));
+                SetPixelBlue(q,GetPixelBlue(p));
+                SetPixelBlack(indexes+x,GetPixelBlack(
                   canvas_indexes+image->extract_info.x+x));
-                SetOpacityPixelComponent(q,OpaqueOpacity);
+                SetPixelOpacity(q,OpaqueOpacity);
                 if (image->matte != MagickFalse)
-                  SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                  SetPixelOpacity(q,GetPixelOpacity(p));
                 p++;
                 q++;
               }
@@ -351,28 +351,28 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                   {
                     case CyanQuantum:
                     {
-                      SetCyanPixelComponent(q,GetCyanPixelComponent(p));
+                      SetPixelCyan(q,GetPixelCyan(p));
                       break;
                     }
                     case MagentaQuantum:
                     {
-                      SetMagentaPixelComponent(q,GetMagentaPixelComponent(p));
+                      SetPixelMagenta(q,GetPixelMagenta(p));
                       break;
                     }
                     case YellowQuantum:
                     {
-                      SetYellowPixelComponent(q,GetYellowPixelComponent(p));
+                      SetPixelYellow(q,GetPixelYellow(p));
                       break;
                     }
                     case BlackQuantum:
                     {
-                      SetIndexPixelComponent(indexes+x,GetIndexPixelComponent(
+                      SetPixelIndex(indexes+x,GetPixelIndex(
                         canvas_indexes+image->extract_info.x+x));
                       break;
                     }
                     case OpacityQuantum:
                     {
-                      SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                      SetPixelOpacity(q,GetPixelOpacity(p));
                       break;
                     }
                     default:
@@ -443,7 +443,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -495,7 +495,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -547,7 +547,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -607,7 +607,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               indexes=GetAuthenticIndexQueue(image);
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetIndexPixelComponent(indexes+x,GetIndexPixelComponent(
+                SetPixelIndex(indexes+x,GetPixelIndex(
                   canvas_indexes+image->extract_info.x+x));
                 p++;
                 q++;
@@ -663,7 +663,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
@@ -750,7 +750,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -821,7 +821,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -892,7 +892,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -971,7 +971,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               indexes=GetAuthenticIndexQueue(image);
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetIndexPixelComponent(indexes+x,GetIndexPixelComponent(
+                SetPixelIndex(indexes+x,GetPixelIndex(
                   canvas_indexes+image->extract_info.x+x));
                 p++;
                 q++;
@@ -1045,7 +1045,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
index 6bbc56f6401a1398da3b99fa6396918d8a1510ff..7b53802621f48180155f6a5e5e0e9a6e7df5050c 100644 (file)
@@ -117,7 +117,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
           for (bit=0; bit < 8; bit++)
           {
             index=(IndexPacket) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
-            SetIndexPixelComponent(indexes+x+bit,index);
+            SetPixelIndex(indexes+x+bit,index);
           }
           p++;
         }
@@ -126,7 +126,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
             for (bit=0; bit < (image->columns % 8); bit++)
               {
                 index=(IndexPacket) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
-                SetIndexPixelComponent(indexes+x+bit,index);
+                SetPixelIndex(indexes+x+bit,index);
               }
             p++;
           }
@@ -143,29 +143,29 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             index=ConstrainColormapIndex(image,(*p) & 0x3);
-            SetIndexPixelComponent(indexes+x+1,index);
+            SetPixelIndex(indexes+x+1,index);
             p++;
           }
         if ((image->columns % 4) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             if ((image->columns % 4) >= 1)
 
               {
                 index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
-                SetIndexPixelComponent(indexes+x,index);
+                SetPixelIndex(indexes+x,index);
                 if ((image->columns % 4) >= 2)
 
                   {
                     index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
-                    SetIndexPixelComponent(indexes+x,index);
+                    SetPixelIndex(indexes+x,index);
                   }
               }
             p++;
@@ -184,15 +184,15 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             index=ConstrainColormapIndex(image,(*p) & 0xf);
-            SetIndexPixelComponent(indexes+x+1,index);
+            SetPixelIndex(indexes+x+1,index);
             p++;
           }
         if ((image->columns % 2) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             p++;
           }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -207,7 +207,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           index=ConstrainColormapIndex(image,*p);
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
           p++;
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -245,8 +245,8 @@ static int GetCutColors(Image *image)
     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (intensity < GetRedPixelComponent(q))
-        intensity=GetRedPixelComponent(q);
+      if (intensity < GetPixelRed(q))
+        intensity=GetPixelRed(q);
       if (intensity >= scale_intensity)
         return(255);
       q++;
@@ -573,11 +573,11 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   q=QueueAuthenticPixels(image,0,i,image->columns,1,exception);
                   for (j=0; j < (ssize_t)image->columns; j++)
                     {
-                      if (GetRedPixelComponent(q) == ScaleCharToQuantum(1))
+                      if (GetPixelRed(q) == ScaleCharToQuantum(1))
                         {
-                          SetRedPixelComponent(q,QuantumRange);
-                          SetGreenPixelComponent(q,QuantumRange);
-                          SetBluePixelComponent(q,QuantumRange);
+                          SetPixelRed(q,QuantumRange);
+                          SetPixelGreen(q,QuantumRange);
+                          SetPixelBlue(q,QuantumRange);
                         }
                       q++;
                     }
index c67a0044c8bad5db334d12741f5bb07655b5b880..c0529c20e2f3edf1217ed68158f2a1d8c39d97f6 100644 (file)
@@ -3729,25 +3729,25 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 case 0:
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelRed(q,ScaleCharToQuantum((unsigned char)
                     ReadDCMByte(stream_info,image)));
                   break;
                 }
                 case 1:
                 {
-                  SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
                     ReadDCMByte(stream_info,image)));
                   break;
                 }
                 case 2:
                 {
-                  SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
                     ReadDCMByte(stream_info,image)));
                   break;
                 }
                 case 3:
                 {
-                  SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                     ReadDCMByte(stream_info,image)));
                   break;
                 }
@@ -3869,7 +3869,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   }
                 index&=mask;
                 index=(int) ConstrainColormapIndex(image,(size_t) index);
-                SetIndexPixelComponent(indexes+x,index);
+                SetPixelIndex(indexes+x,index);
                 pixel.red=1UL*image->colormap[index].red;
                 pixel.green=1UL*image->colormap[index].green;
                 pixel.blue=1UL*image->colormap[index].blue;
@@ -3907,9 +3907,9 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     pixel.blue=scale[pixel.blue];
                   }
               }
-            SetRedPixelComponent(q,pixel.red);
-            SetGreenPixelComponent(q,pixel.green);
-            SetBluePixelComponent(q,pixel.blue);
+            SetPixelRed(q,pixel.red);
+            SetPixelGreen(q,pixel.green);
+            SetPixelBlue(q,pixel.blue);
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3999,8 +3999,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     }
                   index&=mask;
                   index=(int) ConstrainColormapIndex(image,(size_t) index);
-                  SetIndexPixelComponent(indexes+x,(((size_t)
-                    GetIndexPixelComponent(indexes+x)) | (((size_t) index) <<
+                  SetPixelIndex(indexes+x,(((size_t)
+                    GetPixelIndex(indexes+x)) | (((size_t) index) <<
                     8)));
                   pixel.red=1UL*image->colormap[index].red;
                   pixel.green=1UL*image->colormap[index].green;
@@ -4039,11 +4039,11 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                       pixel.blue=scale[pixel.blue];
                     }
                 }
-              SetRedPixelComponent(q,(((size_t) GetRedPixelComponent(q)) |
+              SetPixelRed(q,(((size_t) GetPixelRed(q)) |
                 (((size_t) pixel.red) << 8)));
-              SetGreenPixelComponent(q,(((size_t) GetGreenPixelComponent(q)) |
+              SetPixelGreen(q,(((size_t) GetPixelGreen(q)) |
                 (((size_t) pixel.green) << 8)));
-              SetBluePixelComponent(q,(((size_t) GetBluePixelComponent(q)) |
+              SetPixelBlue(q,(((size_t) GetPixelBlue(q)) |
                 (((size_t) pixel.blue) << 8)));
               q++;
             }
index 6e2115d688efa76b796f8da4747b2056b7467a28..298c527a036e3b9b119c45c400f6a57ecef11b56 100644 (file)
@@ -546,10 +546,10 @@ static MagickBooleanType ReadDXT1(Image *image, DDSInfo *dds_info)
           if ((x + i) < (ssize_t) dds_info->width && (y + j) < (ssize_t) dds_info->height)
             {
               code = (unsigned char) ((bits >> ((j*4+i)*2)) & 0x3);
-              SetRedPixelComponent(q,ScaleCharToQuantum(colors.r[code]));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(colors.g[code]));
-              SetBluePixelComponent(q,ScaleCharToQuantum(colors.b[code]));
-              SetOpacityPixelComponent(q,ScaleCharToQuantum(colors.a[code]));
+              SetPixelRed(q,ScaleCharToQuantum(colors.r[code]));
+              SetPixelGreen(q,ScaleCharToQuantum(colors.g[code]));
+              SetPixelBlue(q,ScaleCharToQuantum(colors.b[code]));
+              SetPixelOpacity(q,ScaleCharToQuantum(colors.a[code]));
               if (colors.a[code] && image->matte == MagickFalse)
                 /* Correct matte */
                 image->matte = MagickTrue;
@@ -631,9 +631,9 @@ static MagickBooleanType ReadDXT3(Image *image, DDSInfo *dds_info)
           if ((x + i) < (ssize_t) dds_info->width && (y + j) < (ssize_t) dds_info->height)
             {
               code = (bits >> ((4*j+i)*2)) & 0x3;
-              SetRedPixelComponent(q,ScaleCharToQuantum(colors.r[code]));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(colors.g[code]));
-              SetBluePixelComponent(q,ScaleCharToQuantum(colors.b[code]));
+              SetPixelRed(q,ScaleCharToQuantum(colors.r[code]));
+              SetPixelGreen(q,ScaleCharToQuantum(colors.g[code]));
+              SetPixelBlue(q,ScaleCharToQuantum(colors.b[code]));
               /*
                 Extract alpha value: multiply 0..15 by 17 to get range 0..255
               */
@@ -641,7 +641,7 @@ static MagickBooleanType ReadDXT3(Image *image, DDSInfo *dds_info)
                 alpha = 17U * (unsigned char) ((a0 >> (4*(4*j+i))) & 0xf);
               else
                 alpha = 17U * (unsigned char) ((a1 >> (4*(4*(j-2)+i))) & 0xf);
-              SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+              SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                 alpha));
               q++;
             }
@@ -728,9 +728,9 @@ static MagickBooleanType ReadDXT5(Image *image, DDSInfo *dds_info)
           if ((x + i) < (ssize_t) dds_info->width && (y + j) < (ssize_t) dds_info->height)
             {
               code = (bits >> ((4*j+i)*2)) & 0x3;
-              SetRedPixelComponent(q,ScaleCharToQuantum(colors.r[code]));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(colors.g[code]));
-              SetBluePixelComponent(q,ScaleCharToQuantum(colors.b[code]));
+              SetPixelRed(q,ScaleCharToQuantum(colors.r[code]));
+              SetPixelGreen(q,ScaleCharToQuantum(colors.g[code]));
+              SetPixelBlue(q,ScaleCharToQuantum(colors.b[code]));
               /* Extract alpha value */
               alpha_code = (size_t) (alpha_bits >> (3*(4*j+i))) & 0x7;
               if (alpha_code == 0)
@@ -745,7 +745,7 @@ static MagickBooleanType ReadDXT5(Image *image, DDSInfo *dds_info)
                 alpha = 255;
               else
                 alpha = (((6-alpha_code) * a0 + (alpha_code-1) * a1) / 5);
-              SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+              SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                 alpha));
               q++;
             }
@@ -783,11 +783,11 @@ static MagickBooleanType ReadUncompressedRGB(Image *image, DDSInfo *dds_info)
     
     for (x = 0; x < (ssize_t) dds_info->width; x++)
     {
-      SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
-      SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
-      SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelRed(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
       if (dds_info->pixelformat.rgb_bitcount == 32)
         (void) ReadBlobByte(image);
@@ -824,13 +824,13 @@ static MagickBooleanType ReadUncompressedRGBA(Image *image, DDSInfo *dds_info)
     
     for (x = 0; x < (ssize_t) dds_info->width; x++)
     {
-      SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
-      SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
-      SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelRed(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
-      SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+      SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)));
       q++;
     }
index 5bbda7e4d021f76eeb62f9a15812b2f3471c4dc5..918c9a94f2d0b3a2249e9151a99da773966a5d39 100644 (file)
@@ -657,7 +657,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (bit=0; bit < 8; bit++)
           {
             index=(IndexPacket) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
-            SetIndexPixelComponent(indexes+x+bit,index);
+            SetPixelIndex(indexes+x+bit,index);
           }
           p++;
         }
@@ -666,7 +666,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (bit=0; bit < (ssize_t) (image->columns % 8); bit++)
             {
               index=(IndexPacket) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
-              SetIndexPixelComponent(indexes+x+bit,index);
+              SetPixelIndex(indexes+x+bit,index);
             }
             p++;
           }
@@ -698,15 +698,15 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
         {
           index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
           index=ConstrainColormapIndex(image,*p & 0xf);
-          SetIndexPixelComponent(indexes+x+1,index);
+          SetPixelIndex(indexes+x+1,index);
           p++;
         }
         if ((image->columns % 2) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
-            SetIndexPixelComponent(indexes+x,index);
+            SetPixelIndex(indexes+x,index);
             p++;
           }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -740,7 +740,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           index=ConstrainColormapIndex(image,*p);
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
           p++;
           q++;
         }
@@ -780,20 +780,20 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           word|=(*p++ << 8);
           if (dib_info.red_mask == 0)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+              SetPixelRed(q,ScaleCharToQuantum(ScaleColor5to8(
                 (unsigned char) ((word >> 10) & 0x1f))));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+              SetPixelGreen(q,ScaleCharToQuantum(ScaleColor5to8(
                 (unsigned char) ((word >> 5) & 0x1f))));
-              SetBluePixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+              SetPixelBlue(q,ScaleCharToQuantum(ScaleColor5to8(
                 (unsigned char) (word & 0x1f))));
             }
           else
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+              SetPixelRed(q,ScaleCharToQuantum(ScaleColor5to8(
                 (unsigned char) ((word >> 11) & 0x1f))));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(ScaleColor6to8(
+              SetPixelGreen(q,ScaleCharToQuantum(ScaleColor6to8(
                 (unsigned char) ((word >> 5) & 0x3f))));
-              SetBluePixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+              SetPixelBlue(q,ScaleCharToQuantum(ScaleColor5to8(
                 (unsigned char) (word & 0x1f))));
             }
           q++;
@@ -824,11 +824,11 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-          SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-          SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+          SetPixelBlue(q,ScaleCharToQuantum(*p++));
+          SetPixelGreen(q,ScaleCharToQuantum(*p++));
+          SetPixelRed(q,ScaleCharToQuantum(*p++));
           if (image->matte != MagickFalse)
-            SetOpacityPixelComponent(q,ScaleCharToQuantum(*p++));
+            SetPixelOpacity(q,ScaleCharToQuantum(*p++));
           q++;
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1087,7 +1087,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           byte<<=1;
-          byte|=GetIndexPixelComponent(indexes+x) != 0 ? 0x01 : 0x00;
+          byte|=GetPixelIndex(indexes+x) != 0 ? 0x01 : 0x00;
           bit++;
           if (bit == 8)
             {
@@ -1124,7 +1124,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         indexes=GetVirtualIndexQueue(image);
         q=pixels+(image->rows-y-1)*bytes_per_line;
         for (x=0; x < (ssize_t) image->columns; x++)
-          *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+          *q++=(unsigned char) GetPixelIndex(indexes+x);
         for ( ; x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
         status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -1150,10 +1150,10 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           word=(unsigned short) ((ScaleColor8to5((unsigned char)
-            ScaleQuantumToChar(GetRedPixelComponent(p))) << 11) |
+            ScaleQuantumToChar(GetPixelRed(p))) << 11) |
             (ScaleColor8to6((unsigned char) ScaleQuantumToChar(
-            GetGreenPixelComponent(p))) << 5) | (ScaleColor8to5((unsigned char)
-            ScaleQuantumToChar((unsigned char) GetBluePixelComponent(p)) <<
+            GetPixelGreen(p))) << 5) | (ScaleColor8to5((unsigned char)
+            ScaleQuantumToChar((unsigned char) GetPixelBlue(p)) <<
             0)));
           *q++=(unsigned char)(word & 0xff);
           *q++=(unsigned char)(word >> 8);
@@ -1182,11 +1182,11 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         q=pixels+(image->rows-y-1)*bytes_per_line;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-          *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-          *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+          *q++=ScaleQuantumToChar(GetPixelBlue(p));
+          *q++=ScaleQuantumToChar(GetPixelGreen(p));
+          *q++=ScaleQuantumToChar(GetPixelRed(p));
           if (image->matte != MagickFalse)
-            *q++=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelOpacity(p));
           p++;
         }
         if (dib_info.bits_per_pixel == 24)
index b8ccf3954c1119df699c5b77db0acf26479ae87d..54a233006d8bedaf062ebfddb382a957c4aa6b46 100644 (file)
@@ -407,7 +407,7 @@ get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h,
                                                 if (bit == 0) byte= (size_t) q[(y * stride) + (x / 8)];
 
                                                 if (indexes != (IndexPacket *) NULL)
-                                                  SetIndexPixelComponent(indexes+x,(IndexPacket) (((byte & 0x01) != 0) ? 0x00 : 0x01));
+                                                  SetPixelIndex(indexes+x,(IndexPacket) (((byte & 0x01) != 0) ? 0x00 : 0x01));
                                                 bit++;
                                                 if (bit == 8)
                                                         bit=0;
@@ -442,9 +442,9 @@ get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h,
                                  break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetRedPixelComponent(r,ScaleCharToQuantum(*s++));
-                    SetGreenPixelComponent(r,ScaleCharToQuantum(*s++));
-                    SetBluePixelComponent(r,ScaleCharToQuantum(*s++));
+                    SetPixelRed(r,ScaleCharToQuantum(*s++));
+                    SetPixelGreen(r,ScaleCharToQuantum(*s++));
+                    SetPixelBlue(r,ScaleCharToQuantum(*s++));
                     r++;
                   }
 
index e1ec23f270a0da18b21b6f6c108001d12668fb8e..bead8ec179dae09badc1fe15b47a15709f92f7b3 100644 (file)
@@ -382,11 +382,11 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             pixel=XGetPixel(dps_image,x,y);
             index=(pixel >> red_shift) & red_mask;
-            SetRedPixelComponent(q,ScaleShortToQuantum(colors[index].red));
+            SetPixelRed(q,ScaleShortToQuantum(colors[index].red));
             index=(pixel >> green_shift) & green_mask;
-            SetGreenPixelComponent(q,ScaleShortToQuantum(colors[index].green));
+            SetPixelGreen(q,ScaleShortToQuantum(colors[index].green));
             index=(pixel >> blue_shift) & blue_mask;
-            SetBluePixelComponent(q,ScaleShortToQuantum(colors[index].blue));
+            SetPixelBlue(q,ScaleShortToQuantum(colors[index].blue));
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -405,14 +405,14 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
             pixel=XGetPixel(dps_image,x,y);
             color=(pixel >> red_shift) & red_mask;
             color=(color*65535L)/red_mask;
-            SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short) color));
+            SetPixelRed(q,ScaleShortToQuantum((unsigned short) color));
             color=(pixel >> green_shift) & green_mask;
             color=(color*65535L)/green_mask;
-            SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
               color));
             color=(pixel >> blue_shift) & blue_mask;
             color=(color*65535L)/blue_mask;
-            SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
               color));
             q++;
           }
@@ -455,7 +455,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
         indexes=GetAuthenticIndexQueue(image);
         for (x=0; x < (ssize_t) image->columns; x++)
-          SetIndexPixelComponent(indexes+x,(unsigned short)
+          SetPixelIndex(indexes+x,(unsigned short)
             XGetPixel(dps_image,x,y));
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -501,9 +501,9 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   break;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
-                  SetOpacityPixelComponent(q,OpaqueOpacity);
+                  SetPixelOpacity(q,OpaqueOpacity);
                   if (XGetPixel(matte_image,x,y) == 0)
-                    SetOpacityPixelComponent(q,TransparentOpacity);
+                    SetPixelOpacity(q,TransparentOpacity);
                   q++;
                 }
                 if (SyncAuthenticPixels(image,exception) == MagickFalse)
index b1afb2748361a90653530a11484a2aa5dfe9a27d..f4dfcce351a3c24abc1fcc34d2ff29bdafda2185 100644 (file)
@@ -613,10 +613,10 @@ static Image *ReadEMFImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ScaleCharToQuantum(pBits->rgbRed));
-      SetGreenPixelComponent(q,ScaleCharToQuantum(pBits->rgbGreen));
-      SetBluePixelComponent(q,ScaleCharToQuantum(pBits->rgbBlue));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,ScaleCharToQuantum(pBits->rgbRed));
+      SetPixelGreen(q,ScaleCharToQuantum(pBits->rgbGreen));
+      SetPixelBlue(q,ScaleCharToQuantum(pBits->rgbBlue));
+      SetPixelOpacity(q,OpaqueOpacity);
       pBits++;
       q++;
     }
index 73932216f0f66ae17bb3b03950e5f344db1a6a7f..df9137e6968c683f83f73d289398160a0d68c9cb 100644 (file)
@@ -224,13 +224,13 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception)
     ImfInputReadPixels(file,min_y+y,min_y+y);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+      SetPixelRed(q,ClampToQuantum((MagickRealType) QuantumRange*
         ImfHalfToFloat(scanline[x].r)));
-      SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+      SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*
         ImfHalfToFloat(scanline[x].g)));
-      SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+      SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*
         ImfHalfToFloat(scanline[x].b)));
-      SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+      SetPixelAlpha(q,ClampToQuantum((MagickRealType) QuantumRange*
         ImfHalfToFloat(scanline[x].a)));
       q++;
     }
@@ -431,16 +431,16 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      ImfFloatToHalf(QuantumScale*GetRedPixelComponent(p),&half_quantum);
+      ImfFloatToHalf(QuantumScale*GetPixelRed(p),&half_quantum);
       scanline[x].r=half_quantum;
-      ImfFloatToHalf(QuantumScale*GetGreenPixelComponent(p),&half_quantum);
+      ImfFloatToHalf(QuantumScale*GetPixelGreen(p),&half_quantum);
       scanline[x].g=half_quantum;
-      ImfFloatToHalf(QuantumScale*GetBluePixelComponent(p),&half_quantum);
+      ImfFloatToHalf(QuantumScale*GetPixelBlue(p),&half_quantum);
       scanline[x].b=half_quantum;
       if (image->matte == MagickFalse)
         ImfFloatToHalf(1.0,&half_quantum);
       else
-        ImfFloatToHalf(1.0-QuantumScale*GetOpacityPixelComponent(p),
+        ImfFloatToHalf(1.0-QuantumScale*GetPixelOpacity(p),
           &half_quantum);
       scanline[x].a=half_quantum;
       p++;
index 310365e6c772e5be00608208edff75f0cab788e0..91201c1786dcd68438cc7481e928a570530bf1e2 100644 (file)
@@ -443,10 +443,10 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         pixel=GetFITSPixel(image,fits_info.bits_per_pixel);
-        SetRedPixelComponent(q,ClampToQuantum(scale*(fits_info.scale*(pixel-
+        SetPixelRed(q,ClampToQuantum(scale*(fits_info.scale*(pixel-
           fits_info.min_data)+fits_info.zero)));
-        SetGreenPixelComponent(q,GetRedPixelComponent(q));
-        SetBluePixelComponent(q,GetRedPixelComponent(q));
+        SetPixelGreen(q,GetPixelRed(q));
+        SetPixelBlue(q,GetPixelRed(q));
         q++;
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
index f7e863c1c6cb45cc87fce7b236225a9b8bd5ce11..b0e896976ac9e213e2ca9d17eb18a5ead27e9848 100644 (file)
@@ -459,21 +459,21 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     {
       if (fpx_info.numberOfComponents > 2)
         {
-          SetRedPixelComponent(q,ScaleCharToQuantum(*r));
-          SetGreenPixelComponent(q,ScaleCharToQuantum(*g));
-          SetBluePixelComponent(q,ScaleCharToQuantum(*b));
+          SetPixelRed(q,ScaleCharToQuantum(*r));
+          SetPixelGreen(q,ScaleCharToQuantum(*g));
+          SetPixelBlue(q,ScaleCharToQuantum(*b));
         }
       else
         {
           index=ScaleCharToQuantum(*r);
-          SetIndexPixelComponent(indexes+x,index);
-          SetRedPixelComponent(q,index);
-          SetGreenPixelComponent(q,index);
-          SetBluePixelComponent(q,index);
+          SetPixelIndex(indexes+x,index);
+          SetPixelRed(q,index);
+          SetPixelGreen(q,index);
+          SetPixelBlue(q,index);
         }
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelOpacity(q,OpaqueOpacity);
       if (image->matte != MagickFalse)
-        SetAlphaPixelComponent(q,ScaleCharToQuantum(*a));
+        SetPixelAlpha(q,ScaleCharToQuantum(*a));
       q++;
       r+=red_component->columnStride;
       g+=green_component->columnStride;
index 23c285ad700623b9844606f1f5ca9f466a93b7be..7b803f0d430dc738ef4a5550a0540a34e0b7dae4 100644 (file)
@@ -445,9 +445,9 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity)
       if (c < 0)
         break;
       index=ConstrainColormapIndex(image,(size_t) c);
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
-      SetOpacityPixelComponent(q,(ssize_t) index == opacity ?
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
+      SetPixelOpacity(q,(ssize_t) index == opacity ?
         TransparentOpacity : OpaqueOpacity);
       x++;
       q++;
@@ -674,7 +674,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
       /*
         Probe hash table.
       */
-      index=(IndexPacket) ((size_t) GetIndexPixelComponent(indexes+x) & 0xff);
+      index=(IndexPacket) ((size_t) GetPixelIndex(indexes+x) & 0xff);
       p++;
       k=(ssize_t) (((size_t) index << (MaxGIFBits-8))+waiting_code);
       if (k >= MaxHashTable)
index 953238496dfff1c6cd8f8ecb0ecd16deb17170e2..f73ed5e2748e767d5a8cdd29502f74a9b122ab00 100644 (file)
@@ -223,9 +223,9 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,GetRedPixelComponent(p));
-            SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-            SetBluePixelComponent(q,GetBluePixelComponent(p));
+            SetPixelRed(q,GetPixelRed(p));
+            SetPixelGreen(q,GetPixelGreen(p));
+            SetPixelBlue(q,GetPixelBlue(p));
             p++;
             q++;
           }
index 41eb89ec9add7f6b1f22750bf8009f890176c385..9fc5c6589c040cb21006f787f436047b4b0b1949 100644 (file)
@@ -146,13 +146,13 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
     {
       for (red=0; red < (ssize_t) cube_size; red++)
       {
-        SetRedPixelComponent(q,ClampToQuantum(QuantumRange*red/
+        SetPixelRed(q,ClampToQuantum(QuantumRange*red/
           (cube_size-1.0)));
-        SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*green/
+        SetPixelGreen(q,ClampToQuantum(QuantumRange*green/
           (cube_size-1.0)));
-        SetBluePixelComponent(q,ClampToQuantum(QuantumRange*blue/
+        SetPixelBlue(q,ClampToQuantum(QuantumRange*blue/
           (cube_size-1.0)));
-        SetOpacityPixelComponent(q,OpaqueOpacity);
+        SetPixelOpacity(q,OpaqueOpacity);
         q++;
       }
     }
index aeb5df03003eb00b8abc0521771dbbb70aa17308..16a79b4cd9383805c3da1fdcaa1957f8bc119cc2 100644 (file)
@@ -462,15 +462,15 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception)
           pixel[2]=pixels[i++];
           pixel[3]=pixels[i++];
         }
-      SetRedPixelComponent(q,0);
-      SetGreenPixelComponent(q,0);
-      SetBluePixelComponent(q,0);
+      SetPixelRed(q,0);
+      SetPixelGreen(q,0);
+      SetPixelBlue(q,0);
       if (pixel[3] != 0)
         {
           gamma=pow(2.0,pixel[3]-(128.0+8.0));
-          SetRedPixelComponent(q,ClampToQuantum(QuantumRange*gamma*pixel[0]));
-          SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*gamma*pixel[1]));
-          SetBluePixelComponent(q,ClampToQuantum(QuantumRange*gamma*pixel[2]));
+          SetPixelRed(q,ClampToQuantum(QuantumRange*gamma*pixel[0]));
+          SetPixelGreen(q,ClampToQuantum(QuantumRange*gamma*pixel[1]));
+          SetPixelBlue(q,ClampToQuantum(QuantumRange*gamma*pixel[2]));
         }
       q++;
     }
@@ -752,22 +752,22 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image)
       pixel[1]=0;
       pixel[2]=0;
       pixel[3]=0;
-      gamma=QuantumScale*GetRedPixelComponent(p);
-      if ((QuantumScale*GetGreenPixelComponent(p)) > gamma)
-        gamma=QuantumScale*GetGreenPixelComponent(p);
-      if ((QuantumScale*GetBluePixelComponent(p)) > gamma)
-        gamma=QuantumScale*GetBluePixelComponent(p);
+      gamma=QuantumScale*GetPixelRed(p);
+      if ((QuantumScale*GetPixelGreen(p)) > gamma)
+        gamma=QuantumScale*GetPixelGreen(p);
+      if ((QuantumScale*GetPixelBlue(p)) > gamma)
+        gamma=QuantumScale*GetPixelBlue(p);
       if (gamma > MagickEpsilon)
         {
           int
             exponent;
 
           gamma=frexp(gamma,&exponent)*256.0/gamma;
-          pixel[0]=(unsigned char) (gamma*QuantumScale*GetRedPixelComponent(p));
+          pixel[0]=(unsigned char) (gamma*QuantumScale*GetPixelRed(p));
           pixel[1]=(unsigned char) (gamma*QuantumScale*
-            GetGreenPixelComponent(p));
+            GetPixelGreen(p));
           pixel[2]=(unsigned char) (gamma*QuantumScale*
-            GetBluePixelComponent(p));
+            GetPixelBlue(p));
           pixel[3]=(unsigned char) (exponent+128);
         }
       if ((image->columns >= 8) && (image->columns <= 0x7ffff))
index 95ad0a3c416c7e561189be0058d95d237f1d2260..71f8d81edc2c485b715bcafbdfee2a3a5ecd1815 100644 (file)
@@ -271,11 +271,11 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        histogram[ScaleQuantumToChar(GetRedPixelComponent(p))].red++;
+        histogram[ScaleQuantumToChar(GetPixelRed(p))].red++;
       if ((channel & GreenChannel) != 0)
-        histogram[ScaleQuantumToChar(GetGreenPixelComponent(p))].green++;
+        histogram[ScaleQuantumToChar(GetPixelGreen(p))].green++;
       if ((channel & BlueChannel) != 0)
-        histogram[ScaleQuantumToChar(GetBluePixelComponent(p))].blue++;
+        histogram[ScaleQuantumToChar(GetPixelBlue(p))].blue++;
       p++;
     }
   }
@@ -308,7 +308,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
         r=q+y;
         for ( ; y < (ssize_t) histogram_image->rows; y++)
         {
-          SetRedPixelComponent(r,QuantumRange);
+          SetPixelRed(r,QuantumRange);
           r++;
         }
       }
@@ -318,7 +318,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
         r=q+y;
         for ( ; y < (ssize_t) histogram_image->rows; y++)
         {
-          SetGreenPixelComponent(r,QuantumRange);
+          SetPixelGreen(r,QuantumRange);
           r++;
         }
       }
@@ -328,7 +328,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
         r=q+y;
         for ( ; y < (ssize_t) histogram_image->rows; y++)
         {
-          SetBluePixelComponent(r,QuantumRange);
+          SetPixelBlue(r,QuantumRange);
           r++;
         }
       }
index c8ea57dbfb6a167f53441588fccfe63fc86f6856..13ab46fa5395b2ca463c2fc841ecbd538aba811a 100644 (file)
@@ -156,10 +156,10 @@ static Image *ReadHRZImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,4*ScaleCharToQuantum(*p++));
-      SetGreenPixelComponent(q,4*ScaleCharToQuantum(*p++));
-      SetBluePixelComponent(q,4*ScaleCharToQuantum(*p++));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,4*ScaleCharToQuantum(*p++));
+      SetPixelGreen(q,4*ScaleCharToQuantum(*p++));
+      SetPixelBlue(q,4*ScaleCharToQuantum(*p++));
+      SetPixelOpacity(q,OpaqueOpacity);
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -323,9 +323,9 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image)
     q=pixels;
     for (x=0; x < (ssize_t) hrz_image->columns; x++)
     {
-      *q++=ScaleQuantumToChar(GetRedPixelComponent(p))/4;
-      *q++=ScaleQuantumToChar(GetGreenPixelComponent(p))/4;
-      *q++=ScaleQuantumToChar(GetBluePixelComponent(p))/4;
+      *q++=ScaleQuantumToChar(GetPixelRed(p))/4;
+      *q++=ScaleQuantumToChar(GetPixelGreen(p))/4;
+      *q++=ScaleQuantumToChar(GetPixelBlue(p))/4;
       p++;
     }
     count=WriteBlob(image,(size_t) (q-pixels),pixels);
index 4cfd35d2b690b0cf364b5a6b9046e07c1b07d563..ca636ff75a7e2c376832adb13f4a50a0437c32b4 100644 (file)
@@ -409,14 +409,14 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               {
                 byte=(size_t) ReadBlobByte(image);
                 for (bit=0; bit < 8; bit++)
-                  SetIndexPixelComponent(indexes+x+bit,
+                  SetPixelIndex(indexes+x+bit,
                     ((byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00));
               }
               if ((image->columns % 8) != 0)
                 {
                   byte=(size_t) ReadBlobByte(image);
                   for (bit=0; bit < (image->columns % 8); bit++)
-                    SetIndexPixelComponent(indexes+x+bit,
+                    SetPixelIndex(indexes+x+bit,
                       ((byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00));
                 }
               for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -447,13 +447,13 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               for (x=0; x < ((ssize_t) image->columns-1); x+=2)
               {
                 byte=(size_t) ReadBlobByte(image);
-                SetIndexPixelComponent(indexes+x,((byte >> 4) & 0xf));
-                SetIndexPixelComponent(indexes+x+1,((byte) & 0xf));
+                SetPixelIndex(indexes+x,((byte >> 4) & 0xf));
+                SetPixelIndex(indexes+x+1,((byte) & 0xf));
               }
               if ((image->columns % 2) != 0)
                 {
                   byte=(size_t) ReadBlobByte(image);
-                  SetIndexPixelComponent(indexes+x,((byte >> 4) & 0xf));
+                  SetPixelIndex(indexes+x,((byte >> 4) & 0xf));
                 }
               for (x=0; x < (ssize_t) scanline_pad; x++)
                 (void) ReadBlobByte(image);
@@ -483,7 +483,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 byte=(size_t) ReadBlobByte(image);
-                SetIndexPixelComponent(indexes+x,byte);
+                SetPixelIndex(indexes+x,byte);
               }
               for (x=0; x < (ssize_t) scanline_pad; x++)
                 (void) ReadBlobByte(image);
@@ -514,7 +514,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               {
                 byte=(size_t) ReadBlobByte(image);
                 byte|=(size_t) (ReadBlobByte(image) << 8);
-                SetIndexPixelComponent(indexes+x,byte);
+                SetPixelIndex(indexes+x,byte);
               }
               for (x=0; x < (ssize_t) scanline_pad; x++)
                 (void) ReadBlobByte(image);
@@ -543,14 +543,14 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+                SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
                   ReadBlobByte(image)));
-                SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
                   ReadBlobByte(image)));
-                SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                SetPixelRed(q,ScaleCharToQuantum((unsigned char)
                   ReadBlobByte(image)));
                 if (icon_info.bits_per_pixel == 32)
-                  SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                     ReadBlobByte(image)));
                 q++;
               }
@@ -589,14 +589,14 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               {
                 byte=(size_t) ReadBlobByte(image);
                 for (bit=0; bit < 8; bit++)
-                  SetOpacityPixelComponent(q+x+bit,(((byte & (0x80 >> bit)) !=
+                  SetPixelOpacity(q+x+bit,(((byte & (0x80 >> bit)) !=
                     0) ? TransparentOpacity : OpaqueOpacity));
               }
               if ((image->columns % 8) != 0)
                 {
                   byte=(size_t) ReadBlobByte(image);
                   for (bit=0; bit < (image->columns % 8); bit++)
-                    SetOpacityPixelComponent(q+x+bit,(((byte & (0x80 >> bit)) !=
+                    SetPixelOpacity(q+x+bit,(((byte & (0x80 >> bit)) !=
                       0) ? TransparentOpacity : OpaqueOpacity));
                 }
               if ((image->columns % 32) != 0)
@@ -1000,7 +1000,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) next->columns; x++)
               {
                 byte<<=1;
-                byte|=GetIndexPixelComponent(indexes+x) != 0 ? 0x01 : 0x00;
+                byte|=GetPixelIndex(indexes+x) != 0 ? 0x01 : 0x00;
                 bit++;
                 if (bit == 8)
                   {
@@ -1041,7 +1041,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) next->columns; x++)
               {
                 byte<<=4;
-                byte|=((size_t) GetIndexPixelComponent(indexes+x) & 0x0f);
+                byte|=((size_t) GetPixelIndex(indexes+x) & 0x0f);
                 nibble++;
                 if (nibble == 2)
                   {
@@ -1074,7 +1074,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
               indexes=GetVirtualIndexQueue(next);
               q=pixels+(next->rows-y-1)*bytes_per_line;
               for (x=0; x < (ssize_t) next->columns; x++)
-                *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+                *q++=(unsigned char) GetPixelIndex(indexes+x);
               if (next->previous == (Image *) NULL)
                 {
                   status=SetImageProgress(next,SaveImageTag,y,next->rows);
@@ -1098,13 +1098,13 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
               q=pixels+(next->rows-y-1)*bytes_per_line;
               for (x=0; x < (ssize_t) next->columns; x++)
               {
-                *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-                *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-                *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+                *q++=ScaleQuantumToChar(GetPixelBlue(p));
+                *q++=ScaleQuantumToChar(GetPixelGreen(p));
+                *q++=ScaleQuantumToChar(GetPixelRed(p));
                 if (next->matte == MagickFalse)
                   *q++=ScaleQuantumToChar(QuantumRange);
                 else
-                  *q++=ScaleQuantumToChar(GetAlphaPixelComponent(p));
+                  *q++=ScaleQuantumToChar(GetPixelAlpha(p));
                 p++;
               }
               if (icon_info.bits_per_pixel == 24)
@@ -1192,7 +1192,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
           {
             byte<<=1;
             if ((next->matte == MagickTrue) &&
-                (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity))
+                (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
               byte|=0x01;
             bit++;
             if (bit == 8)
index bdbd33db803fb9e62217bb6407aa298bb7aac927..3610b08a54d5b370789b041858e677d516065c57 100644 (file)
@@ -237,8 +237,8 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
       byte<<=1;
       if (bit == 8)
         bit=0;
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index a70d0913d8d1bbf42d7b67fe348fd0c5d47bb886..07073b57fa1a2fdf4daa8554ead0f768317a85cb 100644 (file)
@@ -536,10 +536,10 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
-          SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelRed(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[0]));
-          SetGreenPixelComponent(q,GetRedPixelComponent(q));
-          SetBluePixelComponent(q,GetRedPixelComponent(q));
+          SetPixelGreen(q,GetPixelRed(q));
+          SetPixelBlue(q,GetPixelRed(q));
           q++;
         }
         break;
@@ -552,13 +552,13 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
-          SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelRed(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[0]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[1],x/x_step[1]);
-          SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[1]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
-          SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[2]));
           q++;
         }
@@ -572,16 +572,16 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
-          SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelRed(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[0]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[1],x/x_step[1]);
-          SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[1]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
-          SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[2]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]);
-          SetAlphaPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+          SetPixelAlpha(q,ScaleAnyToQuantum((QuantumAny) pixel,
             range[3]));
           q++;
         }
@@ -936,14 +936,14 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
       else
         {
           jas_matrix_setv(pixels[0],x,(jas_seqent_t)
-            ScaleQuantumToAny(GetRedPixelComponent(p),range));
+            ScaleQuantumToAny(GetPixelRed(p),range));
           jas_matrix_setv(pixels[1],x,(jas_seqent_t)
-            ScaleQuantumToAny(GetGreenPixelComponent(p),range));
+            ScaleQuantumToAny(GetPixelGreen(p),range));
           jas_matrix_setv(pixels[2],x,(jas_seqent_t)
-            ScaleQuantumToAny(GetBluePixelComponent(p),range));
+            ScaleQuantumToAny(GetPixelBlue(p),range));
           if (number_components > 3)
             jas_matrix_setv(pixels[3],x,(jas_seqent_t)
-              ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range));
+              ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range));
         }
       p++;
     }
index 1996e6c00f3246c6f0799995d96817ad9bad68fb..34a318bd77108eb9d9631a3f98e03af07e39455d 100644 (file)
@@ -1245,8 +1245,8 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
             else
               pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
             index=ConstrainColormapIndex(image,pixel);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             p++;
             q++;
           }
@@ -1254,27 +1254,27 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
           if (image->colorspace != CMYKColorspace)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              SetRedPixelComponent(q,ScaleShortToQuantum((unsigned char)
+              SetPixelRed(q,ScaleShortToQuantum((unsigned char)
                 (GETJSAMPLE(*p++) << 4)));
-              SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned char)
+              SetPixelGreen(q,ScaleShortToQuantum((unsigned char)
                 (GETJSAMPLE(*p++) << 4)));
-              SetBluePixelComponent(q,ScaleShortToQuantum((unsigned char)
+              SetPixelBlue(q,ScaleShortToQuantum((unsigned char)
                 (GETJSAMPLE(*p++) << 4)));
-              SetOpacityPixelComponent(q,OpaqueOpacity);
+              SetPixelOpacity(q,OpaqueOpacity);
               q++;
             }
           else
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              SetCyanPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+              SetPixelCyan(q,QuantumRange-ScaleShortToQuantum(
                 (unsigned char) (GETJSAMPLE(*p++) << 4)));
-              SetMagentaPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+              SetPixelMagenta(q,QuantumRange-ScaleShortToQuantum(
                 (unsigned char) (GETJSAMPLE(*p++) << 4)));
-              SetYellowPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+              SetPixelYellow(q,QuantumRange-ScaleShortToQuantum(
                 (unsigned char) (GETJSAMPLE(*p++) << 4)));
-              SetBlackPixelComponent(indexes+x,QuantumRange-ScaleShortToQuantum(
+              SetPixelBlack(indexes+x,QuantumRange-ScaleShortToQuantum(
                 (unsigned char) (GETJSAMPLE(*p++) << 4)));
-              SetOpacityPixelComponent(q,OpaqueOpacity);
+              SetPixelOpacity(q,OpaqueOpacity);
               q++;
             }
       }
@@ -1283,8 +1283,8 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p));
-          SetIndexPixelComponent(indexes+x,index);
-          SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+          SetPixelIndex(indexes+x,index);
+          SetPixelRGBO(q,image->colormap+(ssize_t) index);
           p++;
           q++;
         }
@@ -1292,27 +1292,27 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
         if (image->colorspace != CMYKColorspace)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelRed(q,ScaleCharToQuantum((unsigned char)
               GETJSAMPLE(*p++)));
-            SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
               GETJSAMPLE(*p++)));
-            SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
               GETJSAMPLE(*p++)));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelOpacity(q,OpaqueOpacity);
             q++;
           }
         else
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetCyanPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+            SetPixelCyan(q,QuantumRange-ScaleCharToQuantum(
               (unsigned char) GETJSAMPLE(*p++)));
-            SetMagentaPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+            SetPixelMagenta(q,QuantumRange-ScaleCharToQuantum(
               (unsigned char) GETJSAMPLE(*p++)));
-            SetYellowPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+            SetPixelYellow(q,QuantumRange-ScaleCharToQuantum(
               (unsigned char) GETJSAMPLE(*p++)));
-            SetBlackPixelComponent(indexes+x,QuantumRange-ScaleCharToQuantum(
+            SetPixelBlack(indexes+x,QuantumRange-ScaleCharToQuantum(
               (unsigned char) GETJSAMPLE(*p++)));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelOpacity(q,OpaqueOpacity);
             q++;
           }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2225,9 +2225,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
           q=jpeg_pixels;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *q++=(JSAMPLE) ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=(JSAMPLE) ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=(JSAMPLE) ScaleQuantumToChar(GetBluePixelComponent(p));
+            *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelRed(p));
+            *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelBlue(p));
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
@@ -2284,13 +2284,13 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
                 Convert DirectClass packets to contiguous CMYK scanlines.
               */
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
-                GetRedPixelComponent(p))));
+                GetPixelRed(p))));
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
-                GetGreenPixelComponent(p))));
+                GetPixelGreen(p))));
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
-                GetBluePixelComponent(p))));
+                GetPixelBlue(p))));
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
-                GetIndexPixelComponent(indexes+x))));
+                GetPixelIndex(indexes+x))));
               p++;
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
@@ -2343,11 +2343,11 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
           q=jpeg_pixels;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *q++=(JSAMPLE) (ScaleQuantumToShort(GetRedPixelComponent(p)) >>
+            *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelRed(p)) >>
               4);
-            *q++=(JSAMPLE) (ScaleQuantumToShort(GetGreenPixelComponent(p)) >>
+            *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelGreen(p)) >>
               4);
-            *q++=(JSAMPLE) (ScaleQuantumToShort(GetBluePixelComponent(p)) >>
+            *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelBlue(p)) >>
               4);
             p++;
           }
@@ -2380,13 +2380,13 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               Convert DirectClass packets to contiguous CMYK scanlines.
             */
             *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
-              GetRedPixelComponent(p)) >> 4));
+              GetPixelRed(p)) >> 4));
             *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
-              GetGreenPixelComponent(p)) >> 4));
+              GetPixelGreen(p)) >> 4));
             *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
-              GetBluePixelComponent(p)) >> 4));
+              GetPixelBlue(p)) >> 4));
             *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
-              GetIndexPixelComponent(indexes+x)) >> 4));
+              GetPixelIndex(indexes+x)) >> 4));
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
index e21655db08d9373c6e4a5eb285ef3122ebdfc920..5d7761f5bf81860404e7c29bc239452089c00aea 100644 (file)
@@ -191,7 +191,7 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 if (bit == 0)
                   byte=(*p++);
-                SetIndexPixelComponent(indexes+x,((byte & 0x80) != 0 ?
+                SetPixelIndex(indexes+x,((byte & 0x80) != 0 ?
                   0x01 : 0x00));
                 bit++;
                 byte<<=1;
@@ -227,7 +227,7 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             if (bit == 0)
               byte=(*p++);
-            SetIndexPixelComponent(indexes+x,((byte & 0x80) != 0 ?
+            SetPixelIndex(indexes+x,((byte & 0x80) != 0 ?
               0x01 : 0x00));
             bit++;
             byte<<=1;
index c745fe94f62f1db7a3241f38991d1b4b0057defd..11ef7a9fa54c1d7ac7fdd8278f05820d755ba294 100644 (file)
@@ -227,8 +227,8 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           index=ConstrainColormapIndex(image,((size_t) index << 8)+(*p));
           p++;
         }
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -426,8 +426,8 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image)
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if (image->colors > 256)
-        *q++=(unsigned char) ((size_t) GetIndexPixelComponent(indexes+x) >> 8);
-      *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+        *q++=(unsigned char) ((size_t) GetPixelIndex(indexes+x) >> 8);
+      *q++=(unsigned char) GetPixelIndex(indexes+x);
     }
     (void) WriteBlob(image,(size_t) (q-pixels),pixels);
   }
index b48d32d1659ad68217c10bfb1d1f959293ac2345..c9c3217e49686f012799c97ec9176cc1b204e054 100644 (file)
@@ -197,38 +197,38 @@ static void InsertComplexDoubleRow(double *p, int y, Image * image, double MinVa
   {
     if (*p > 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - GetRedPixelComponent(q));
-      if (f + GetRedPixelComponent(q) > QuantumRange)
-        SetRedPixelComponent(q,QuantumRange);
+      f = (*p / MaxVal) * (QuantumRange - GetPixelRed(q));
+      if (f + GetPixelRed(q) > QuantumRange)
+        SetPixelRed(q,QuantumRange);
       else
-        SetRedPixelComponent(q,GetRedPixelComponent(q)+(int) f);
-      if ((int) f / 2.0 > GetGreenPixelComponent(q))
+        SetPixelRed(q,GetPixelRed(q)+(int) f);
+      if ((int) f / 2.0 > GetPixelGreen(q))
         {
-          SetGreenPixelComponent(q,0);
-          SetBluePixelComponent(q,0);
+          SetPixelGreen(q,0);
+          SetPixelBlue(q,0);
         }
       else
         {
-          SetBluePixelComponent(q,GetBluePixelComponent(q)-(int) (f/2.0));
-          SetGreenPixelComponent(q,GetBluePixelComponent(q));
+          SetPixelBlue(q,GetPixelBlue(q)-(int) (f/2.0));
+          SetPixelGreen(q,GetPixelBlue(q));
         }
     }
     if (*p < 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - GetBluePixelComponent(q));
-      if (f + GetBluePixelComponent(q) > QuantumRange)
-        SetBluePixelComponent(q,QuantumRange);
+      f = (*p / MaxVal) * (QuantumRange - GetPixelBlue(q));
+      if (f + GetPixelBlue(q) > QuantumRange)
+        SetPixelBlue(q,QuantumRange);
       else
-        SetBluePixelComponent(q,GetBluePixelComponent(q)+(int) f);
+        SetPixelBlue(q,GetPixelBlue(q)+(int) f);
       if ((int) f / 2.0 > q->green)
         {
-          SetRedPixelComponent(q,0);
-          SetGreenPixelComponent(q,0);
+          SetPixelRed(q,0);
+          SetPixelGreen(q,0);
         }
       else
         {
-          SetRedPixelComponent(q,GetRedPixelComponent(q)-(int) (f/2.0));
-          SetGreenPixelComponent(q,GetRedPixelComponent(q));
+          SetPixelRed(q,GetPixelRed(q)-(int) (f/2.0));
+          SetPixelGreen(q,GetPixelRed(q));
         }
     }
     p++;
@@ -263,38 +263,38 @@ static void InsertComplexFloatRow(float *p, int y, Image * image, double MinVal,
   {
     if (*p > 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - GetRedPixelComponent(q));
-      if (f + GetRedPixelComponent(q) > QuantumRange)
-        SetRedPixelComponent(q,QuantumRange);
+      f = (*p / MaxVal) * (QuantumRange - GetPixelRed(q));
+      if (f + GetPixelRed(q) > QuantumRange)
+        SetPixelRed(q,QuantumRange);
       else
-        SetRedPixelComponent(q,GetRedPixelComponent(q)+(int) f);
-      if ((int) f / 2.0 > GetGreenPixelComponent(q))
+        SetPixelRed(q,GetPixelRed(q)+(int) f);
+      if ((int) f / 2.0 > GetPixelGreen(q))
         {
-          SetGreenPixelComponent(q,0);
-          SetBluePixelComponent(q,0);
+          SetPixelGreen(q,0);
+          SetPixelBlue(q,0);
         }
       else
         {
-          SetBluePixelComponent(q,GetBluePixelComponent(q)-(int) (f/2.0));
-          SetGreenPixelComponent(q,GetBluePixelComponent(q));
+          SetPixelBlue(q,GetPixelBlue(q)-(int) (f/2.0));
+          SetPixelGreen(q,GetPixelBlue(q));
         }
     }
     if (*p < 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - GetBluePixelComponent(q));
-      if (f + GetBluePixelComponent(q) > QuantumRange)
-        SetBluePixelComponent(q,QuantumRange);
+      f = (*p / MaxVal) * (QuantumRange - GetPixelBlue(q));
+      if (f + GetPixelBlue(q) > QuantumRange)
+        SetPixelBlue(q,QuantumRange);
       else
-        SetBluePixelComponent(q,GetBluePixelComponent(q)+(int) f);
+        SetPixelBlue(q,GetPixelBlue(q)+(int) f);
       if ((int) f / 2.0 > q->green)
         {
-          SetGreenPixelComponent(q,0);
-          SetRedPixelComponent(q,0);
+          SetPixelGreen(q,0);
+          SetPixelRed(q,0);
         }
       else
         {
-          SetRedPixelComponent(q,GetRedPixelComponent(q)-(int) (f/2.0));
-          SetGreenPixelComponent(q,GetRedPixelComponent(q));
+          SetPixelRed(q,GetPixelRed(q)-(int) (f/2.0));
+          SetPixelGreen(q,GetPixelRed(q));
         }
     }
     p++;
@@ -424,9 +424,9 @@ static void FixSignedValues(PixelPacket *q, int y)
      /* Please note that negative values will overflow
         Q=8; QuantumRange=255: <0;127> + 127+1 = <128; 255> 
            <-1;-128> + 127+1 = <0; 127> */
-    SetRedPixelComponent(q,GetRedPixelComponent(q)+QuantumRange/2+1);
-    SetGreenPixelComponent(q,GetGreenPixelComponent(q)+QuantumRange/2+1);
-    SetBluePixelComponent(q,GetBluePixelComponent(q)+QuantumRange/2+1);
+    SetPixelRed(q,GetPixelRed(q)+QuantumRange/2+1);
+    SetPixelGreen(q,GetPixelGreen(q)+QuantumRange/2+1);
+    SetPixelBlue(q,GetPixelBlue(q)+QuantumRange/2+1);
     q++;
   }
 }
index a415208c483c623da63cd9ef7533327dde68b32f..cadddcb58a7580ea21b628479cbbb435ee294e68 100644 (file)
@@ -194,10 +194,10 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,GetOpacityPixelComponent(p));
-      SetGreenPixelComponent(q,GetOpacityPixelComponent(p));
-      SetBluePixelComponent(q,GetOpacityPixelComponent(p));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,GetPixelOpacity(p));
+      SetPixelGreen(q,GetPixelOpacity(p));
+      SetPixelBlue(q,GetPixelOpacity(p));
+      SetPixelOpacity(q,OpaqueOpacity);
       p++;
       q++;
     }
index 2a068f1eba3cfdb87170f00d9716f853428cd045..1305b92aebe19cfd43d167740f98d0d39a362b5b 100644 (file)
@@ -288,20 +288,20 @@ static void PushRunlengthPacket(Image *image,const unsigned char *pixels,
         quantum;
 
       p=PushCharPixel(p,&quantum);
-      SetRedPixelComponent(pixel,ScaleCharToQuantum(quantum));
+      SetPixelRed(pixel,ScaleCharToQuantum(quantum));
       p=PushCharPixel(p,&quantum);
-      SetGreenPixelComponent(pixel,ScaleCharToQuantum(quantum));
+      SetPixelGreen(pixel,ScaleCharToQuantum(quantum));
       p=PushCharPixel(p,&quantum);
-      SetBluePixelComponent(pixel,ScaleCharToQuantum(quantum));
+      SetPixelBlue(pixel,ScaleCharToQuantum(quantum));
       if (image->matte != MagickFalse)
         {
           p=PushCharPixel(p,&quantum);
-          SetOpacityPixelComponent(pixel,ScaleCharToQuantum(quantum));
+          SetPixelOpacity(pixel,ScaleCharToQuantum(quantum));
         }
       if (image->colorspace == CMYKColorspace)
         {
           p=PushCharPixel(p,&quantum);
-          SetBlackPixelComponent(index,ScaleCharToQuantum(quantum));
+          SetPixelBlack(index,ScaleCharToQuantum(quantum));
         }
       break;
     }
@@ -311,24 +311,24 @@ static void PushRunlengthPacket(Image *image,const unsigned char *pixels,
         quantum;
 
       p=PushShortPixel(MSBEndian,p,&quantum);
-      SetRedPixelComponent(pixel,quantum >> (image->depth-
+      SetPixelRed(pixel,quantum >> (image->depth-
         MAGICKCORE_QUANTUM_DEPTH));
       p=PushShortPixel(MSBEndian,p,&quantum);
-      SetGreenPixelComponent(pixel,quantum >> (image->depth-
+      SetPixelGreen(pixel,quantum >> (image->depth-
         MAGICKCORE_QUANTUM_DEPTH));
       p=PushShortPixel(MSBEndian,p,&quantum);
-      SetBluePixelComponent(pixel,quantum >> (image->depth-
+      SetPixelBlue(pixel,quantum >> (image->depth-
         MAGICKCORE_QUANTUM_DEPTH));
       if (image->matte != MagickFalse)
         {
           p=PushShortPixel(MSBEndian,p,&quantum);
-          SetOpacityPixelComponent(pixel,quantum >> (image->depth-
+          SetPixelOpacity(pixel,quantum >> (image->depth-
             MAGICKCORE_QUANTUM_DEPTH));
         }
       if (image->colorspace == CMYKColorspace)
         {
           p=PushShortPixel(MSBEndian,p,&quantum);
-          SetBlackPixelComponent(index,quantum >> (image->depth-
+          SetPixelBlack(index,quantum >> (image->depth-
             MAGICKCORE_QUANTUM_DEPTH));
         }
       break;
@@ -339,24 +339,24 @@ static void PushRunlengthPacket(Image *image,const unsigned char *pixels,
         quantum;
 
       p=PushLongPixel(MSBEndian,p,&quantum);
-      SetRedPixelComponent(pixel,quantum >> (image->depth-
+      SetPixelRed(pixel,quantum >> (image->depth-
         MAGICKCORE_QUANTUM_DEPTH));
       p=PushLongPixel(MSBEndian,p,&quantum);
-      SetGreenPixelComponent(pixel,quantum >> (image->depth-
+      SetPixelGreen(pixel,quantum >> (image->depth-
         MAGICKCORE_QUANTUM_DEPTH));
       p=PushLongPixel(MSBEndian,p,&quantum);
-      SetBluePixelComponent(pixel,quantum >> (image->depth-
+      SetPixelBlue(pixel,quantum >> (image->depth-
         MAGICKCORE_QUANTUM_DEPTH));
       if (image->matte != MagickFalse)
         {
           p=PushLongPixel(MSBEndian,p,&quantum);
-          SetOpacityPixelComponent(pixel,quantum >> (image->depth-
+          SetPixelOpacity(pixel,quantum >> (image->depth-
             MAGICKCORE_QUANTUM_DEPTH));
         }
       if (image->colorspace == CMYKColorspace)
         {
           p=PushLongPixel(MSBEndian,p,&quantum);
-          SetIndexPixelComponent(index,quantum >> (image->depth-
+          SetPixelIndex(index,quantum >> (image->depth-
             MAGICKCORE_QUANTUM_DEPTH));
         }
       break;
@@ -1422,11 +1422,11 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
             length--;
             if ((image->storage_class == PseudoClass) ||
                 (image->colorspace == CMYKColorspace))
-              SetIndexPixelComponent(indexes+x,index);
-            SetRedPixelComponent(q,pixel.red);
-            SetGreenPixelComponent(q,pixel.green);
-            SetBluePixelComponent(q,pixel.blue);
-            SetOpacityPixelComponent(q,pixel.opacity);
+              SetPixelIndex(indexes+x,index);
+            SetPixelRed(q,pixel.red);
+            SetPixelGreen(q,pixel.green);
+            SetPixelBlue(q,pixel.blue);
+            SetPixelOpacity(q,pixel.opacity);
             q++;
           }
           break;
@@ -2420,9 +2420,9 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
             if ((length < 255) && (x < (ssize_t) (image->columns-1)) &&
                 (IsColorEqual(p,&pixel) != MagickFalse) &&
                 ((image->matte == MagickFalse) ||
-                 (GetOpacityPixelComponent(p) == pixel.opacity)) &&
+                 (GetPixelOpacity(p) == pixel.opacity)) &&
                 ((indexes == (IndexPacket *) NULL) ||
-                 (index == GetIndexPixelComponent(indexes+x))))
+                 (index == GetPixelIndex(indexes+x))))
               length++;
             else
               {
@@ -2432,7 +2432,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
               }
             pixel=(*p);
             if (indexes != (IndexPacket *) NULL)
-              index=GetIndexPixelComponent(indexes+x);
+              index=GetPixelIndex(indexes+x);
             p++;
           }
           q=PopRunlengthPacket(image,q,length,pixel,index);
index 5e79972753638b148080fa60235cd5ae5cb84c02..3af6cbee1a1505487686e34f5bf7349c9bb39af7 100644 (file)
@@ -167,9 +167,9 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
       if (bit == 0)
         byte=(size_t) ReadBlobByte(image);
       if (image_info->endian == LSBEndian)
-        SetIndexPixelComponent(indexes+x,((byte & 0x01) != 0) ? 0x00 : 0x01);
+        SetPixelIndex(indexes+x,((byte & 0x01) != 0) ? 0x00 : 0x01);
       else
-        SetIndexPixelComponent(indexes+x,((byte & 0x01) != 0) ? 0x01 : 0x00);
+        SetPixelIndex(indexes+x,((byte & 0x01) != 0) ? 0x01 : 0x00);
       bit++;
       if (bit == 8)
         bit=0;
index a8476cd92659c405251de554a6b172d85b8a3698..dcc31561857f3d1f852a1047c6731317ea912e93 100644 (file)
@@ -174,10 +174,10 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-        SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-        SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-        SetOpacityPixelComponent(q,OpaqueOpacity);
+        SetPixelRed(q,ScaleCharToQuantum(*p++));
+        SetPixelGreen(q,ScaleCharToQuantum(*p++));
+        SetPixelBlue(q,ScaleCharToQuantum(*p++));
+        SetPixelOpacity(q,OpaqueOpacity);
         q++;
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -378,9 +378,9 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image)
       q=pixels;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+        *q++=ScaleQuantumToChar(GetPixelRed(p));
+        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+        *q++=ScaleQuantumToChar(GetPixelBlue(p));
         p++;
       }
       (void) WriteBlob(image,(size_t) (q-pixels),pixels);
index 5739298f856aec9e29d9c1023882bd6f314065f2..dd24021349dfc116a97fb5211e7eca2f18171f77 100644 (file)
@@ -184,7 +184,7 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (byte == EOF)
             ThrowReaderException(CorruptImageError,"CorruptImage");
         }
-      SetIndexPixelComponent(indexes+x,(byte & (0x01 << (7-bit))) ?
+      SetPixelIndex(indexes+x,(byte & (0x01 << (7-bit))) ?
         0x00 : 0x01);
       bit++;
       if (bit == 8)
index e639db288705526dcf5c7b0863069789ec754c97..d5ace14e87306851f05698d4689740776e619238 100644 (file)
@@ -192,9 +192,9 @@ static int FindColor(PixelPacket *pixel)
     i;
 
   for (i=0; i < 256; i++)
-    if (ScaleQuantumToChar(GetRedPixelComponent(pixel)) == PalmPalette[i][0] &&
-        ScaleQuantumToChar(GetGreenPixelComponent(pixel)) == PalmPalette[i][1] &&
-        ScaleQuantumToChar(GetBluePixelComponent(pixel)) == PalmPalette[i][2])
+    if (ScaleQuantumToChar(GetPixelRed(pixel)) == PalmPalette[i][0] &&
+        ScaleQuantumToChar(GetPixelGreen(pixel)) == PalmPalette[i][1] &&
+        ScaleQuantumToChar(GetPixelBlue(pixel)) == PalmPalette[i][2])
       return(i);
   return(-1);
 }
@@ -475,13 +475,13 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
           {
             color16=(*ptr++ << 8);
             color16|=(*ptr++);
-            SetRedPixelComponent(q,(QuantumRange*((color16 >> 11) & 0x1f))/
+            SetPixelRed(q,(QuantumRange*((color16 >> 11) & 0x1f))/
               0x1f);
-            SetGreenPixelComponent(q,(QuantumRange*((color16 >> 5) & 0x3f))/
+            SetPixelGreen(q,(QuantumRange*((color16 >> 5) & 0x3f))/
               0x3f);
-            SetBluePixelComponent(q,(QuantumRange*((color16 >> 0) & 0x1f))/
+            SetPixelBlue(q,(QuantumRange*((color16 >> 0) & 0x1f))/
               0x1f);
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelOpacity(q,OpaqueOpacity);
             q++;
           }
         }
@@ -493,8 +493,8 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
             if ((size_t) (ptr-one_row) >= bytes_per_row)
               ThrowReaderException(CorruptImageError,"CorruptImage");
             index=(IndexPacket) (mask-(((*ptr) & (mask << bit)) >> bit));
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             if (bit)
               bit-=bits_per_pixel;
             else
@@ -829,8 +829,8 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
             p=GetAuthenticPixels(image,0,y,image->columns,1,&exception);
             indexes=GetAuthenticIndexQueue(image);
             for (x=0; x < (ssize_t) image->columns; x++)
-              SetIndexPixelComponent(indexes+x,FindColor(&image->colormap[
-                (ssize_t) GetIndexPixelComponent(indexes+x)]));
+              SetPixelIndex(indexes+x,FindColor(&image->colormap[
+                (ssize_t) GetPixelIndex(indexes+x)]));
           }
           affinity_image=DestroyImage(affinity_image);
         }
@@ -858,16 +858,16 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
         {
           for (x=0; x < (int) image->columns; x++)
           {
-            color16=(unsigned short) ((((31*(size_t) GetRedPixelComponent(p))/
+            color16=(unsigned short) ((((31*(size_t) GetPixelRed(p))/
               (size_t) QuantumRange) << 11) |
-              (((63*(size_t) GetGreenPixelComponent(p))/(size_t) QuantumRange) << 5) |
-              ((31*(size_t) GetBluePixelComponent(p))/(size_t) QuantumRange));
-            if (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity)
+              (((63*(size_t) GetPixelGreen(p))/(size_t) QuantumRange) << 5) |
+              ((31*(size_t) GetPixelBlue(p))/(size_t) QuantumRange));
+            if (GetPixelOpacity(p) == (Quantum) TransparentOpacity)
               {
-                transpix.red=GetRedPixelComponent(p);
-                transpix.green=GetGreenPixelComponent(p);
-                transpix.blue=GetBluePixelComponent(p);
-                transpix.opacity=GetOpacityPixelComponent(p);
+                transpix.red=GetPixelRed(p);
+                transpix.green=GetPixelGreen(p);
+                transpix.blue=GetPixelBlue(p);
+                transpix.opacity=GetPixelOpacity(p);
                 flags|=PALM_HAS_TRANSPARENCY_FLAG;
               }
             *ptr++=(unsigned char) ((color16 >> 8) & 0xff);
@@ -882,9 +882,9 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
           for (x=0; x < (int) image->columns; x++)
           {
             if (bits_per_pixel >= 8)
-              color=(unsigned char) GetIndexPixelComponent(indexes+x);
+              color=(unsigned char) GetPixelIndex(indexes+x);
             else
-              color=(unsigned char) (GetIndexPixelComponent(indexes+x)*
+              color=(unsigned char) (GetPixelIndex(indexes+x)*
                 ((one << bits_per_pixel)-1)/MagickMax(1*image->colors-1,1));
             byte|=color << bit;
             if (bit != 0)
index 80134106dd173217d1bea2ac447d7646a0e6c318..92853de524640bc7d53563e9390f03f87029440b 100644 (file)
@@ -671,9 +671,9 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum(*yy++));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(*c1++));
-            SetBluePixelComponent(q,ScaleCharToQuantum(*c2++));
+            SetPixelRed(q,ScaleCharToQuantum(*yy++));
+            SetPixelGreen(q,ScaleCharToQuantum(*c1++));
+            SetPixelBlue(q,ScaleCharToQuantum(*c2++));
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -779,9 +779,9 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ScaleCharToQuantum(*yy++));
-      SetGreenPixelComponent(q,ScaleCharToQuantum(*c1++));
-      SetBluePixelComponent(q,ScaleCharToQuantum(*c2++));
+      SetPixelRed(q,ScaleCharToQuantum(*yy++));
+      SetPixelGreen(q,ScaleCharToQuantum(*c1++));
+      SetPixelBlue(q,ScaleCharToQuantum(*c2++));
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1024,7 +1024,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
       break;
     for (x=0; x < (ssize_t) (tile_image->columns << 1); x++)
     {
-      (void) WriteBlobByte(image,ScaleQuantumToChar(GetRedPixelComponent(p)));
+      (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelRed(p)));
       p++;
     }
     q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
@@ -1033,7 +1033,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
       break;
     for (x=0; x < (ssize_t) downsample_image->columns; x++)
     {
-      (void) WriteBlobByte(image,ScaleQuantumToChar(GetGreenPixelComponent(q)));
+      (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelGreen(q)));
       q++;
     }
     q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
@@ -1042,7 +1042,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
       break;
     for (x=0; x < (ssize_t) downsample_image->columns; x++)
     {
-      (void) WriteBlobByte(image,ScaleQuantumToChar(GetBluePixelComponent(q)));
+      (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelBlue(q)));
       q++;
     }
     status=SetImageProgress(image,SaveImageTag,y,tile_image->rows);
index 0607523c3740f9b2198c9b8f0a03973b7706ed37..bbc51fefa24f4e1089f67de6a6472b38da2956ed 100644 (file)
@@ -876,7 +876,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image)
             Colormapped image.
           */
           for (x=0; x < (ssize_t) image->columns; x++)
-            *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+            *q++=(unsigned char) GetPixelIndex(indexes+x);
           break;
         }
         case 24:
@@ -887,9 +887,9 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image)
           */
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
             p++;
           }
           break;
index e1971880dec537be969d133d7c86e643fc8fba98..e18dbb6c46bb2248c765ca3e38128f06f092f559 100644 (file)
@@ -602,14 +602,14 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         if (image->storage_class == PseudoClass)
-          SetIndexPixelComponent(indexes+x,*r++);
+          SetPixelIndex(indexes+x,*r++);
         else
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum(*r++));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(*r++));
-            SetBluePixelComponent(q,ScaleCharToQuantum(*r++));
+            SetPixelRed(q,ScaleCharToQuantum(*r++));
+            SetPixelGreen(q,ScaleCharToQuantum(*r++));
+            SetPixelBlue(q,ScaleCharToQuantum(*r++));
             if (image->matte != MagickFalse)
-              SetAlphaPixelComponent(q,ScaleCharToQuantum(*r++));
+              SetPixelAlpha(q,ScaleCharToQuantum(*r++));
           }
         q++;
       }
@@ -1011,7 +1011,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
               {
                 for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
                 {
-                  *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+                  *q++=ScaleQuantumToChar(GetPixelRed(p));
                   p++;
                 }
                 break;
@@ -1020,7 +1020,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
               {
                 for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
                 {
-                  *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
+                  *q++=ScaleQuantumToChar(GetPixelGreen(p));
                   p++;
                 }
                 break;
@@ -1029,7 +1029,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
               {
                 for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
                 {
-                  *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+                  *q++=ScaleQuantumToChar(GetPixelBlue(p));
                   p++;
                 }
                 break;
@@ -1040,7 +1040,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
                 for (x=(ssize_t) pcx_info.bytes_per_line; x != 0; x--)
                 {
                   *q++=ScaleQuantumToChar((Quantum)
-                    (GetAlphaPixelComponent(p)));
+                    (GetPixelAlpha(p)));
                   p++;
                 }
                 break;
@@ -1069,7 +1069,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
             indexes=GetVirtualIndexQueue(image);
             q=pcx_pixels;
             for (x=0; x < (ssize_t) image->columns; x++)
-              *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+              *q++=(unsigned char) GetPixelIndex(indexes+x);
             if (PCXWritePixels(&pcx_info,pcx_pixels,image) == MagickFalse)
               break;
             if (image->previous == (Image *) NULL)
@@ -1111,7 +1111,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 byte<<=1;
-                if (GetIndexPixelComponent(indexes+x) == polarity)
+                if (GetPixelIndex(indexes+x) == polarity)
                   byte|=0x01;
                 bit++;
                 if (bit == 8)
index c3bea820d97743454d5041c6a98cc955dd2e5102..90e8926159ba48b34cd6b23de28ee8f5a1c70179 100644 (file)
@@ -443,7 +443,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (bit=0; bit < 8; bit++)
           {
             index=(IndexPacket) (*p & (0x80 >> bit) ? 0x00 : 0x01);
-            SetIndexPixelComponent(indexes+x+bit,index);
+            SetPixelIndex(indexes+x+bit,index);
           }
           p++;
         }
@@ -471,13 +471,13 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x+=4)
         {
           index=ConstrainColormapIndex(image,3UL-((*p >> 6) & 0x03));
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
           index=ConstrainColormapIndex(image,3UL-((*p >> 4) & 0x03));
-          SetIndexPixelComponent(indexes+x+1,index);
+          SetPixelIndex(indexes+x+1,index);
           index=ConstrainColormapIndex(image,3UL-((*p >> 2) & 0x03));
-          SetIndexPixelComponent(indexes+x+2,index);
+          SetPixelIndex(indexes+x+2,index);
           index=ConstrainColormapIndex(image,3UL-((*p) & 0x03));
-          SetIndexPixelComponent(indexes+x+3,index);
+          SetPixelIndex(indexes+x+3,index);
           p++;
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -504,9 +504,9 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x+=2)
         {
           index=ConstrainColormapIndex(image,15UL-((*p >> 4) & 0x0f));
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
           index=ConstrainColormapIndex(image,15UL-((*p) & 0x0f));
-          SetIndexPixelComponent(indexes+x+1,index);
+          SetPixelIndex(indexes+x+1,index);
           p++;
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 1326f4da7e44b1e6f52b243e8e6467f756e0c6e2..7c543ec272a4950736375590ff3577af0c464c49 100644 (file)
@@ -1708,11 +1708,11 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               indexes=GetVirtualIndexQueue(image);
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-                *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-                *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+                *q++=ScaleQuantumToChar(GetPixelRed(p));
+                *q++=ScaleQuantumToChar(GetPixelGreen(p));
+                *q++=ScaleQuantumToChar(GetPixelBlue(p));
                 if (image->colorspace == CMYKColorspace)
-                  *q++=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+                  *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
                 p++;
               }
               if (image->previous == (Image *) NULL)
@@ -1755,14 +1755,14 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 Ascii85Encode(image,ScaleQuantumToChar(
-                  GetRedPixelComponent(p)));
+                  GetPixelRed(p)));
                 Ascii85Encode(image,ScaleQuantumToChar(
-                  GetGreenPixelComponent(p)));
+                  GetPixelGreen(p)));
                 Ascii85Encode(image,ScaleQuantumToChar(
-                  GetBluePixelComponent(p)));
+                  GetPixelBlue(p)));
                 if (image->colorspace == CMYKColorspace)
                   Ascii85Encode(image,ScaleQuantumToChar(
-                    GetIndexPixelComponent(indexes+x)));
+                    GetPixelIndex(indexes+x)));
                 p++;
               }
               if (image->previous == (Image *) NULL)
@@ -1808,7 +1808,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                   break;
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
-                  *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+                  *q++=(unsigned char) GetPixelIndex(indexes+x);
                 if (image->previous == (Image *) NULL)
                   {
                     status=SetImageProgress(image,SaveImageTag,
@@ -1849,7 +1849,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
                   Ascii85Encode(image,(unsigned char)
-                    GetIndexPixelComponent(indexes+x));
+                    GetPixelIndex(indexes+x));
                 if (image->previous == (Image *) NULL)
                   {
                     status=SetImageProgress(image,SaveImageTag,
@@ -2151,11 +2151,11 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               indexes=GetVirtualIndexQueue(tile_image);
               for (x=0; x < (ssize_t) tile_image->columns; x++)
               {
-                *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-                *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-                *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+                *q++=ScaleQuantumToChar(GetPixelRed(p));
+                *q++=ScaleQuantumToChar(GetPixelGreen(p));
+                *q++=ScaleQuantumToChar(GetPixelBlue(p));
                 if (image->colorspace == CMYKColorspace)
-                  *q++=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+                  *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
                 p++;
               }
             }
@@ -2192,14 +2192,14 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) tile_image->columns; x++)
               {
                 Ascii85Encode(image,ScaleQuantumToChar(
-                  GetRedPixelComponent(p)));
+                  GetPixelRed(p)));
                 Ascii85Encode(image,ScaleQuantumToChar(
-                  GetGreenPixelComponent(p)));
+                  GetPixelGreen(p)));
                 Ascii85Encode(image,ScaleQuantumToChar(
-                  GetBluePixelComponent(p)));
+                  GetPixelBlue(p)));
                 if (image->colorspace == CMYKColorspace)
                   Ascii85Encode(image,ScaleQuantumToChar(
-                    GetIndexPixelComponent(indexes+x)));
+                    GetPixelIndex(indexes+x)));
                 p++;
               }
             }
@@ -2241,7 +2241,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                   break;
                 indexes=GetVirtualIndexQueue(tile_image);
                 for (x=0; x < (ssize_t) tile_image->columns; x++)
-                  *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+                  *q++=(unsigned char) GetPixelIndex(indexes+x);
               }
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
               if (compression == ZipCompression)
@@ -2275,7 +2275,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 indexes=GetVirtualIndexQueue(tile_image);
                 for (x=0; x < (ssize_t) tile_image->columns; x++)
                   Ascii85Encode(image,(unsigned char)
-                    GetIndexPixelComponent(indexes+x));
+                    GetPixelIndex(indexes+x));
               }
               Ascii85Flush(image);
               break;
@@ -2440,7 +2440,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+                *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
                 p++;
               }
             }
@@ -2475,7 +2475,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 Ascii85Encode(image,ScaleQuantumToChar((Quantum) (QuantumRange-
-                  GetOpacityPixelComponent(p))));
+                  GetPixelOpacity(p))));
                 p++;
               }
             }
index 9b857cd1c5046e12511e810c0ca9dd69fe8289f5..f113fcd4028a8d9408465b91761fd63a22314720 100644 (file)
@@ -1174,12 +1174,12 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                 if (tile_image->storage_class == PseudoClass)
                   {
                     index=ConstrainColormapIndex(tile_image,*p);
-                    SetIndexPixelComponent(indexes+x,index);
-                    SetRedPixelComponent(q,
+                    SetPixelIndex(indexes+x,index);
+                    SetPixelRed(q,
                       tile_image->colormap[(ssize_t) index].red);
-                    SetGreenPixelComponent(q,
+                    SetPixelGreen(q,
                       tile_image->colormap[(ssize_t) index].green);
-                    SetBluePixelComponent(q,
+                    SetPixelBlue(q,
                       tile_image->colormap[(ssize_t) index].blue);
                   }
                 else
@@ -1188,12 +1188,12 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                       {
                         i=(*p++);
                         j=(*p);
-                        SetRedPixelComponent(q,ScaleCharToQuantum(
+                        SetPixelRed(q,ScaleCharToQuantum(
                           (unsigned char) ((i & 0x7c) << 1)));
-                        SetGreenPixelComponent(q,ScaleCharToQuantum(
+                        SetPixelGreen(q,ScaleCharToQuantum(
                           (unsigned char) (((i & 0x03) << 6) |
                           ((j & 0xe0) >> 2))));
-                        SetBluePixelComponent(q,ScaleCharToQuantum(
+                        SetPixelBlue(q,ScaleCharToQuantum(
                           (unsigned char) ((j & 0x1f) << 3)));
                       }
                     else
@@ -1202,10 +1202,10 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                           if (p > (pixels+extent+2*image->columns))
                             ThrowReaderException(CorruptImageError,
                               "NotEnoughPixelData");
-                          SetRedPixelComponent(q,ScaleCharToQuantum(*p));
-                          SetGreenPixelComponent(q,ScaleCharToQuantum(
+                          SetPixelRed(q,ScaleCharToQuantum(*p));
+                          SetPixelGreen(q,ScaleCharToQuantum(
                             *(p+tile_image->columns)));
-                          SetBluePixelComponent(q,ScaleCharToQuantum(
+                          SetPixelBlue(q,ScaleCharToQuantum(
                             *(p+2*tile_image->columns)));
                         }
                       else
@@ -1213,12 +1213,12 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                           if (p > (pixels+extent+3*image->columns))
                             ThrowReaderException(CorruptImageError,
                               "NotEnoughPixelData");
-                          SetAlphaPixelComponent(q,ScaleCharToQuantum(*p));
-                          SetRedPixelComponent(q,ScaleCharToQuantum(
+                          SetPixelAlpha(q,ScaleCharToQuantum(*p));
+                          SetPixelRed(q,ScaleCharToQuantum(
                             *(p+tile_image->columns)));
-                          SetGreenPixelComponent(q,ScaleCharToQuantum(
+                          SetPixelGreen(q,ScaleCharToQuantum(
                             *(p+2*tile_image->columns)));
-                          SetBluePixelComponent(q,ScaleCharToQuantum(
+                          SetPixelBlue(q,ScaleCharToQuantum(
                             *(p+3*tile_image->columns)));
                         }
                   }
@@ -1885,7 +1885,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
         break;
       indexes=GetVirtualIndexQueue(image);
       for (x=0; x < (ssize_t) image->columns; x++)
-        scanline[x]=(unsigned char) GetIndexPixelComponent(indexes+x);
+        scanline[x]=(unsigned char) GetPixelIndex(indexes+x);
       count+=EncodeImage(image,scanline,(size_t) (row_bytes & 0x7FFF),
         packed_scanline);
       if (image->previous == (Image *) NULL)
@@ -1933,12 +1933,12 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
             }
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *red++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *green++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *blue++=ScaleQuantumToChar(GetBluePixelComponent(p));
+            *red++=ScaleQuantumToChar(GetPixelRed(p));
+            *green++=ScaleQuantumToChar(GetPixelGreen(p));
+            *blue++=ScaleQuantumToChar(GetPixelBlue(p));
             if (image->matte != MagickFalse)
               *opacity++=ScaleQuantumToChar((Quantum)
-                (GetAlphaPixelComponent(p)));
+                (GetPixelAlpha(p)));
             p++;
           }
           count+=EncodeImage(image,scanline,bytes_per_line & 0x7FFF,
index f0f849146b4474be57bf2aa2f2250494b778ad73..2a76caa32232f493039d06eb0385bc3a58d5e2dd 100644 (file)
@@ -189,10 +189,10 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception)
               }
           }
         if (image->storage_class == PseudoClass)
-          SetIndexPixelComponent(indexes+x,index);
-        SetBluePixelComponent(q,blue);
-        SetGreenPixelComponent(q,green);
-        SetRedPixelComponent(q,red);
+          SetPixelIndex(indexes+x,index);
+        SetPixelBlue(q,blue);
+        SetPixelGreen(q,green);
+        SetPixelRed(q,red);
         length--;
         q++;
       }
index afecebd21271a6fdb0db715efd6bead1d364b66c..6f69a938bbcf3c565e5847ddef5b61f0fd0b11c1 100644 (file)
@@ -114,11 +114,11 @@ static inline void PlasmaPixel(Image *image,RandomInfo *random_info,double x,
   if (q == (PixelPacket *) NULL)
     return;
   range=GetQuantumRange(16UL);
-  SetRedPixelComponent(q,ScaleAnyToQuantum((size_t) (65535.0*
+  SetPixelRed(q,ScaleAnyToQuantum((size_t) (65535.0*
     GetPseudoRandomValue(random_info)+0.5),range));
-  SetGreenPixelComponent(q,ScaleAnyToQuantum((size_t) (65535.0*
+  SetPixelGreen(q,ScaleAnyToQuantum((size_t) (65535.0*
     GetPseudoRandomValue(random_info)+0.5),range));
-  SetBluePixelComponent(q,ScaleAnyToQuantum((size_t) (65535.0*
+  SetPixelBlue(q,ScaleAnyToQuantum((size_t) (65535.0*
     GetPseudoRandomValue(random_info)+0.5),range));
   (void) SyncAuthenticPixels(image,exception);
 }
@@ -173,7 +173,7 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetOpacityPixelComponent(q,QuantumRange/2);
+      SetPixelOpacity(q,QuantumRange/2);
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index b64b632b6fb349c788a2dd088459288d705e59a3..9def5aa8fb5ef10e176331da084fde73164f9a24 100644 (file)
         LBR01OpacityPixelPacketComponent((pixelpacket)); \
         }
 
-#define LBR01RedPixelComponent(pixel) \
-        (ScaleQuantumToChar(GetRedPixelComponent((pixel))) < 0x10 ? \
+#define LBR01PixelRed(pixel) \
+        (ScaleQuantumToChar(GetPixelRed((pixel))) < 0x10 ? \
         0 : QuantumRange);
 
-#define LBR01GreenPixelComponent(pixel) \
-        (ScaleQuantumToChar(GetGreenPixelComponent((pixel))) < 0x10 ? \
+#define LBR01PixelGreen(pixel) \
+        (ScaleQuantumToChar(GetPixelGreen((pixel))) < 0x10 ? \
         0 : QuantumRange);
 
-#define LBR01BluePixelComponent(pixel) \
-        (ScaleQuantumToChar(GetBluePixelComponent((pixel))) < 0x10 ? \
+#define LBR01PixelBlue(pixel) \
+        (ScaleQuantumToChar(GetPixelBlue((pixel))) < 0x10 ? \
         0 : QuantumRange);
 
-#define LBR01OpacityPixelComponent(pixel) \
-        (ScaleQuantumToChar(GetOpacityPixelComponent((pixel))) < 0x10 ? \
+#define LBR01PixelOpacity(pixel) \
+        (ScaleQuantumToChar(GetPixelOpacity((pixel))) < 0x10 ? \
         0 : QuantumRange);
 
-#define LBR01RGBPixelComponent(pixel) \
+#define LBR01PixelRGB(pixel) \
         { \
-        LBR01RedPixelComponent((pixel)); \
-        LBR01GreenPixelComponent((pixel)); \
-        LBR01BluePixelComponent((pixel)); \
+        LBR01PixelRed((pixel)); \
+        LBR01PixelGreen((pixel)); \
+        LBR01PixelBlue((pixel)); \
         }
 
-#define LBR01RGBOPixelComponent(pixel) \
+#define LBR01PixelRGBO(pixel) \
         { \
-        LBR01RGBPixelComponent((pixel)); \
-        LBR01OpacityPixelComponent((pixel)); \
+        LBR01PixelRGB((pixel)); \
+        LBR01PixelOpacity((pixel)); \
         }
 
 /* LBR02: Replicate top 2 bits */
         LBR02OpacityPixelPacketComponent((pixelpacket)); \
         }
 
-#define LBR02RedPixelComponent(pixel) \
+#define LBR02PixelRed(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetRedPixelComponent((pixel))) \
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
        & 0xc0; \
-     SetRedPixelComponent((pixel), ScaleCharToQuantum( \
+     SetPixelRed((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
    }
-#define LBR02GreenPixelComponent(pixel) \
+#define LBR02PixelGreen(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetGreenPixelComponent((pixel)))\
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
        & 0xc0; \
-     SetGreenPixelComponent((pixel), ScaleCharToQuantum( \
+     SetPixelGreen((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
    }
-#define LBR02BluePixelComponent(pixel) \
+#define LBR02PixelBlue(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetBluePixelComponent((pixel))) & 0xc0; \
-     SetBluePixelComponent((pixel), ScaleCharToQuantum( \
+       ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xc0; \
+     SetPixelBlue((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
    }
-#define LBR02OpacityPixelComponent(pixel) \
+#define LBR02PixelOpacity(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetOpacityPixelComponent((pixel))) & 0xc0; \
-     SetOpacityPixelComponent((pixel), ScaleCharToQuantum( \
+       ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xc0; \
+     SetPixelOpacity((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
    }
 
-#define LBR02RGBPixelComponent(pixel) \
+#define LBR02PixelRGB(pixel) \
         { \
-        LBR02RedPixelComponent((pixel)); \
-        LBR02GreenPixelComponent((pixel)); \
-        LBR02BluePixelComponent((pixel)); \
+        LBR02PixelRed((pixel)); \
+        LBR02PixelGreen((pixel)); \
+        LBR02PixelBlue((pixel)); \
         }
 
-#define LBR02RGBOPixelComponent(pixel) \
+#define LBR02PixelRGBO(pixel) \
         { \
-        LBR02RGBPixelComponent((pixel)); \
-        LBR02OpacityPixelComponent((pixel)); \
+        LBR02PixelRGB((pixel)); \
+        LBR02PixelOpacity((pixel)); \
         }
 
 /* LBR03: Replicate top 3 bits (only used with opaque pixels during
         LBR03BluePixelPacketComponent((pixelpacket)); \
         }
 
-#define LBR03RedPixelComponent(pixel) \
+#define LBR03PixelRed(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetRedPixelComponent((pixel))) \
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
        & 0xe0; \
-     SetRedPixelComponent((pixel), ScaleCharToQuantum( \
+     SetPixelRed((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
    }
-#define LBR03GreenPixelComponent(pixel) \
+#define LBR03PixelGreen(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetGreenPixelComponent((pixel)))\
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
        & 0xe0; \
-     SetGreenPixelComponent((pixel), ScaleCharToQuantum( \
+     SetPixelGreen((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
    }
-#define LBR03BluePixelComponent(pixel) \
+#define LBR03PixelBlue(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetBluePixelComponent((pixel))) \
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue((pixel))) \
        & 0xe0; \
-     SetBluePixelComponent((pixel), ScaleCharToQuantum( \
+     SetPixelBlue((pixel), ScaleCharToQuantum( \
        (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
    }
 
-#define LBR03RGBPixelComponent(pixel) \
+#define LBR03PixelRGB(pixel) \
         { \
-        LBR03RedPixelComponent((pixel)); \
-        LBR03GreenPixelComponent((pixel)); \
-        LBR03BluePixelComponent((pixel)); \
+        LBR03PixelRed((pixel)); \
+        LBR03PixelGreen((pixel)); \
+        LBR03PixelBlue((pixel)); \
         }
 
 /* LBR04: Replicate top 4 bits */
         LBR04OpacityPixelPacketComponent((pixelpacket)); \
         }
 
-#define LBR04RedPixelComponent(pixel) \
+#define LBR04PixelRed(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetRedPixelComponent((pixel))) \
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
        & 0xf0; \
-     SetRedPixelComponent((pixel),\
+     SetPixelRed((pixel),\
        ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
    }
-#define LBR04GreenPixelComponent(pixel) \
+#define LBR04PixelGreen(pixel) \
    { \
-     unsigned char lbr_bits=ScaleQuantumToChar(GetGreenPixelComponent((pixel)))\
+     unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
        & 0xf0; \
-     SetGreenPixelComponent((pixel),\
+     SetPixelGreen((pixel),\
        ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
    }
-#define LBR04BluePixelComponent(pixel) \
+#define LBR04PixelBlue(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetBluePixelComponent((pixel))) & 0xf0; \
-     SetBluePixelComponent((pixel),\
+       ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xf0; \
+     SetPixelBlue((pixel),\
        ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
    }
-#define LBR04OpacityPixelComponent(pixel) \
+#define LBR04PixelOpacity(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetOpacityPixelComponent((pixel))) & 0xf0; \
-     SetOpacityPixelComponent((pixel),\
+       ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xf0; \
+     SetPixelOpacity((pixel),\
        ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
    }
 
-#define LBR04RGBPixelComponent(pixel) \
+#define LBR04PixelRGB(pixel) \
         { \
-        LBR04RedPixelComponent((pixel)); \
-        LBR04GreenPixelComponent((pixel)); \
-        LBR04BluePixelComponent((pixel)); \
+        LBR04PixelRed((pixel)); \
+        LBR04PixelGreen((pixel)); \
+        LBR04PixelBlue((pixel)); \
         }
 
-#define LBR04RGBOPixelComponent(pixel) \
+#define LBR04PixelRGBO(pixel) \
         { \
-        LBR04RGBPixelComponent((pixel)); \
-        LBR04OpacityPixelComponent((pixel)); \
+        LBR04PixelRGB((pixel)); \
+        LBR04PixelOpacity((pixel)); \
         }
 
 
         LBR08OpacityPixelPacketComponent((pixelpacket)); \
         }
 
-#define LBR08RedPixelComponent(pixel) \
+#define LBR08PixelRed(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetRedPixelComponent((pixel))); \
-     SetRedPixelComponent((pixel),\
+       ScaleQuantumToChar(GetPixelRed((pixel))); \
+     SetPixelRed((pixel),\
        ScaleCharToQuantum((lbr_bits))); \
    }
-#define LBR08GreenPixelComponent(pixel) \
+#define LBR08PixelGreen(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetGreenPixelComponent((pixel))); \
-     SetGreenPixelComponent((pixel),\
+       ScaleQuantumToChar(GetPixelGreen((pixel))); \
+     SetPixelGreen((pixel),\
        ScaleCharToQuantum((lbr_bits))); \
    }
-#define LBR08BluePixelComponent(pixel) \
+#define LBR08PixelBlue(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetBluePixelComponent((pixel))); \
-     SetBluePixelComponent((pixel),\
+       ScaleQuantumToChar(GetPixelBlue((pixel))); \
+     SetPixelBlue((pixel),\
        ScaleCharToQuantum((lbr_bits))); \
    }
-#define LBR08OpacityPixelComponent(pixel) \
+#define LBR08PixelOpacity(pixel) \
    { \
      unsigned char lbr_bits= \
-       ScaleQuantumToChar(GetOpacityPixelComponent((pixel))); \
-     SetOpacityPixelComponent((pixel),\
+       ScaleQuantumToChar(GetPixelOpacity((pixel))); \
+     SetPixelOpacity((pixel),\
        ScaleCharToQuantum((lbr_bits))); \
    }
 
-#define LBR08RGBPixelComponent(pixel) \
+#define LBR08PixelRGB(pixel) \
         { \
-        LBR08RedPixelComponent((pixel)); \
-        LBR08GreenPixelComponent((pixel)); \
-        LBR08BluePixelComponent((pixel)); \
+        LBR08PixelRed((pixel)); \
+        LBR08PixelGreen((pixel)); \
+        LBR08PixelBlue((pixel)); \
         }
 
-#define LBR08RGBOPixelComponent(pixel) \
+#define LBR08PixelRGBO(pixel) \
         { \
-        LBR08RGBPixelComponent((pixel)); \
-        LBR08OpacityPixelComponent((pixel)); \
+        LBR08PixelRGB((pixel)); \
+        LBR08PixelOpacity((pixel)); \
         }
 
 
         LBR16OpacityPixelPacketComponent((pixelpacket)); \
         }
 
-#define LBR16RedPixelComponent(pixel) \
+#define LBR16PixelRed(pixel) \
    { \
      unsigned short lbr_bits= \
-       ScaleQuantumToShort(GetRedPixelComponent((pixel))); \
-     SetRedPixelComponent((pixel),\
+       ScaleQuantumToShort(GetPixelRed((pixel))); \
+     SetPixelRed((pixel),\
        ScaleShortToQuantum((lbr_bits))); \
    }
-#define LBR16GreenPixelComponent(pixel) \
+#define LBR16PixelGreen(pixel) \
    { \
      unsigned short lbr_bits= \
-       ScaleQuantumToShort(GetGreenPixelComponent((pixel))); \
-     SetGreenPixelComponent((pixel),\
+       ScaleQuantumToShort(GetPixelGreen((pixel))); \
+     SetPixelGreen((pixel),\
        ScaleShortToQuantum((lbr_bits))); \
    }
-#define LBR16BluePixelComponent(pixel) \
+#define LBR16PixelBlue(pixel) \
    { \
      unsigned short lbr_bits= \
-       ScaleQuantumToShort(GetBluePixelComponent((pixel))); \
-     SetBluePixelComponent((pixel),\
+       ScaleQuantumToShort(GetPixelBlue((pixel))); \
+     SetPixelBlue((pixel),\
        ScaleShortToQuantum((lbr_bits))); \
    }
-#define LBR16OpacityPixelComponent(pixel) \
+#define LBR16PixelOpacity(pixel) \
    { \
      unsigned short lbr_bits= \
-       ScaleQuantumToShort(GetOpacityPixelComponent((pixel))); \
-     SetOpacityPixelComponent((pixel),\
+       ScaleQuantumToShort(GetPixelOpacity((pixel))); \
+     SetPixelOpacity((pixel),\
        ScaleShortToQuantum((lbr_bits))); \
    }
 
-#define LBR16RGBPixelComponent(pixel) \
+#define LBR16PixelRGB(pixel) \
         { \
-        LBR16RedPixelComponent((pixel)); \
-        LBR16GreenPixelComponent((pixel)); \
-        LBR16BluePixelComponent((pixel)); \
+        LBR16PixelRed((pixel)); \
+        LBR16PixelGreen((pixel)); \
+        LBR16PixelBlue((pixel)); \
         }
 
-#define LBR16RGBOPixelComponent(pixel) \
+#define LBR16PixelRGBO(pixel) \
         { \
-        LBR16RGBPixelComponent((pixel)); \
-        LBR16OpacityPixelComponent((pixel)); \
+        LBR16PixelRGB((pixel)); \
+        LBR16PixelOpacity((pixel)); \
         }
 
 /*
@@ -1010,9 +1010,9 @@ LosslessReduceDepthOK(Image *image)
               for (x=(ssize_t) image->columns-1; x >= 0; x--)
               {
                 ok_to_reduce=
-                   QuantumToCharToQuantumEqQuantum(GetRedPixelComponent(p)) &&
-                   QuantumToCharToQuantumEqQuantum(GetGreenPixelComponent(p)) &&
-                   QuantumToCharToQuantumEqQuantum(GetBluePixelComponent(p)) ?
+                   QuantumToCharToQuantumEqQuantum(GetPixelRed(p)) &&
+                   QuantumToCharToQuantumEqQuantum(GetPixelGreen(p)) &&
+                   QuantumToCharToQuantumEqQuantum(GetPixelBlue(p)) ?
                    MagickTrue : MagickFalse;
 
                 if (ok_to_reduce == MagickFalse)
@@ -2914,7 +2914,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
               {
                 if ((ping_color_type == PNG_COLOR_TYPE_RGBA ||
                     ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) &&
-                   (GetOpacityPixelComponent(q) != OpaqueOpacity))
+                   (GetPixelOpacity(q) != OpaqueOpacity))
                   {
                     if (logging != MagickFalse)
                       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -2925,11 +2925,11 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                   }
                 if ((ping_color_type == PNG_COLOR_TYPE_RGB ||
                     ping_color_type == PNG_COLOR_TYPE_GRAY) &&
-                    (ScaleQuantumToShort(GetRedPixelComponent(q))
+                    (ScaleQuantumToShort(GetPixelRed(q))
                     == transparent_color.red &&
-                    ScaleQuantumToShort(GetGreenPixelComponent(q))
+                    ScaleQuantumToShort(GetPixelGreen(q))
                     == transparent_color.green &&
-                    ScaleQuantumToShort(GetBluePixelComponent(q))
+                    ScaleQuantumToShort(GetPixelBlue(q))
                     == transparent_color.blue))
                   {
                     if (logging != MagickFalse)
@@ -3070,9 +3070,9 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                  * In a PNG datastream, Opaque is QuantumRange
                  * and Transparent is 0.
                  */
-                SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                   *p++));
-                if (GetOpacityPixelComponent(q) != OpaqueOpacity)
+                if (GetPixelOpacity(q) != OpaqueOpacity)
                   found_transparent_pixel = MagickTrue;
                 q++;
               }
@@ -3107,8 +3107,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                 {
                   quantum=((*p++) << 8);
                   quantum|=(*p++);
-                  SetAlphaPixelComponent(q,quantum);
-                  if (GetOpacityPixelComponent(q) != OpaqueOpacity)
+                  SetPixelAlpha(q,quantum);
+                  if (GetPixelOpacity(q) != OpaqueOpacity)
                     found_transparent_pixel = MagickTrue;
                   q++;
                 }
@@ -3132,9 +3132,9 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                 {
                   quantum=(*p << 8) | *(p+1);
                   quantum*=65537L;
-                  SetOpacityPixelComponent(q,
-                    (Quantum) GetAlphaPixelComponent(q));
-                  if (GetOpacityPixelComponent(q) != OpaqueOpacity)
+                  SetPixelOpacity(q,
+                    (Quantum) GetPixelAlpha(q));
+                  if (GetPixelOpacity(q) != OpaqueOpacity)
                     found_transparent_pixel = MagickTrue;
                   p+=2;
                   q++;
@@ -3146,8 +3146,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 
               if (ping_color_type == 4)
                 {
-                  SetAlphaPixelComponent(q,*p++);
-                  if (GetOpacityPixelComponent(q) != OpaqueOpacity)
+                  SetPixelAlpha(q,*p++);
+                  if (GetPixelOpacity(q) != OpaqueOpacity)
                     found_transparent_pixel = MagickTrue;
                   p++;
                   q++;
@@ -3169,7 +3169,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
         r=quantum_scanline;
 
         for (x=0; x < (ssize_t) image->columns; x++)
-          SetIndexPixelComponent(indexes+x,*r++);
+          SetPixelIndex(indexes+x,*r++);
 
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -3302,20 +3302,20 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
              */
             for (x=(ssize_t) image->columns-1; x >= 0; x--)
             {
-              if (ScaleQuantumToShort(GetRedPixelComponent(q))
+              if (ScaleQuantumToShort(GetPixelRed(q))
                   == transparent_color.red &&
-                  ScaleQuantumToShort(GetGreenPixelComponent(q))
+                  ScaleQuantumToShort(GetPixelGreen(q))
                   == transparent_color.green &&
-                  ScaleQuantumToShort(GetBluePixelComponent(q))
+                  ScaleQuantumToShort(GetPixelBlue(q))
                   == transparent_color.blue)
                 {
-                  SetOpacityPixelComponent(q,TransparentOpacity);
+                  SetPixelOpacity(q,TransparentOpacity);
                 }
 
 #if 0 /* I have not found a case where this is needed. */
               else
                 {
-                  SetOpacityPixelComponent(q)=(Quantum) OpaqueOpacity;
+                  SetPixelOpacity(q)=(Quantum) OpaqueOpacity;
                 }
 #endif
 
@@ -4377,14 +4377,14 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
 
              if (image->matte != MagickFalse)
                for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
-                  SetOpacityPixelComponent(q,(Quantum) QuantumRange-
-                      GetRedPixelComponent(s));
+                  SetPixelOpacity(q,(Quantum) QuantumRange-
+                      GetPixelRed(s));
 
              else
                for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
                {
-                  SetAlphaPixelComponent(q,GetRedPixelComponent(s));
-                  if (GetOpacityPixelComponent(q) != OpaqueOpacity)
+                  SetPixelAlpha(q,GetPixelRed(s));
+                  if (GetPixelOpacity(q) != OpaqueOpacity)
                     image->matte=MagickTrue;
                }
 
@@ -6207,14 +6207,14 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
                        for (x=(ssize_t) image->columns-1; x >= 0; x--)
                        {
-                          SetRedPixelComponent(q,ScaleQuantumToShort(
-                            GetRedPixelComponent(q)));
-                          SetGreenPixelComponent(q,ScaleQuantumToShort(
-                            GetGreenPixelComponent(q)));
-                          SetBluePixelComponent(q,ScaleQuantumToShort(
-                            GetBluePixelComponent(q)));
-                          SetOpacityPixelComponent(q,ScaleQuantumToShort(
-                            GetOpacityPixelComponent(q)));
+                          SetPixelRed(q,ScaleQuantumToShort(
+                            GetPixelRed(q)));
+                          SetPixelGreen(q,ScaleQuantumToShort(
+                            GetPixelGreen(q)));
+                          SetPixelBlue(q,ScaleQuantumToShort(
+                            GetPixelBlue(q)));
+                          SetPixelOpacity(q,ScaleQuantumToShort(
+                            GetPixelOpacity(q)));
                           q++;
                        }
 
@@ -6322,55 +6322,55 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                       if (magn_methy <= 1)
                         {
                           /* replicate previous */
-                          SetRGBOPixelComponents(q,(pixels));
+                          SetPixelRGBO(q,(pixels));
                         }
 
                       else if (magn_methy == 2 || magn_methy == 4)
                         {
                           if (i == 0)
                             {
-                              SetRGBOPixelComponents(q,(pixels));
+                              SetPixelRGBO(q,(pixels));
                             }
 
                           else
                             {
                               /* Interpolate */
-                              SetRedPixelComponent(q,
+                              SetPixelRed(q,
                                  ((QM) (((ssize_t)
-                                 (2*i*(GetRedPixelComponent(n)
-                                 -GetRedPixelComponent(pixels)+m))/
+                                 (2*i*(GetPixelRed(n)
+                                 -GetPixelRed(pixels)+m))/
                                  ((ssize_t) (m*2))
-                                 +GetRedPixelComponent(pixels)))));
-                              SetGreenPixelComponent(q,
+                                 +GetPixelRed(pixels)))));
+                              SetPixelGreen(q,
                                  ((QM) (((ssize_t)
-                                 (2*i*(GetGreenPixelComponent(n)
-                                 -GetGreenPixelComponent(pixels)+m))/
+                                 (2*i*(GetPixelGreen(n)
+                                 -GetPixelGreen(pixels)+m))/
                                  ((ssize_t) (m*2))
-                                 +GetGreenPixelComponent(pixels)))));
-                              SetBluePixelComponent(q,
+                                 +GetPixelGreen(pixels)))));
+                              SetPixelBlue(q,
                                  ((QM) (((ssize_t)
-                                 (2*i*(GetBluePixelComponent(n)
-                                 -GetBluePixelComponent(pixels)+m))/
+                                 (2*i*(GetPixelBlue(n)
+                                 -GetPixelBlue(pixels)+m))/
                                  ((ssize_t) (m*2))
-                                 +GetBluePixelComponent(pixels)))));
+                                 +GetPixelBlue(pixels)))));
 
                               if (image->matte != MagickFalse)
-                                 SetOpacityPixelComponent(q,
+                                 SetPixelOpacity(q,
                                     ((QM) (((ssize_t)
-                                    (2*i*(GetOpacityPixelComponent(n)
-                                    -GetOpacityPixelComponent(pixels)+m))
+                                    (2*i*(GetPixelOpacity(n)
+                                    -GetPixelOpacity(pixels)+m))
                                     /((ssize_t) (m*2))+
-                                   GetOpacityPixelComponent(pixels)))));
+                                   GetPixelOpacity(pixels)))));
                             }
 
                           if (magn_methy == 4)
                             {
                               /* Replicate nearest */
                               if (i <= ((m+1) << 1))
-                                 SetOpacityPixelComponent(q,
+                                 SetPixelOpacity(q,
                                  (*pixels).opacity+0);
                               else
-                                 SetOpacityPixelComponent(q,
+                                 SetPixelOpacity(q,
                                  (*n).opacity+0);
                             }
                         }
@@ -6380,22 +6380,22 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           /* Replicate nearest */
                           if (i <= ((m+1) << 1))
                           {
-                             SetRGBOPixelComponents(q,(pixels));
+                             SetPixelRGBO(q,(pixels));
                           }
 
                           else
                           {
-                             SetRGBOPixelComponents(q,(n));
+                             SetPixelRGBO(q,(n));
                           }
 
                           if (magn_methy == 5)
                             {
-                              SetOpacityPixelComponent(q,
+                              SetPixelOpacity(q,
                                  (QM) (((ssize_t) (2*i*
-                                 (GetOpacityPixelComponent(n)
-                                 -GetOpacityPixelComponent(pixels))
+                                 (GetPixelOpacity(n)
+                                 -GetPixelOpacity(pixels))
                                  +m))/((ssize_t) (m*2))
-                                 +GetOpacityPixelComponent(pixels)));
+                                 +GetPixelOpacity(pixels)));
                             }
                         }
                       n++;
@@ -6463,47 +6463,47 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                       if (magn_methx <= 1)
                         {
                           /* replicate previous */
-                          SetRGBOPixelComponents(q,(pixels));
+                          SetPixelRGBO(q,(pixels));
                         }
 
                       else if (magn_methx == 2 || magn_methx == 4)
                         {
                           if (i == 0)
                           {
-                             SetRGBOPixelComponents(q,(pixels));
+                             SetPixelRGBO(q,(pixels));
                           }
 
                           /* To do: Rewrite using Get/Set***PixelComponent() */
                           else
                             {
                               /* Interpolate */
-                              SetRedPixelComponent(q,
+                              SetPixelRed(q,
                                  (QM) ((2*i*(
-                                 GetRedPixelComponent(n)
-                                 -GetRedPixelComponent(pixels))+m)
+                                 GetPixelRed(n)
+                                 -GetPixelRed(pixels))+m)
                                  /((ssize_t) (m*2))+
-                                 GetRedPixelComponent(pixels)));
+                                 GetPixelRed(pixels)));
 
-                              SetGreenPixelComponent(q,
+                              SetPixelGreen(q,
                                  (QM) ((2*i*(
-                                 GetGreenPixelComponent(n)
-                                 -GetGreenPixelComponent(pixels))+m)
+                                 GetPixelGreen(n)
+                                 -GetPixelGreen(pixels))+m)
                                  /((ssize_t) (m*2))+
-                                 GetGreenPixelComponent(pixels)));
+                                 GetPixelGreen(pixels)));
 
-                              SetBluePixelComponent(q,
+                              SetPixelBlue(q,
                                  (QM) ((2*i*(
-                                 GetBluePixelComponent(n)
-                                 -GetBluePixelComponent(pixels))+m)
+                                 GetPixelBlue(n)
+                                 -GetPixelBlue(pixels))+m)
                                  /((ssize_t) (m*2))+
-                                 GetBluePixelComponent(pixels)));
+                                 GetPixelBlue(pixels)));
                               if (image->matte != MagickFalse)
-                                 SetOpacityPixelComponent(q,
+                                 SetPixelOpacity(q,
                                    (QM) ((2*i*(
-                                   GetOpacityPixelComponent(n)
-                                   -GetOpacityPixelComponent(pixels))+m)
+                                   GetPixelOpacity(n)
+                                   -GetPixelOpacity(pixels))+m)
                                    /((ssize_t) (m*2))+
-                                   GetOpacityPixelComponent(pixels)));
+                                   GetPixelOpacity(pixels)));
                             }
 
                           if (magn_methx == 4)
@@ -6511,13 +6511,13 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                               /* Replicate nearest */
                               if (i <= ((m+1) << 1))
                               {
-                                 SetOpacityPixelComponent(q,
-                                 GetOpacityPixelComponent(pixels)+0);
+                                 SetPixelOpacity(q,
+                                 GetPixelOpacity(pixels)+0);
                               }
                               else
                               {
-                                 SetOpacityPixelComponent(q,
-                                 GetOpacityPixelComponent(n)+0);
+                                 SetPixelOpacity(q,
+                                 GetPixelOpacity(n)+0);
                               }
                             }
                         }
@@ -6527,22 +6527,22 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           /* Replicate nearest */
                           if (i <= ((m+1) << 1))
                           {
-                             SetRGBOPixelComponents(q,(pixels));
+                             SetPixelRGBO(q,(pixels));
                           }
 
                           else
                           {
-                             SetRGBOPixelComponents(q,(n));
+                             SetPixelRGBO(q,(n));
                           }
 
                           if (magn_methx == 5)
                             {
                               /* Interpolate */
-                              SetOpacityPixelComponent(q,
-                                 (QM) ((2*i*( GetOpacityPixelComponent(n)
-                                 -GetOpacityPixelComponent(pixels))+m)/
+                              SetPixelOpacity(q,
+                                 (QM) ((2*i*( GetPixelOpacity(n)
+                                 -GetPixelOpacity(pixels))+m)/
                                  ((ssize_t) (m*2))
-                                 +GetOpacityPixelComponent(pixels)));
+                                 +GetPixelOpacity(pixels)));
                             }
                         }
                       q++;
@@ -6566,14 +6566,14 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
                      for (x=(ssize_t) image->columns-1; x >= 0; x--)
                      {
-                        SetRedPixelComponent(q,ScaleShortToQuantum(
-                            GetRedPixelComponent(q)));
-                        SetGreenPixelComponent(q,ScaleShortToQuantum(
-                            GetGreenPixelComponent(q)));
-                        SetBluePixelComponent(q,ScaleShortToQuantum(
-                            GetBluePixelComponent(q)));
-                        SetOpacityPixelComponent(q,ScaleShortToQuantum(
-                            GetOpacityPixelComponent(q)));
+                        SetPixelRed(q,ScaleShortToQuantum(
+                            GetPixelRed(q)));
+                        SetPixelGreen(q,ScaleShortToQuantum(
+                            GetPixelGreen(q)));
+                        SetPixelBlue(q,ScaleShortToQuantum(
+                            GetPixelBlue(q)));
+                        SetPixelOpacity(q,ScaleShortToQuantum(
+                            GetPixelOpacity(q)));
                         q++;
                      }
 
@@ -7648,7 +7648,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
              for (x=0; x < (ssize_t) image->columns; x++)
              {
-                LBR16RGBOPixelComponent(r);
+                LBR16PixelRGBO(r);
                 r++;
              }
 
@@ -7682,7 +7682,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
              for (x=0; x < (ssize_t) image->columns; x++)
              {
-                LBR08RGBOPixelComponent(r);
+                LBR08PixelRGBO(r);
                 r++;
              }
 
@@ -7715,7 +7715,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
              for (x=0; x < (ssize_t) image->columns; x++)
              {
-                LBR04RGBOPixelComponent(r);
+                LBR04PixelRGBO(r);
                 r++;
              }
 
@@ -7747,7 +7747,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
              for (x=0; x < (ssize_t) image->columns; x++)
              {
-                LBR02RGBOPixelComponent(r);
+                LBR02PixelRGBO(r);
                 r++;
              }
 
@@ -7778,7 +7778,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
              for (x=0; x < (ssize_t) image->columns; x++)
              {
-                LBR01RGBOPixelComponent(r);
+                LBR01PixelRGBO(r);
                 r++;
              }
 
@@ -7949,13 +7949,13 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
        for (x=0; x < (ssize_t) image->columns; x++)
        {
            if (image->matte == MagickFalse ||
-              GetOpacityPixelComponent(q) == OpaqueOpacity)
+              GetPixelOpacity(q) == OpaqueOpacity)
              {
                if (number_opaque < 259)
                  {
                    if (number_opaque == 0)
                      {
-                       GetRGBPixelComponents(q, opaque);
+                       GetPixelRGB(q, opaque);
                        opaque[0].opacity=OpaqueOpacity;
                        number_opaque=1;
                      }
@@ -7970,7 +7970,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        number_opaque < 259)
                      {
                        number_opaque++;
-                       GetRGBPixelComponents(q, opaque+i);
+                       GetPixelRGB(q, opaque+i);
                        opaque[i].opacity=OpaqueOpacity;
                      }
                  }
@@ -7981,15 +7981,15 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                  {
                    if (number_transparent == 0)
                      {
-                       GetRGBOPixelComponents(q, transparent);
+                       GetPixelRGBO(q, transparent);
                        ping_trans_color.red=
-                         (unsigned short) GetRedPixelComponent(q);
+                         (unsigned short) GetPixelRed(q);
                        ping_trans_color.green=
-                         (unsigned short) GetGreenPixelComponent(q);
+                         (unsigned short) GetPixelGreen(q);
                        ping_trans_color.blue=
-                         (unsigned short) GetBluePixelComponent(q);
+                         (unsigned short) GetPixelBlue(q);
                        ping_trans_color.gray=
-                         (unsigned short) GetRedPixelComponent(q);
+                         (unsigned short) GetPixelRed(q);
                        number_transparent = 1;
                      }
 
@@ -8003,7 +8003,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        number_transparent < 259)
                      {
                        number_transparent++;
-                       GetRGBOPixelComponents(q, transparent+i);
+                       GetPixelRGBO(q, transparent+i);
                      }
                  }
              }
@@ -8013,14 +8013,14 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                  {
                    if (number_semitransparent == 0)
                      {
-                       GetRGBOPixelComponents(q, semitransparent);
+                       GetPixelRGBO(q, semitransparent);
                        number_semitransparent = 1;
                      }
 
                    for (i=0; i< (ssize_t) number_semitransparent; i++)
                      {
                        if (IsColorEqual(q, semitransparent+i)
-                           && GetOpacityPixelComponent(q) ==
+                           && GetPixelOpacity(q) ==
                            semitransparent[i].opacity)
                          break;
                      }
@@ -8029,7 +8029,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        number_semitransparent < 259)
                      {
                        number_semitransparent++;
-                       GetRGBOPixelComponents(q, semitransparent+i);
+                       GetPixelRGBO(q, semitransparent+i);
                      }
                  }
              }
@@ -8119,8 +8119,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                    s=q;
                    for (x=0; x < (ssize_t) image->columns; x++)
                    {
-                     if (GetRedPixelComponent(s) != GetGreenPixelComponent(s)
-                        || GetRedPixelComponent(s) != GetBluePixelComponent(s))
+                     if (GetPixelRed(s) != GetPixelGreen(s)
+                        || GetPixelRed(s) != GetPixelBlue(s))
                        {
                           ping_have_color=MagickTrue;
                           ping_have_non_bw=MagickTrue;
@@ -8135,8 +8135,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                    s=q;
                    for (x=0; x < (ssize_t) image->columns; x++)
                    {
-                     if (GetRedPixelComponent(s) != 0 &&
-                         GetRedPixelComponent(s) != QuantumRange)
+                     if (GetPixelRed(s) != 0 &&
+                         GetPixelRed(s) != QuantumRange)
                        {
                          ping_have_non_bw=MagickTrue;
                        }
@@ -8254,15 +8254,15 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                 {
                   if ((image->matte == MagickFalse ||
                       image->colormap[i].opacity ==
-                      GetOpacityPixelComponent(q)) &&
+                      GetPixelOpacity(q)) &&
                       image->colormap[i].red ==
-                      GetRedPixelComponent(q) &&
+                      GetPixelRed(q) &&
                       image->colormap[i].green ==
-                      GetGreenPixelComponent(q) &&
+                      GetPixelGreen(q) &&
                       image->colormap[i].blue ==
-                      GetBluePixelComponent(q))
+                      GetPixelBlue(q))
                   {
-                    SetIndexPixelComponent(indexes+x,i);
+                    SetPixelIndex(indexes+x,i);
                     break;
                   }
                 }
@@ -8371,13 +8371,13 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-              if (GetOpacityPixelComponent(r) > TransparentOpacity/2)
+              if (GetPixelOpacity(r) > TransparentOpacity/2)
                 {
-                  SetOpacityPixelComponent(r,TransparentOpacity);
-                  SetRGBPixelComponents(r,&image->background_color);
+                  SetPixelOpacity(r,TransparentOpacity);
+                  SetPixelRGB(r,&image->background_color);
                 }
               else
-                  SetOpacityPixelComponent(r,OpaqueOpacity);
+                  SetPixelOpacity(r,OpaqueOpacity);
               r++;
           }
 
@@ -8425,8 +8425,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              if (GetOpacityPixelComponent(r) == OpaqueOpacity)
-                  LBR04RGBPixelComponent(r);
+              if (GetPixelOpacity(r) == OpaqueOpacity)
+                  LBR04PixelRGB(r);
               r++;
             }
 
@@ -8476,8 +8476,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              if (GetOpacityPixelComponent(r) == OpaqueOpacity)
-                  LBR03RGBPixelComponent(r);
+              if (GetPixelOpacity(r) == OpaqueOpacity)
+                  LBR03PixelRGB(r);
               r++;
             }
 
@@ -8530,8 +8530,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              if (GetOpacityPixelComponent(r) == OpaqueOpacity)
-                  LBR02BluePixelComponent(r);
+              if (GetPixelOpacity(r) == OpaqueOpacity)
+                  LBR02PixelBlue(r);
               r++;
             }
 
@@ -8581,12 +8581,12 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            if (ScaleQuantumToChar(GetRedPixelComponent(r)) == 0x49 &&
-                ScaleQuantumToChar(GetGreenPixelComponent(r)) == 0x00 &&
-                ScaleQuantumToChar(GetBluePixelComponent(r)) == 0x00 &&
-                GetOpacityPixelComponent(r) == OpaqueOpacity)
+            if (ScaleQuantumToChar(GetPixelRed(r)) == 0x49 &&
+                ScaleQuantumToChar(GetPixelGreen(r)) == 0x00 &&
+                ScaleQuantumToChar(GetPixelBlue(r)) == 0x00 &&
+                GetPixelOpacity(r) == OpaqueOpacity)
               {
-                SetRedPixelComponent(r,ScaleCharToQuantum(0x24));
+                SetPixelRed(r,ScaleCharToQuantum(0x24));
               }
             r++;
           }
@@ -8670,11 +8670,11 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
              for (x=0; x < (ssize_t) image->columns; x++)
              {
                  if (q->opacity != TransparentOpacity &&
-                     (unsigned short) GetRedPixelComponent(q) ==
+                     (unsigned short) GetPixelRed(q) ==
                      ping_trans_color.red &&
-                     (unsigned short) GetGreenPixelComponent(q) ==
+                     (unsigned short) GetPixelGreen(q) ==
                      ping_trans_color.green &&
-                     (unsigned short) GetBluePixelComponent(q) ==
+                     (unsigned short) GetPixelBlue(q) ==
                      ping_trans_color.blue)
                    {
                      ping_have_cheap_transparency = MagickFalse;
index 3182e56ddbae0079399ce4c46043a9712149aa30..166c9d52e4412a9cae27d205f5b3f7b7a22f49f6 100644 (file)
@@ -434,9 +434,9 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,PNMInteger(image,2) == 0 ? QuantumRange : 0);
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,PNMInteger(image,2) == 0 ? QuantumRange : 0);
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -487,12 +487,12 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             intensity=PNMInteger(image,10);
-            SetRedPixelComponent(q,intensity);
+            SetPixelRed(q,intensity);
             if (scale != (Quantum *) NULL)
-              SetRedPixelComponent(q,scale[ConstrainPixel(image,(ssize_t)
+              SetPixelRed(q,scale[ConstrainPixel(image,(ssize_t)
                 intensity,max_value)]);
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -556,9 +556,9 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 pixel.blue=(MagickRealType) scale[ConstrainPixel(image,(ssize_t)
                   pixel.blue,max_value)];
               }
-            SetRedPixelComponent(q,pixel.red);
-            SetGreenPixelComponent(q,pixel.green);
-            SetBluePixelComponent(q,pixel.blue);
+            SetPixelRed(q,pixel.red);
+            SetPixelGreen(q,pixel.green);
+            SetPixelBlue(q,pixel.blue);
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -720,9 +720,9 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   p=PushCharPixel(p,&pixel);
-                  SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                  SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                  SetBluePixelComponent(q,GetRedPixelComponent(q));
+                  SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+                  SetPixelGreen(q,GetPixelRed(q));
+                  SetPixelBlue(q,GetPixelRed(q));
                   q++;
                 }
               }
@@ -734,9 +734,9 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   p=PushShortPixel(MSBEndian,p,&pixel);
-                  SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                  SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                  SetBluePixelComponent(q,GetRedPixelComponent(q));
+                  SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+                  SetPixelGreen(q,GetPixelRed(q));
+                  SetPixelBlue(q,GetPixelRed(q));
                   q++;
                 }
               }
@@ -819,9 +819,9 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (image->depth == 8)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
               q->opacity=OpaqueOpacity;
               q++;
             }
@@ -834,12 +834,12 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   p=PushShortPixel(MSBEndian,p,&pixel);
-                  SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+                  SetPixelRed(q,ScaleShortToQuantum(pixel));
                   p=PushShortPixel(MSBEndian,p,&pixel);
-                  SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+                  SetPixelGreen(q,ScaleShortToQuantum(pixel));
                   p=PushShortPixel(MSBEndian,p,&pixel);
-                  SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
-                  SetOpacityPixelComponent(q,OpaqueOpacity);
+                  SetPixelBlue(q,ScaleShortToQuantum(pixel));
+                  SetPixelOpacity(q,OpaqueOpacity);
                   q++;
                 }
               }
@@ -852,12 +852,12 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     p=PushCharPixel(p,&pixel);
-                    SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                    SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                     p=PushCharPixel(p,&pixel);
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                    SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                     p=PushCharPixel(p,&pixel);
-                    SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                    SetOpacityPixelComponent(q,OpaqueOpacity);
+                    SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+                    SetPixelOpacity(q,OpaqueOpacity);
                     q++;
                   }
                 }
@@ -869,12 +869,12 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     p=PushShortPixel(MSBEndian,p,&pixel);
-                    SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                    SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                     p=PushShortPixel(MSBEndian,p,&pixel);
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                    SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                     p=PushShortPixel(MSBEndian,p,&pixel);
-                    SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                    SetOpacityPixelComponent(q,OpaqueOpacity);
+                    SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+                    SetPixelOpacity(q,OpaqueOpacity);
                     q++;
                   }
                 }
@@ -1012,14 +1012,14 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
                       p=PushCharPixel(p,&pixel);
-                      SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                      SetBluePixelComponent(q,GetRedPixelComponent(q));
-                      SetOpacityPixelComponent(q,OpaqueOpacity);
+                      SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelGreen(q,GetPixelRed(q));
+                      SetPixelBlue(q,GetPixelRed(q));
+                      SetPixelOpacity(q,OpaqueOpacity);
                       if (image->matte != MagickFalse)
                         {
                           p=PushCharPixel(p,&pixel);
-                          SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+                          SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
                             range));
                         }
                       q++;
@@ -1033,14 +1033,14 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                      SetBluePixelComponent(q,GetRedPixelComponent(q));
-                      SetOpacityPixelComponent(q,OpaqueOpacity);
+                      SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelGreen(q,GetPixelRed(q));
+                      SetPixelBlue(q,GetPixelRed(q));
+                      SetPixelOpacity(q,OpaqueOpacity);
                       if (image->matte != MagickFalse)
                         {
                           p=PushShortPixel(MSBEndian,p,&pixel);
-                          SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+                          SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
                             range));
                         }
                       q++;
@@ -1059,19 +1059,19 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
                       p=PushCharPixel(p,&pixel);
-                      SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                       p=PushCharPixel(p,&pixel);
-                      SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                       p=PushCharPixel(p,&pixel);
-                      SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
                       p=PushCharPixel(p,&pixel);
-                      SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,
+                      SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,
                         range));
-                      SetOpacityPixelComponent(q,OpaqueOpacity);
+                      SetPixelOpacity(q,OpaqueOpacity);
                       if (image->matte != MagickFalse)
                         {
                           p=PushCharPixel(p,&pixel);
-                          SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+                          SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
                             range));
                         }
                       q++;
@@ -1085,19 +1085,19 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,
+                      SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,
                         range));
-                      SetOpacityPixelComponent(q,OpaqueOpacity);
+                      SetPixelOpacity(q,OpaqueOpacity);
                       if (image->matte != MagickFalse)
                         {
                           p=PushShortPixel(MSBEndian,p,&pixel);
-                          SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+                          SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
                             range));
                         }
                       q++;
@@ -1115,16 +1115,16 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
                       p=PushCharPixel(p,&pixel);
-                      SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                       p=PushCharPixel(p,&pixel);
-                      SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                       p=PushCharPixel(p,&pixel);
-                      SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                      SetOpacityPixelComponent(q,OpaqueOpacity);
+                      SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelOpacity(q,OpaqueOpacity);
                       if (image->matte != MagickFalse)
                         {
                           p=PushCharPixel(p,&pixel);
-                          SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+                          SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
                             range));
                         }
                       q++;
@@ -1138,16 +1138,16 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                       p=PushShortPixel(MSBEndian,p,&pixel);
-                      SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
-                      SetOpacityPixelComponent(q,OpaqueOpacity);
+                      SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+                      SetPixelOpacity(q,OpaqueOpacity);
                       if (image->matte != MagickFalse)
                         {
                           p=PushShortPixel(MSBEndian,p,&pixel);
-                          SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+                          SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
                             range));
                         }
                       q++;
@@ -1758,14 +1758,14 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
           {
             if (image->depth <= 8)
               count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
-                "%u %u %u ",ScaleQuantumToChar(GetRedPixelComponent(p)),
-                ScaleQuantumToChar(GetGreenPixelComponent(p)),
-                ScaleQuantumToChar(GetBluePixelComponent(p)));
+                "%u %u %u ",ScaleQuantumToChar(GetPixelRed(p)),
+                ScaleQuantumToChar(GetPixelGreen(p)),
+                ScaleQuantumToChar(GetPixelBlue(p)));
             else
               count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
-                "%u %u %u ",ScaleQuantumToShort(GetRedPixelComponent(p)),
-                ScaleQuantumToShort(GetGreenPixelComponent(p)),
-                ScaleQuantumToShort(GetBluePixelComponent(p)));
+                "%u %u %u ",ScaleQuantumToShort(GetPixelRed(p)),
+                ScaleQuantumToShort(GetPixelGreen(p)),
+                ScaleQuantumToShort(GetPixelBlue(p)));
             extent=(size_t) count;
             (void) strncpy((char *) q,buffer,extent);
             q+=extent;
@@ -1872,9 +1872,9 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   else
                     {
                       if (image->depth == 8)
-                        pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+                        pixel=ScaleQuantumToChar(GetPixelRed(p));
                       else
-                        pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                        pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                     }
                   q=PopCharPixel((unsigned char) pixel,q);
                   p++;
@@ -1887,9 +1887,9 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   else
                     {
                       if (image->depth == 16)
-                        pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+                        pixel=ScaleQuantumToShort(GetPixelRed(p));
                       else
-                        pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                        pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                     }
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                   p++;
@@ -1949,22 +1949,22 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
               if (image->depth <= 8)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
-                  pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                  pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                   q=PopCharPixel((unsigned char) pixel,q);
-                  pixel=ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                  pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
                   q=PopCharPixel((unsigned char) pixel,q);
-                  pixel=ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                  pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
                   q=PopCharPixel((unsigned char) pixel,q);
                   p++;
                 }
               else
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
-                  pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                  pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                  pixel=ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                  pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                  pixel=ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                  pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                   p++;
                 }
@@ -2031,7 +2031,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                       if (image->matte != MagickFalse)
                         {
                           pixel=(unsigned char) ScaleQuantumToAny(
-                            GetOpacityPixelComponent(p),range);
+                            GetPixelOpacity(p),range);
                           q=PopCharPixel((unsigned char) pixel,q);
                         }
                       p++;
@@ -2044,7 +2044,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                       if (image->matte != MagickFalse)
                         {
                           pixel=(unsigned char) ScaleQuantumToAny(
-                            GetOpacityPixelComponent(p),range);
+                            GetPixelOpacity(p),range);
                           q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                         }
                       p++;
@@ -2057,19 +2057,19 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   if (image->depth <= 8)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
-                      pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                       q=PopCharPixel((unsigned char) pixel,q);
-                      pixel=ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
                       q=PopCharPixel((unsigned char) pixel,q);
-                      pixel=ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
                       q=PopCharPixel((unsigned char) pixel,q);
                       pixel=ScaleQuantumToAny(
-                        GetIndexPixelComponent(indexes+x),range);
+                        GetPixelIndex(indexes+x),range);
                       q=PopCharPixel((unsigned char) pixel,q);
                       if (image->matte != MagickFalse)
                         {
                           pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
-                            GetOpacityPixelComponent(p)),range);
+                            GetPixelOpacity(p)),range);
                           q=PopCharPixel((unsigned char) pixel,q);
                         }
                       p++;
@@ -2077,19 +2077,19 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   else
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
-                      pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                      pixel=ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                      pixel=ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                       pixel=ScaleQuantumToAny(
-                        GetIndexPixelComponent(indexes+x),range);
+                        GetPixelIndex(indexes+x),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                       if (image->matte != MagickFalse)
                         {
                           pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
-                            GetOpacityPixelComponent(p)),range);
+                            GetPixelOpacity(p)),range);
                           q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                         }
                       p++;
@@ -2101,16 +2101,16 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   if (image->depth <= 8)
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
-                      pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                       q=PopCharPixel((unsigned char) pixel,q);
-                      pixel=ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
                       q=PopCharPixel((unsigned char) pixel,q);
-                      pixel=ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
                       q=PopCharPixel((unsigned char) pixel,q);
                       if (image->matte != MagickFalse)
                         {
                           pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
-                            GetOpacityPixelComponent(p)),range);
+                            GetPixelOpacity(p)),range);
                           q=PopCharPixel((unsigned char) pixel,q);
                         }
                       p++;
@@ -2118,16 +2118,16 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   else
                     for (x=0; x < (ssize_t) image->columns; x++)
                     {
-                      pixel=ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelRed(p),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                      pixel=ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                      pixel=ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                      pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
                       q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                       if (image->matte != MagickFalse)
                         {
                           pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
-                            GetOpacityPixelComponent(p)),range);
+                            GetPixelOpacity(p)),range);
                           q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                         }
                       p++;
index 9bd3d58963e1f0ddf2f31e7f5fef91a3b9648257..d62f42742cd70812bad54384cc9171c9486a7b07 100644 (file)
@@ -1026,7 +1026,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
 #define WriteRunlengthPacket(image,pixel,length,p) \
 { \
   if ((image->matte != MagickFalse) && \
-      (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity)) \
+      (GetPixelOpacity(p) == (Quantum) TransparentOpacity)) \
     { \
       q=PopHexPixel(hex_digits,0xff,q); \
       q=PopHexPixel(hex_digits,0xff,q); \
@@ -1888,10 +1888,10 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 length=255;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
-                  if ((GetRedPixelComponent(p) == pixel.red) &&
-                      (GetGreenPixelComponent(p) == pixel.green) &&
-                      (GetBluePixelComponent(p) == pixel.blue) &&
-                      (GetOpacityPixelComponent(p) == pixel.opacity) &&
+                  if ((GetPixelRed(p) == pixel.red) &&
+                      (GetPixelGreen(p) == pixel.green) &&
+                      (GetPixelBlue(p) == pixel.blue) &&
+                      (GetPixelOpacity(p) == pixel.opacity) &&
                       (length < 255) && (x < (ssize_t) (image->columns-1)))
                     length++;
                   else
@@ -1949,7 +1949,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   if ((image->matte != MagickFalse) &&
-                      (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity))
+                      (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
                     {
                       q=PopHexPixel(hex_digits,0xff,q);
                       q=PopHexPixel(hex_digits,0xff,q);
@@ -1958,11 +1958,11 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                   else
                     {
                       q=PopHexPixel(hex_digits,ScaleQuantumToChar(
-                        GetRedPixelComponent(p)),q);
+                        GetPixelRed(p)),q);
                       q=PopHexPixel(hex_digits,ScaleQuantumToChar(
-                        GetGreenPixelComponent(p)),q);
+                        GetPixelGreen(p)),q);
                       q=PopHexPixel(hex_digits,ScaleQuantumToChar(
-                        GetBluePixelComponent(p)),q);
+                        GetPixelBlue(p)),q);
                     }
                   if ((q-pixels+6) >= 80)
                     {
@@ -2029,11 +2029,11 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 if (p == (const PixelPacket *) NULL)
                   break;
                 indexes=GetVirtualIndexQueue(image);
-                index=GetIndexPixelComponent(indexes);
+                index=GetPixelIndex(indexes);
                 length=255;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
-                  if ((index == GetIndexPixelComponent(indexes+x)) &&
+                  if ((index == GetPixelIndex(indexes+x)) &&
                       (length < 255) && (x < ((ssize_t) image->columns-1)))
                     length++;
                   else
@@ -2053,11 +2053,11 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                         }
                       length=0;
                     }
-                  index=GetIndexPixelComponent(indexes+x);
-                  pixel.red=GetRedPixelComponent(p);
-                  pixel.green=GetGreenPixelComponent(p);
-                  pixel.blue=GetBluePixelComponent(p);
-                  pixel.opacity=GetOpacityPixelComponent(p);
+                  index=GetPixelIndex(indexes+x);
+                  pixel.red=GetPixelRed(p);
+                  pixel.green=GetPixelGreen(p);
+                  pixel.blue=GetPixelBlue(p);
+                  pixel.opacity=GetPixelOpacity(p);
                   p++;
                 }
                 q=PopHexPixel(hex_digits,(size_t) index,q);
@@ -2094,7 +2094,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
-                  q=PopHexPixel(hex_digits,(size_t) GetIndexPixelComponent(
+                  q=PopHexPixel(hex_digits,(size_t) GetPixelIndex(
                     indexes+x),q);
                   if ((q-pixels+4) >= 80)
                     {
index 27471fc12b556a19709104907e72e9b5c00322b8..6731b7fa0357f5bf455bf8d3fd1dcbfbaafe6d73 100644 (file)
@@ -884,7 +884,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   if ((image->matte != MagickFalse) &&
-                      (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity))
+                      (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
                     {
                       *q++=ScaleQuantumToChar((Quantum) QuantumRange);
                       *q++=ScaleQuantumToChar((Quantum) QuantumRange);
@@ -893,16 +893,16 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                   else
                     if (image->colorspace != CMYKColorspace)
                       {
-                        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-                        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-                        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+                        *q++=ScaleQuantumToChar(GetPixelRed(p));
+                        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+                        *q++=ScaleQuantumToChar(GetPixelBlue(p));
                       }
                     else
                       {
-                        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-                        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-                        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-                        *q++=ScaleQuantumToChar(GetIndexPixelComponent(
+                        *q++=ScaleQuantumToChar(GetPixelRed(p));
+                        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+                        *q++=ScaleQuantumToChar(GetPixelBlue(p));
+                        *q++=ScaleQuantumToChar(GetPixelIndex(
                           indexes+x));
                       }
                   p++;
@@ -941,7 +941,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   if ((image->matte != MagickFalse) &&
-                      (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity))
+                      (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
                     {
                       Ascii85Encode(image,ScaleQuantumToChar((Quantum)
                         QuantumRange));
@@ -954,22 +954,22 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                     if (image->colorspace != CMYKColorspace)
                       {
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetRedPixelComponent(p)));
+                          GetPixelRed(p)));
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetGreenPixelComponent(p)));
+                          GetPixelGreen(p)));
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetBluePixelComponent(p)));
+                          GetPixelBlue(p)));
                       }
                     else
                       {
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetRedPixelComponent(p)));
+                          GetPixelRed(p)));
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetGreenPixelComponent(p)));
+                          GetPixelGreen(p)));
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetBluePixelComponent(p)));
+                          GetPixelBlue(p)));
                         Ascii85Encode(image,ScaleQuantumToChar(
-                          GetIndexPixelComponent(indexes+x)));
+                          GetPixelIndex(indexes+x)));
                       }
                   p++;
                 }
@@ -1035,7 +1035,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                   break;
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
-                  *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+                  *q++=(unsigned char) GetPixelIndex(indexes+x);
                 progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                   y,image->rows);
                 if (progress == MagickFalse)
@@ -1068,7 +1068,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                   break;
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
-                  Ascii85Encode(image,(unsigned char) GetIndexPixelComponent(
+                  Ascii85Encode(image,(unsigned char) GetPixelIndex(
                     indexes+x));
                 progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                   y,image->rows);
index f8a717be83c675cc3d5508c9a1c340a31bb19ce6..6d5cb7f35cdff3d9226d165321fa1c033e730fc5 100644 (file)
@@ -271,18 +271,18 @@ static MagickBooleanType SerializeImage(const ImageInfo *image_info,
     if (image->colorspace != CMYKColorspace)
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+        *q++=ScaleQuantumToChar(GetPixelRed(p));
+        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+        *q++=ScaleQuantumToChar(GetPixelBlue(p));
         p++;
       }
     else
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-        *q++=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+        *q++=ScaleQuantumToChar(GetPixelRed(p));
+        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+        *q++=ScaleQuantumToChar(GetPixelBlue(p));
+        *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
         p++;
       }
     if (image->previous == (Image *) NULL)
@@ -413,7 +413,7 @@ static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info,
       break;
     indexes=GetVirtualIndexQueue(image);
     for (x=0; x < (ssize_t) image->columns; x++)
-      *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+      *q++=(unsigned char) GetPixelIndex(indexes+x);
     if (image->previous == (Image *) NULL)
       {
         status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
index 892a9d2b2756f1461e58ec2633476053c431374a..e22ef683601fa1e6048b2aaf865c1519b5602ac2 100644 (file)
@@ -636,25 +636,25 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
       {
         case -1:
         {
-          SetAlphaPixelComponent(q,pixel);
+          SetPixelAlpha(q,pixel);
           break;
         }
         case 0:
         {
-          SetRedPixelComponent(q,pixel);
+          SetPixelRed(q,pixel);
           if (channels == 1)
             {
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
             }
           if (image->storage_class == PseudoClass)
             {
               if (packet_size == 1)
-                SetIndexPixelComponent(indexes+x,ScaleQuantumToChar(pixel));
+                SetPixelIndex(indexes+x,ScaleQuantumToChar(pixel));
               else
-                SetIndexPixelComponent(indexes+x,ScaleQuantumToShort(pixel));
-              SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                GetIndexPixelComponent(indexes+x));
+                SetPixelIndex(indexes+x,ScaleQuantumToShort(pixel));
+              SetPixelRGBO(q,image->colormap+(ssize_t)
+                GetPixelIndex(indexes+x));
               if (image->depth == 1)
                 {
                   ssize_t
@@ -666,10 +666,10 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
                     number_bits=8;
                   for (bit=0; bit < number_bits; bit++)
                   {
-                    SetIndexPixelComponent(indexes+x,(((unsigned char) pixel) &
+                    SetPixelIndex(indexes+x,(((unsigned char) pixel) &
                       (0x01 << (7-bit))) != 0 ? 0 : 255);
-                    SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                      GetIndexPixelComponent(indexes+x));
+                    SetPixelRGBO(q,image->colormap+(ssize_t)
+                      GetPixelIndex(indexes+x));
                     q++;
                     x++;
                   }
@@ -682,32 +682,32 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
         case 1:
         {
           if (image->storage_class == PseudoClass)
-            SetAlphaPixelComponent(q,pixel);
+            SetPixelAlpha(q,pixel);
           else
-            SetGreenPixelComponent(q,pixel);
+            SetPixelGreen(q,pixel);
           break;
         }
         case 2:
         {
           if (image->storage_class == PseudoClass)
-            SetAlphaPixelComponent(q,pixel);
+            SetPixelAlpha(q,pixel);
           else
-            SetBluePixelComponent(q,pixel);
+            SetPixelBlue(q,pixel);
           break;
         }
         case 3:
         {
           if (image->colorspace == CMYKColorspace)
-            SetIndexPixelComponent(indexes+x,pixel);
+            SetPixelIndex(indexes+x,pixel);
           else
-            SetAlphaPixelComponent(q,pixel);
+            SetPixelAlpha(q,pixel);
           break;
         }
         case 4:
         {
           if ((image->colorspace == RGBColorspace) && (channels > 3))
             break;
-          SetAlphaPixelComponent(q,pixel);
+          SetPixelAlpha(q,pixel);
           break;
         }
         default:
index 803e1fd2d513d19fcf72ff2580245e59cccce206..092dc4523f6967f3b0eb4799b356b9cd70613104 100644 (file)
@@ -221,9 +221,9 @@ static Image *ReadRAWImage(const ImageInfo *image_info,
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,GetRedPixelComponent(p));
-            SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-            SetBluePixelComponent(q,GetBluePixelComponent(p));
+            SetPixelRed(q,GetPixelRed(p));
+            SetPixelGreen(q,GetPixelGreen(p));
+            SetPixelBlue(q,GetPixelBlue(p));
             p++;
             q++;
           }
index 87ae3c124353ec57f5b1ef55108895d397188730..dafeca55894485801912b790d5bd67c76804be16 100644 (file)
@@ -251,12 +251,12 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
-                SetOpacityPixelComponent(q,OpaqueOpacity);
+                SetPixelRed(q,GetPixelRed(p));
+                SetPixelGreen(q,GetPixelGreen(p));
+                SetPixelBlue(q,GetPixelBlue(p));
+                SetPixelOpacity(q,OpaqueOpacity);
                 if (image->matte != MagickFalse)
-                  SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                  SetPixelOpacity(q,GetPixelOpacity(p));
                 p++;
                 q++;
               }
@@ -339,27 +339,27 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                   {
                     case RedQuantum:
                     {
-                      SetRedPixelComponent(q,GetRedPixelComponent(p));
+                      SetPixelRed(q,GetPixelRed(p));
                       break;
                     }
                     case GreenQuantum:
                     {
-                      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                      SetPixelGreen(q,GetPixelGreen(p));
                       break;
                     }
                     case BlueQuantum:
                     {
-                      SetBluePixelComponent(q,GetBluePixelComponent(p));
+                      SetPixelBlue(q,GetPixelBlue(p));
                       break;
                     }
                     case OpacityQuantum:
                     {
-                      SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                      SetPixelOpacity(q,GetPixelOpacity(p));
                       break;
                     }
                     case AlphaQuantum:
                     {
-                      SetAlphaPixelComponent(q,GetAlphaPixelComponent(p));
+                      SetPixelAlpha(q,GetPixelAlpha(p));
                       break;
                     }
                     default:
@@ -430,7 +430,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -482,7 +482,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -534,7 +534,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -595,7 +595,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
@@ -682,7 +682,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -753,7 +753,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -824,7 +824,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -897,7 +897,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
index d9505716b4c42e785794acdc658e8dc7759e24f1..39b80ba23cf9adda4c379a01007dd997c9731fd2 100644 (file)
@@ -304,23 +304,23 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 case 0:
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum(byte));
+                  SetPixelRed(q,ScaleCharToQuantum(byte));
                   break;
                 }
                 case 1:
                 {
-                  SetGreenPixelComponent(q,ScaleCharToQuantum(byte));
+                  SetPixelGreen(q,ScaleCharToQuantum(byte));
                   break;
                 }
                 case 2:
                 {
-                  SetBluePixelComponent(q,ScaleCharToQuantum(byte));
+                  SetPixelBlue(q,ScaleCharToQuantum(byte));
                   break;
                 }
                 case 3:
                 default:
                 {
-                  SetAlphaPixelComponent(q,ScaleCharToQuantum(byte));
+                  SetPixelAlpha(q,ScaleCharToQuantum(byte));
                   break;
                 }
               }
@@ -344,23 +344,23 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             case 0:
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(byte));
+              SetPixelRed(q,ScaleCharToQuantum(byte));
               break;
             }
             case 1:
             {
-              SetGreenPixelComponent(q,ScaleCharToQuantum(byte));
+              SetPixelGreen(q,ScaleCharToQuantum(byte));
               break;
             }
             case 2:
             {
-              SetBluePixelComponent(q,ScaleCharToQuantum(byte));
+              SetPixelBlue(q,ScaleCharToQuantum(byte));
               break;
             }
             case 3:
             default:
             {
-              SetAlphaPixelComponent(q,ScaleCharToQuantum(byte));
+              SetPixelAlpha(q,ScaleCharToQuantum(byte));
               break;
             }
           }
index 08d165baed1f559d3869155cab20c7f505f2f7f3..14a49fb61e2a81bc163b94800bd334f49bc3111d 100644 (file)
@@ -444,11 +444,11 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-            SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+            SetPixelRed(q,ScaleCharToQuantum(*p++));
+            SetPixelGreen(q,ScaleCharToQuantum(*p++));
+            SetPixelBlue(q,ScaleCharToQuantum(*p++));
             if (image->matte != MagickFalse)
-              SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelAlpha(q,ScaleCharToQuantum(*p++));
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -504,7 +504,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               indexes=GetAuthenticIndexQueue(image);
               for (x=0; x < (ssize_t) image->columns; x++)
-                SetIndexPixelComponent(indexes+x,*p++);
+                SetPixelIndex(indexes+x,*p++);
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
               if (image->previous == (Image *) NULL)
@@ -529,10 +529,10 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,image->colormap[*p++].red);
-                SetGreenPixelComponent(q,image->colormap[*p++].green);
-                SetBluePixelComponent(q,image->colormap[*p++].blue);
-                SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+                SetPixelRed(q,image->colormap[*p++].red);
+                SetPixelGreen(q,image->colormap[*p++].green);
+                SetPixelBlue(q,image->colormap[*p++].blue);
+                SetPixelAlpha(q,ScaleCharToQuantum(*p++));
                 q++;
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 1acb4f9542b63c90e1360eb2d237f907d556da9d..13f19b474b14586403d0424fa45ea6ee40670c9b 100644 (file)
@@ -215,18 +215,18 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
               if(binar[z])
             {
-                SetRedPixelComponent(q,ScaleCharToQuantum(
+                SetPixelRed(q,ScaleCharToQuantum(
                   colour_palette[3*ink]));
-                SetGreenPixelComponent(q,ScaleCharToQuantum(
+                SetPixelGreen(q,ScaleCharToQuantum(
                   colour_palette[1+(3*ink)]));
-                SetBluePixelComponent(q,ScaleCharToQuantum(
+                SetPixelBlue(q,ScaleCharToQuantum(
                   colour_palette[2+(3*ink)]));
             } else {
-                SetRedPixelComponent(q,ScaleCharToQuantum(
+                SetPixelRed(q,ScaleCharToQuantum(
                   colour_palette[3*paper]));
-                SetGreenPixelComponent(q,ScaleCharToQuantum(
+                SetPixelGreen(q,ScaleCharToQuantum(
                   colour_palette[1+(3*paper)]));
-                SetBluePixelComponent(q,ScaleCharToQuantum(
+                SetPixelBlue(q,ScaleCharToQuantum(
                   colour_palette[2+(3*paper)]));
             }
 
index dc75600afbf6568b929702326b1836463f760fd1..5bed1d293bded824cadc6087962226526ecc2dc6 100644 (file)
@@ -243,25 +243,25 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           case 0:
           {
-            SetRedPixelComponent(q,pixel);
-            SetGreenPixelComponent(q,pixel);
-            SetBluePixelComponent(q,pixel);
+            SetPixelRed(q,pixel);
+            SetPixelGreen(q,pixel);
+            SetPixelBlue(q,pixel);
             break;
           }
           case 1:
           {
-            SetGreenPixelComponent(q,pixel);
+            SetPixelGreen(q,pixel);
             break;
           }
           case 2:
           {
-            SetBluePixelComponent(q,pixel);
+            SetPixelBlue(q,pixel);
             break;
           }
           case 3: 
           {
             if (image->colorspace == CMYKColorspace)
-              SetBlackPixelComponent(indexes+x,pixel);
+              SetPixelBlack(indexes+x,pixel);
             break;
           }
         }
index da85fdbae953379e2f53e05730cefe61e88b909e..5d6c0543c3e26deb69017bc8ab8f71318b426fd2 100644 (file)
@@ -551,15 +551,15 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+                SetPixelRed(q,ScaleShortToQuantum((unsigned short)
                   ((*(p+0) << 8) | (*(p+1)))));
-                SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+                SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
                   ((*(p+2) << 8) | (*(p+3)))));
-                SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+                SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
                   ((*(p+4) << 8) | (*(p+5)))));
-                SetOpacityPixelComponent(q,OpaqueOpacity);
+                SetPixelOpacity(q,OpaqueOpacity);
                 if (image->matte != MagickFalse)
-                  SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+                  SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
                     ((*(p+6) << 8) | (*(p+7)))));
                 p+=8;
                 q++;
@@ -584,12 +584,12 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p));
+              SetPixelRed(q,ScaleCharToQuantum(*p));
               q->green=ScaleCharToQuantum(*(p+1));
               q->blue=ScaleCharToQuantum(*(p+2));
-              SetOpacityPixelComponent(q,OpaqueOpacity);
+              SetPixelOpacity(q,OpaqueOpacity);
               if (image->matte != MagickFalse)
-                SetAlphaPixelComponent(q,ScaleCharToQuantum(*(p+3)));
+                SetPixelAlpha(q,ScaleCharToQuantum(*(p+3)));
               p+=4;
               q++;
             }
@@ -627,7 +627,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 quantum=(*p << 8);
                 quantum|=(*(p+1));
-                SetIndexPixelComponent(indexes+x,quantum);
+                SetPixelIndex(indexes+x,quantum);
                 p+=8;
                 q++;
               }
@@ -652,7 +652,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
             indexes=GetAuthenticIndexQueue(image);
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              SetIndexPixelComponent(indexes+x,*p);
+              SetPixelIndex(indexes+x,*p);
               p+=4;
               q++;
             }
@@ -984,10 +984,10 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image)
 
           q=(unsigned char *) iris_pixels;
           q+=((iris_info.rows-1)-y)*(4*iris_info.columns)+4*x;
-          *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-          *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-          *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-          *q++=ScaleQuantumToChar(GetAlphaPixelComponent(p));
+          *q++=ScaleQuantumToChar(GetPixelRed(p));
+          *q++=ScaleQuantumToChar(GetPixelGreen(p));
+          *q++=ScaleQuantumToChar(GetPixelBlue(p));
+          *q++=ScaleQuantumToChar(GetPixelAlpha(p));
           p++;
         }
       else
@@ -998,10 +998,10 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image)
 
           q=(unsigned short *) iris_pixels;
           q+=((iris_info.rows-1)-y)*(4*iris_info.columns)+4*x;
-          *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-          *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-          *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-          *q++=ScaleQuantumToShort(GetAlphaPixelComponent(p));
+          *q++=ScaleQuantumToShort(GetPixelRed(p));
+          *q++=ScaleQuantumToShort(GetPixelGreen(p));
+          *q++=ScaleQuantumToShort(GetPixelBlue(p));
+          *q++=ScaleQuantumToShort(GetPixelAlpha(p));
           p++;
         }
       if (image->previous == (Image *) NULL)
index 8ced90402bd5c2398c106e0fa1ed9c4e2645a5a8..e0f7d79d0cf5d2a0a53ab06ab354307dc2de05f5 100644 (file)
@@ -100,9 +100,9 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
 {
 #define GetBit(alpha,i) MagickMin((((size_t) (alpha) >> (size_t) \
   (i)) & 0x01),16)
-#define SetBit(indexes,i,set) SetIndexPixelComponent(indexes,((set) != 0 ? \
-  (size_t) GetIndexPixelComponent(indexes) | (one << (size_t) (i)) : (size_t) \
-  GetIndexPixelComponent(indexes) & ~(one << (size_t) (i))))
+#define SetBit(indexes,i,set) SetPixelIndex(indexes,((set) != 0 ? \
+  (size_t) GetPixelIndex(indexes) | (one << (size_t) (i)) : (size_t) \
+  GetPixelIndex(indexes) & ~(one << (size_t) (i))))
 
   Image
     *image,
index 901f222f01d0481c4dda2f0ff9ed1fa7fbb56237..3a066c03a5a2a9f4176765f403a1257f9f7b26ac 100644 (file)
@@ -447,14 +447,14 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < ((ssize_t) image->columns-7); x+=8)
         {
           for (bit=7; bit >= 0; bit--)
-            SetIndexPixelComponent(indexes+x+7-bit,((*p) & (0x01 << bit) ?
+            SetPixelIndex(indexes+x+7-bit,((*p) & (0x01 << bit) ?
               0x00 : 0x01));
           p++;
         }
         if ((image->columns % 8) != 0)
           {
             for (bit=7; bit >= (ssize_t) (8-(image->columns % 8)); bit--)
-              SetIndexPixelComponent(indexes+x+7-bit,(*p) & (0x01 << bit) ?
+              SetPixelIndex(indexes+x+7-bit,(*p) & (0x01 << bit) ?
                 0x00 : 0x01);
             p++;
           }
@@ -485,7 +485,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             indexes=GetAuthenticIndexQueue(image);
             for (x=0; x < (ssize_t) image->columns; x++)
-              SetIndexPixelComponent(indexes+x,*p++);
+              SetPixelIndex(indexes+x,*p++);
             if ((image->columns % 2) != 0)
               p++;
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -521,27 +521,27 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               if (image->matte != MagickFalse)
-                SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+                SetPixelAlpha(q,ScaleCharToQuantum(*p++));
               if (sun_info.type == RT_STANDARD)
                 {
-                  SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-                  SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-                  SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+                  SetPixelBlue(q,ScaleCharToQuantum(*p++));
+                  SetPixelGreen(q,ScaleCharToQuantum(*p++));
+                  SetPixelRed(q,ScaleCharToQuantum(*p++));
                 }
               else
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-                  SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-                  SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+                  SetPixelRed(q,ScaleCharToQuantum(*p++));
+                  SetPixelGreen(q,ScaleCharToQuantum(*p++));
+                  SetPixelBlue(q,ScaleCharToQuantum(*p++));
                 }
               if (image->colors != 0)
                 {
-                  SetRedPixelComponent(q,image->colormap[(ssize_t)
-                    GetRedPixelComponent(q)].red);
-                  SetGreenPixelComponent(q,image->colormap[(ssize_t)
-                    GetGreenPixelComponent(q)].green);
-                  SetBluePixelComponent(q,image->colormap[(ssize_t)
-                    GetBluePixelComponent(q)].blue);
+                  SetPixelRed(q,image->colormap[(ssize_t)
+                    GetPixelRed(q)].red);
+                  SetPixelGreen(q,image->colormap[(ssize_t)
+                    GetPixelGreen(q)].green);
+                  SetPixelBlue(q,image->colormap[(ssize_t)
+                    GetPixelBlue(q)].blue);
                 }
               q++;
             }
@@ -852,10 +852,10 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             if (image->matte != MagickFalse)
-              *q++=ScaleQuantumToChar(GetAlphaPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToChar(GetPixelAlpha(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
             p++;
           }
           if (((bytes_per_pixel*image->columns) & 0x01) != 0)
@@ -944,7 +944,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               (void) WriteBlobByte(image,(unsigned char)
-                GetIndexPixelComponent(indexes+x));
+                GetPixelIndex(indexes+x));
               p++;
             }
             if (image->columns & 0x01)
index 22959b8c475849d3af57b41f81b727194d950b6c..ca400288267adfc2b5c39fea6b4445af9f14fbe8 100644 (file)
@@ -3345,11 +3345,11 @@ static MagickBooleanType TraceSVGImage(Image *image)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        trace->bitmap[i++]=GetRedPixelComponent(p);
+        trace->bitmap[i++]=GetPixelRed(p);
         if (number_planes == 3)
           {
-            trace->bitmap[i++]=GetGreenPixelComponent(p);
-            trace->bitmap[i++]=GetBluePixelComponent(p);
+            trace->bitmap[i++]=GetPixelGreen(p);
+            trace->bitmap[i++]=GetPixelBlue(p);
           }
         p++;
       }
index f963b88a49a47bbf086fb13288d954513bc462f5..fe50b8c51fe3e162c003be4170db712c751612e4 100644 (file)
@@ -441,12 +441,12 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (status == MagickFalse)
         ThrowReaderException(CorruptImageError,"UnableToReadImageData");
       if (image->storage_class == PseudoClass)
-        SetIndexPixelComponent(indexes+x,index);
-      SetRedPixelComponent(q,pixel.red);
-      SetGreenPixelComponent(q,pixel.green);
-      SetBluePixelComponent(q,pixel.blue);
+        SetPixelIndex(indexes+x,index);
+      SetPixelRed(q,pixel.red);
+      SetPixelGreen(q,pixel.green);
+      SetPixelBlue(q,pixel.blue);
       if (image->matte != MagickFalse)
-        SetOpacityPixelComponent(q,pixel.opacity);
+        SetPixelOpacity(q,pixel.opacity);
       q++;
     }
     if (((unsigned char) (tga_info.attributes & 0xc0) >> 6) == 4)
@@ -784,20 +784,20 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image)
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if (targa_info.image_type == TargaColormap)
-        *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+        *q++=(unsigned char) GetPixelIndex(indexes+x);
       else
         if (targa_info.image_type == TargaMonochrome)
           *q++=(unsigned char) ScaleQuantumToChar(PixelIntensityToQuantum(p));
         else
           {
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
             if (image->matte != MagickFalse)
               *q++=(unsigned char) ScaleQuantumToChar(
-                GetAlphaPixelComponent(p));
+                GetPixelAlpha(p));
             if (image->colorspace == CMYKColorspace)
-              *q++=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+              *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
           }
       p++;
     }
index 8e41dcb4b88757191c86d186911a3473d204bd9f..409079bdd45fdd7baad5755f7c9d3b06c14bc425 100644 (file)
@@ -1402,14 +1402,14 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           p=(unsigned char *) (((uint32 *) pixels)+image->columns*i);
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelRed(q,ScaleCharToQuantum((unsigned char)
               (TIFFGetR(*p))));
-            SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
               (TIFFGetG(*p))));
-            SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
               (TIFFGetB(*p))));
             if (image->matte != MagickFalse)
-              SetOpacityPixelComponent(q,ScaleCharToQuantum((unsigned char)
+              SetPixelOpacity(q,ScaleCharToQuantum((unsigned char)
                 (TIFFGetA(*p))));
             p++;
             q++;
@@ -1497,13 +1497,13 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
               if (image->matte != MagickFalse)
                 for (column=columns_remaining; column > 0; column--)
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelRed(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetR(*p)));
-                  SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetG(*p)));
-                  SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetB(*p)));
-                  SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetA(*p)));
                   q++;
                   p++;
@@ -1511,11 +1511,11 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
               else
                 for (column=columns_remaining; column > 0; column--)
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelRed(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetR(*p)));
-                  SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetG(*p)));
-                  SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+                  SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
                     TIFFGetB(*p)));
                   q++;
                   p++;
@@ -1583,14 +1583,14 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           q+=image->columns-1;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelRed(q,ScaleCharToQuantum((unsigned char)
               TIFFGetR(*p)));
-            SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
               TIFFGetG(*p)));
-            SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+            SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
               TIFFGetB(*p)));
             if (image->matte != MagickFalse)
-              SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+              SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
                 TIFFGetA(*p)));
             p--;
             q--;
index 2a3b2247b5baac2d4d8ec1b85a516c14c5dfa22f..03fde8ac06d31c5f1b9f93e1c809897ad437c02a 100644 (file)
@@ -264,13 +264,13 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           p=tim_pixels+y*bytes_per_line;
           for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           {
-            SetIndexPixelComponent(indexes+x,(*p) & 0x0f);
-            SetIndexPixelComponent(indexes+x+1,(*p >> 4) & 0x0f);
+            SetPixelIndex(indexes+x,(*p) & 0x0f);
+            SetPixelIndex(indexes+x+1,(*p >> 4) & 0x0f);
             p++;
           }
           if ((image->columns % 2) != 0)
             {
-              SetIndexPixelComponent(indexes+x,(*p >> 4) & 0x0f);
+              SetPixelIndex(indexes+x,(*p >> 4) & 0x0f);
               p++;
             }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -298,7 +298,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           indexes=GetAuthenticIndexQueue(image);
           p=tim_pixels+y*bytes_per_line;
           for (x=0; x < (ssize_t) image->columns; x++)
-            SetIndexPixelComponent(indexes+x,*p++);
+            SetPixelIndex(indexes+x,*p++);
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
           if (image->previous == (Image *) NULL)
@@ -326,11 +326,11 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             word=(*p++);
             word|=(*p++ << 8);
-            SetBluePixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+            SetPixelBlue(q,ScaleCharToQuantum(ScaleColor5to8(
               (1UL*word >> 10) & 0x1f)));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+            SetPixelGreen(q,ScaleCharToQuantum(ScaleColor5to8(
               (1UL*word >> 5) & 0x1f)));
-            SetRedPixelComponent(q,ScaleCharToQuantum(ScaleColor5to8(
+            SetPixelRed(q,ScaleCharToQuantum(ScaleColor5to8(
               (1UL*word >> 0) & 0x1f)));
             q++;
           }
@@ -359,9 +359,9 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-            SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+            SetPixelRed(q,ScaleCharToQuantum(*p++));
+            SetPixelGreen(q,ScaleCharToQuantum(*p++));
+            SetPixelBlue(q,ScaleCharToQuantum(*p++));
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 61263332304707350411c106aad4ddc34b517535..02082c782a10160c94a4dc2a8af3448f5f0537fe 100644 (file)
@@ -476,17 +476,17 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
         if (q == (PixelPacket *) NULL)
           continue;
-        SetRedPixelComponent(q,ScaleAnyToQuantum(pixel.red,range));
-        SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel.green,range));
-        SetBluePixelComponent(q,ScaleAnyToQuantum(pixel.blue,range));
+        SetPixelRed(q,ScaleAnyToQuantum(pixel.red,range));
+        SetPixelGreen(q,ScaleAnyToQuantum(pixel.green,range));
+        SetPixelBlue(q,ScaleAnyToQuantum(pixel.blue,range));
         if (image->colorspace == CMYKColorspace)
           {
             indexes=GetAuthenticIndexQueue(image);
-            SetIndexPixelComponent(indexes,ScaleAnyToQuantum(pixel.index,
+            SetPixelIndex(indexes,ScaleAnyToQuantum(pixel.index,
               range));
           }
         if (image->matte != MagickFalse)
-          SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel.opacity,range));
+          SetPixelAlpha(q,ScaleAnyToQuantum(pixel.opacity,range));
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
       }
index bbc64f89259a5a146185b408037a71870a54a370..15db2fc169c9e9ae34e3780795c3a3fe42964685 100644 (file)
@@ -248,7 +248,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              matte_image[i]=(unsigned char) (GetOpacityPixelComponent(p) ==
+              matte_image[i]=(unsigned char) (GetPixelOpacity(p) ==
                 (Quantum) TransparentOpacity ? 1 : 0);
               if (matte_image[i] != 0)
                 transparent=MagickTrue;
@@ -277,7 +277,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               if (matte_image[i] != 0)
-                SetIndexPixelComponent(indexes+x,image->colors);
+                SetPixelIndex(indexes+x,image->colors);
               p++;
             }
           }
@@ -355,11 +355,11 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
     (void) WriteBlobString(image,"    \"");
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      k=((ssize_t) GetIndexPixelComponent(indexes+x) % MaxCixels);
+      k=((ssize_t) GetPixelIndex(indexes+x) % MaxCixels);
       symbol[0]=Cixel[k];
       for (j=1; j < (int) characters_per_pixel; j++)
       {
-        k=(((int) GetIndexPixelComponent(indexes+x)-k)/MaxCixels) % MaxCixels;
+        k=(((int) GetPixelIndex(indexes+x)-k)/MaxCixels) % MaxCixels;
         symbol[j]=Cixel[k];
       }
       symbol[j]='\0';
index 0bd1ff4c28d5d0b87a2a7e2d51370c4ccf18c098..74be2507d2c36599a5667171cd22350d9edc409f 100644 (file)
@@ -158,13 +158,13 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
       y1=(unsigned char) ReadBlobByte(image);
       v=(unsigned char) ReadBlobByte(image);
       y2=(unsigned char) ReadBlobByte(image);
-      SetRedPixelComponent(q,ScaleCharToQuantum(y1));
-      SetGreenPixelComponent(q,ScaleCharToQuantum(u));
-      SetBluePixelComponent(q,ScaleCharToQuantum(v));
+      SetPixelRed(q,ScaleCharToQuantum(y1));
+      SetPixelGreen(q,ScaleCharToQuantum(u));
+      SetPixelBlue(q,ScaleCharToQuantum(v));
       q++;
-      SetRedPixelComponent(q,ScaleCharToQuantum(y2));
-      SetGreenPixelComponent(q,ScaleCharToQuantum(u));
-      SetBluePixelComponent(q,ScaleCharToQuantum(v));
+      SetPixelRed(q,ScaleCharToQuantum(y2));
+      SetPixelGreen(q,ScaleCharToQuantum(u));
+      SetPixelBlue(q,ScaleCharToQuantum(v));
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -338,17 +338,17 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
     {
       if (full != MagickFalse)
         {
-          pixel.green=(pixel.green+GetGreenPixelComponent(p))/2;
-          pixel.blue=(pixel.blue+GetBluePixelComponent(p))/2;
+          pixel.green=(pixel.green+GetPixelGreen(p))/2;
+          pixel.blue=(pixel.blue+GetPixelBlue(p))/2;
           (void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.green));
           (void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.red));
           (void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.blue));
           (void) WriteBlobByte(image,ScaleQuantumToChar(
-             GetRedPixelComponent(p)));
+             GetPixelRed(p)));
         }
-      pixel.red=(double) GetRedPixelComponent(p);
-      pixel.green=(double) GetGreenPixelComponent(p);
-      pixel.blue=(double) GetBluePixelComponent(p);
+      pixel.red=(double) GetPixelRed(p);
+      pixel.green=(double) GetPixelGreen(p);
+      pixel.blue=(double) GetPixelBlue(p);
       full=full == MagickFalse ? MagickTrue : MagickFalse;
       p++;
     }
index fe1c56723616ca9770d4ff71cddf91e2659528b9..8a32d077da21d6d3224d4348d923dc88da138e0c 100644 (file)
@@ -628,9 +628,9 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
             for (bit=0; bit < 8; bit++)
               if (PixelIntensity(q) < ((MagickRealType) QuantumRange/2.0))
                 {
-                  quantum=(size_t) GetIndexPixelComponent(indexes+x+bit);
+                  quantum=(size_t) GetPixelIndex(indexes+x+bit);
                   quantum|=0x01;
-                  SetIndexPixelComponent(indexes+x+bit,quantum);
+                  SetPixelIndex(indexes+x+bit,quantum);
                 }
             p++;
           }
@@ -639,9 +639,9 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
               for (bit=0; bit < (ssize_t) (image->columns % 8); bit++)
                 if (PixelIntensity(q) < ((MagickRealType) QuantumRange/2.0))
                   {
-                    quantum=(size_t) GetIndexPixelComponent(indexes+x+bit);
+                    quantum=(size_t) GetPixelIndex(indexes+x+bit);
                     quantum|=0x01;
-                    SetIndexPixelComponent(indexes+x+bit,quantum);
+                    SetPixelIndex(indexes+x+bit,quantum);
                   }
               p++;
             }
@@ -665,7 +665,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
             break;
           indexes=GetAuthenticIndexQueue(image);
           for (x=0; x < (ssize_t) image->columns; x++)
-            SetIndexPixelComponent(indexes+x,*p++);
+            SetPixelIndex(indexes+x,*p++);
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
           if (image->previous == (Image *) NULL)
@@ -689,19 +689,19 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*(p+number_pixels)));
-              SetBluePixelComponent(q,ScaleCharToQuantum(*(p+2*number_pixels)));
+              SetPixelRed(q,ScaleCharToQuantum(*p));
+              SetPixelGreen(q,ScaleCharToQuantum(*(p+number_pixels)));
+              SetPixelBlue(q,ScaleCharToQuantum(*(p+2*number_pixels)));
               if (image->colors != 0)
                 {
-                  SetRedPixelComponent(q,image->colormap[(ssize_t)
-                    GetRedPixelComponent(q)].red);
-                  SetGreenPixelComponent(q,image->colormap[(ssize_t)
-                    GetGreenPixelComponent(q)].green);
-                  SetBluePixelComponent(q,image->colormap[(ssize_t)
-                    GetBluePixelComponent(q)].blue);
+                  SetPixelRed(q,image->colormap[(ssize_t)
+                    GetPixelRed(q)].red);
+                  SetPixelGreen(q,image->colormap[(ssize_t)
+                    GetPixelGreen(q)].green);
+                  SetPixelBlue(q,image->colormap[(ssize_t)
+                    GetPixelBlue(q)].blue);
                 }
-              SetOpacityPixelComponent(q,image->matte != MagickFalse ?
+              SetPixelOpacity(q,image->matte != MagickFalse ?
                 QuantumRange-ScaleCharToQuantum(*(p+number_pixels*3)) :
                 OpaqueOpacity);
               p++;
@@ -1097,12 +1097,12 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            *q=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *(q+number_pixels)=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *(q+number_pixels*2)=ScaleQuantumToChar(GetBluePixelComponent(p));
+            *q=ScaleQuantumToChar(GetPixelRed(p));
+            *(q+number_pixels)=ScaleQuantumToChar(GetPixelGreen(p));
+            *(q+number_pixels*2)=ScaleQuantumToChar(GetPixelBlue(p));
             if (image->matte != MagickFalse)
               *(q+number_pixels*3)=ScaleQuantumToChar((Quantum)
-                (GetAlphaPixelComponent(p)));
+                (GetPixelAlpha(p)));
             p++;
             q++;
           }
@@ -1148,7 +1148,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
               break;
             indexes=GetVirtualIndexQueue(image);
             for (x=0; x < (ssize_t) image->columns; x++)
-              *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+              *q++=(unsigned char) GetPixelIndex(indexes+x);
             if (image->previous == (Image *) NULL)
               {
                 status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
index 23ff0b20c31f8cec381b80263ac785c2879b6ae4..4925b04c51a49062b971e5db88aac284d169af5d 100644 (file)
@@ -201,7 +201,7 @@ static Image *ReadWBMPImage(const ImageInfo *image_info,
           if (byte == EOF)
             ThrowReaderException(CorruptImageError,"CorruptImage");
         }
-      SetIndexPixelComponent(indexes+x,(byte & (0x01 << (7-bit))) ? 1 : 0);
+      SetPixelIndex(indexes+x,(byte & (0x01 << (7-bit))) ? 1 : 0);
       bit++;
       if (bit == 8)
         bit=0;
index 8bb52bafea9dfbdba2ac3ee99abab631546d1bd8..e45b6dbc179341599d428f339d7a67510e7e2b2f 100644 (file)
@@ -170,10 +170,10 @@ static Image *ReadWEBPImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-      SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-      SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-      SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+      SetPixelRed(q,ScaleCharToQuantum(*p++));
+      SetPixelGreen(q,ScaleCharToQuantum(*p++));
+      SetPixelBlue(q,ScaleCharToQuantum(*p++));
+      SetPixelAlpha(q,ScaleCharToQuantum(*p++));
       if (q->opacity != OpaqueOpacity)
         image->matte=MagickTrue;
       q++;
@@ -371,12 +371,12 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-      *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-      *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+      *q++=ScaleQuantumToChar(GetPixelRed(p));
+      *q++=ScaleQuantumToChar(GetPixelGreen(p));
+      *q++=ScaleQuantumToChar(GetPixelBlue(p));
       if (image->matte != MagickFalse)
         *q++=ScaleQuantumToChar((Quantum) (QuantumRange-
-          (image->matte != MagickFalse ? GetOpacityPixelComponent(p) :
+          (image->matte != MagickFalse ? GetPixelOpacity(p) :
           OpaqueOpacity)));
       p++;
     }
index 28ee1bd00d34965408f443ec4264a34eb24139ff..fb870b2c994ddc0fbe83675b8f643f6b29ddc576 100644 (file)
@@ -296,8 +296,8 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             for (bit=0; bit < 8; bit++)
               {
                 index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
-                SetIndexPixelComponent(indexes+x+bit,index);
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+                SetPixelIndex(indexes+x+bit,index);
+                SetPixelRGBO(q,image->colormap+(ssize_t) index);
                 q++;
               }
             p++;
@@ -307,8 +307,8 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             for (bit=0; bit < (ssize_t) (image->columns % 8); bit++)
               {
                 index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
-                SetIndexPixelComponent(indexes+x+bit,index);
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+                SetPixelIndex(indexes+x+bit,index);
+                SetPixelRGBO(q,image->colormap+(ssize_t) index);
                 q++;
               }
             p++;
@@ -326,42 +326,42 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
         {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             q++;
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             q++;
             index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             q++;
             index=ConstrainColormapIndex(image,(*p) & 0x3);
-            SetIndexPixelComponent(indexes+x+1,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x+1,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             p++;
             q++;
         }
        if ((image->columns % 4) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             q++;
             if ((image->columns % 4) >= 1)
 
               {
                 index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
-                SetIndexPixelComponent(indexes+x,index);
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+                SetPixelIndex(indexes+x,index);
+                SetPixelRGBO(q,image->colormap+(ssize_t) index);
                 q++;
                 if ((image->columns % 4) >= 2)
 
                   {
                     index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
-                    SetIndexPixelComponent(indexes+x,index);
-                    SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+                    SetPixelIndex(indexes+x,index);
+                    SetPixelRGBO(q,image->colormap+(ssize_t) index);
                     q++;
                   }
               }
@@ -381,20 +381,20 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           { 
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             q++;
             index=ConstrainColormapIndex(image,(*p) & 0x0f);
-            SetIndexPixelComponent(indexes+x+1,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x+1,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             p++;
             q++;
           }
         if ((image->columns % 2) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             p++;
             q++;
           }
@@ -411,8 +411,8 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
         for (x=0; x < (ssize_t) image->columns; x++)
           {
             index=ConstrainColormapIndex(image,*p);
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             p++;
             q++;
           }
@@ -427,9 +427,9 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-          SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-          SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+          SetPixelRed(q,ScaleCharToQuantum(*p++));
+          SetPixelGreen(q,ScaleCharToQuantum(*p++));
+          SetPixelBlue(q,ScaleCharToQuantum(*p++));
           q++;
         }
       if (!SyncAuthenticPixels(image,exception))
index b7ef7303b06039bc07c8d59398f9e0877c860b41..4c7c673a8014a488f9cc6cc00edee58d14864a96 100644 (file)
@@ -363,7 +363,7 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
     {
       if (bit == 0)
         byte=(size_t) (*p++);
-      SetIndexPixelComponent(indexes+x,(byte & 0x01) != 0 ? 0x01 : 0x00);
+      SetPixelIndex(indexes+x,(byte & 0x01) != 0 ? 0x01 : 0x00);
       bit++;
       byte>>=1;
       if (bit == 8)
index 5f748dfa53611ed3a28f24e221d80edea94b9db3..9dea59a0f02fdff01d91f48a045e5f8af3dbc110 100644 (file)
@@ -152,7 +152,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         indexes=GetAuthenticIndexQueue(image);
         for (x=0; x < (ssize_t) image->columns; x++)
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
       }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index f344832452a2cd6a42bd60eeac27bca054d21f0a..b77f10b928bc699280ca76e9757d13eb04b24a04 100644 (file)
@@ -374,10 +374,10 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image,
       {
         for (x=0; x < (ssize_t) tile_image->columns; x++)
         {
-          SetRedPixelComponent(q,ScaleCharToQuantum(*graydata));
-          SetGreenPixelComponent(q,GetRedPixelComponent(q));
-          SetBluePixelComponent(q,GetRedPixelComponent(q));
-          SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char)
+          SetPixelRed(q,ScaleCharToQuantum(*graydata));
+          SetPixelGreen(q,GetPixelRed(q));
+          SetPixelBlue(q,GetPixelRed(q));
+          SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
             inLayerInfo->opacity));
           graydata++;
           q++;
@@ -388,10 +388,10 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image,
         {
           for (x=0; x < (ssize_t) tile_image->columns; x++)
           {
-            SetRedPixelComponent(q,ScaleCharToQuantum(xcfdata->red));
-            SetGreenPixelComponent(q,ScaleCharToQuantum(xcfdata->green));
-            SetBluePixelComponent(q,ScaleCharToQuantum(xcfdata->blue));
-            SetAlphaPixelComponent(q,xcfdata->opacity == 0U ?  OpaqueOpacity :
+            SetPixelRed(q,ScaleCharToQuantum(xcfdata->red));
+            SetPixelGreen(q,ScaleCharToQuantum(xcfdata->green));
+            SetPixelBlue(q,ScaleCharToQuantum(xcfdata->blue));
+            SetPixelAlpha(q,xcfdata->opacity == 0U ?  OpaqueOpacity :
               ScaleCharToQuantum((unsigned char) inLayerInfo->opacity));
             xcfdata++;
             q++;
@@ -474,36 +474,36 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image,
               {
                 case 0:
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum(data));
+                  SetPixelRed(q,ScaleCharToQuantum(data));
                   if (inDocInfo->image_type == GIMP_GRAY)
                     {
-                      SetGreenPixelComponent(q,ScaleCharToQuantum(data));
-                      SetBluePixelComponent(q,ScaleCharToQuantum(data));
-                      SetAlphaPixelComponent(q,ScaleCharToQuantum(
+                      SetPixelGreen(q,ScaleCharToQuantum(data));
+                      SetPixelBlue(q,ScaleCharToQuantum(data));
+                      SetPixelAlpha(q,ScaleCharToQuantum(
                         (unsigned char) inLayerInfo->opacity));
                     }
                   else
                     {
-                      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                      SetBluePixelComponent(q,GetRedPixelComponent(q));
-                      SetAlphaPixelComponent(q,ScaleCharToQuantum(
+                      SetPixelGreen(q,GetPixelRed(q));
+                      SetPixelBlue(q,GetPixelRed(q));
+                      SetPixelAlpha(q,ScaleCharToQuantum(
                         (unsigned char) inLayerInfo->opacity));
                     }
                   break;
                 }
                 case 1:
                 {
-                  SetGreenPixelComponent(q,ScaleCharToQuantum(data));
+                  SetPixelGreen(q,ScaleCharToQuantum(data));
                   break;
                 }
                 case 2:
                 {
-                  SetBluePixelComponent(q,ScaleCharToQuantum(data));
+                  SetPixelBlue(q,ScaleCharToQuantum(data));
                   break;
                 }
                 case 3:
                 {
-                  SetAlphaPixelComponent(q,data == 0 ? OpaqueOpacity :
+                  SetPixelAlpha(q,data == 0 ? OpaqueOpacity :
                     ScaleCharToQuantum((unsigned char) inLayerInfo->opacity));
                   break;
                 }
@@ -534,36 +534,36 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image,
               {
                 case 0:
                 {
-                  SetRedPixelComponent(q,ScaleCharToQuantum(data));
+                  SetPixelRed(q,ScaleCharToQuantum(data));
                   if (inDocInfo->image_type == GIMP_GRAY)
                     {
-                      SetGreenPixelComponent(q,ScaleCharToQuantum(data));
-                      SetBluePixelComponent(q,ScaleCharToQuantum(data));
-                      SetAlphaPixelComponent(q,ScaleCharToQuantum(
+                      SetPixelGreen(q,ScaleCharToQuantum(data));
+                      SetPixelBlue(q,ScaleCharToQuantum(data));
+                      SetPixelAlpha(q,ScaleCharToQuantum(
                         (unsigned char) inLayerInfo->opacity));
                     }
                   else
                     {
-                      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                      SetBluePixelComponent(q,GetRedPixelComponent(q));
-                      SetAlphaPixelComponent(q,ScaleCharToQuantum(
+                      SetPixelGreen(q,GetPixelRed(q));
+                      SetPixelBlue(q,GetPixelRed(q));
+                      SetPixelAlpha(q,ScaleCharToQuantum(
                         (unsigned char) inLayerInfo->opacity));
                     }
                   break;
                 }
                 case 1:
                 {
-                  SetGreenPixelComponent(q,ScaleCharToQuantum(data));
+                  SetPixelGreen(q,ScaleCharToQuantum(data));
                   break;
                 }
                 case 2:
                 {
-                  SetBluePixelComponent(q,ScaleCharToQuantum(data));
+                  SetPixelBlue(q,ScaleCharToQuantum(data));
                   break;
                 }
                 case 3:
                 {
-                  SetAlphaPixelComponent(q,data == 0 ? OpaqueOpacity :
+                  SetPixelAlpha(q,data == 0 ? OpaqueOpacity :
                     ScaleCharToQuantum((unsigned char) inLayerInfo->opacity));
                   break;
                 }
index caad028d738494102bb3dd2c506546b5f299868e..6b10e005096950fc72f032e4b53453640b264573 100644 (file)
@@ -406,7 +406,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           (void) CopyXPMColor(key,p,(size_t) width);
           j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
           if (image->storage_class == PseudoClass)
-            SetIndexPixelComponent(indexes+x,j);
+            SetPixelIndex(indexes+x,j);
           *r=image->colormap[j];
           r++;
           p+=width;
@@ -687,7 +687,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
               if (q->opacity == (Quantum) TransparentOpacity)
                 transparent=MagickTrue;
               else
-                SetOpacityPixelComponent(q,OpaqueOpacity);
+                SetPixelOpacity(q,OpaqueOpacity);
               q++;
             }
             if (SyncAuthenticPixels(picon,exception) == MagickFalse)
@@ -716,7 +716,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
         for (x=0; x < (ssize_t) picon->columns; x++)
         {
           if (q->opacity == (Quantum) TransparentOpacity)
-            SetIndexPixelComponent(indexes+x,picon->colors);
+            SetPixelIndex(indexes+x,picon->colors);
           q++;
         }
         if (SyncAuthenticPixels(picon,exception) == MagickFalse)
@@ -787,11 +787,11 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
     (void) WriteBlobString(image,"\"");
     for (x=0; x < (ssize_t) picon->columns; x++)
     {
-      k=((ssize_t) GetIndexPixelComponent(indexes+x) % MaxCixels);
+      k=((ssize_t) GetPixelIndex(indexes+x) % MaxCixels);
       symbol[0]=Cixel[k];
       for (j=1; j < (ssize_t) characters_per_pixel; j++)
       {
-        k=(((int) GetIndexPixelComponent(indexes+x)-k)/MaxCixels) % MaxCixels;
+        k=(((int) GetPixelIndex(indexes+x)-k)/MaxCixels) % MaxCixels;
         symbol[j]=Cixel[k];
       }
       symbol[j]='\0';
@@ -1018,11 +1018,11 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image)
     (void) WriteBlobString(image,"\"");
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      k=((ssize_t) GetIndexPixelComponent(indexes+x) % MaxCixels);
+      k=((ssize_t) GetPixelIndex(indexes+x) % MaxCixels);
       symbol[0]=Cixel[k];
       for (j=1; j < (ssize_t) characters_per_pixel; j++)
       {
-        k=(((int) GetIndexPixelComponent(indexes+x)-k)/MaxCixels) % MaxCixels;
+        k=(((int) GetPixelIndex(indexes+x)-k)/MaxCixels) % MaxCixels;
         symbol[j]=Cixel[k];
       }
       symbol[j]='\0';
index f28c21ee1d625dc63355a5eb6514eb6e5b8f7530..6b276f6af5935784f3be1e3de5a1c6d4d03de6de 100644 (file)
@@ -405,13 +405,13 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               pixel=XGetPixel(ximage,(int) x,(int) y);
               index=(IndexPacket) ((pixel >> red_shift) & red_mask);
-              SetRedPixelComponent(q,ScaleShortToQuantum(colors[(ssize_t)
+              SetPixelRed(q,ScaleShortToQuantum(colors[(ssize_t)
                 index].red));
               index=(IndexPacket) ((pixel >> green_shift) & green_mask);
-              SetGreenPixelComponent(q,ScaleShortToQuantum(colors[(ssize_t)
+              SetPixelGreen(q,ScaleShortToQuantum(colors[(ssize_t)
                 index].green));
               index=(IndexPacket) ((pixel >> blue_shift) & blue_mask);
-              SetBluePixelComponent(q,ScaleShortToQuantum(colors[(ssize_t)
+              SetPixelBlue(q,ScaleShortToQuantum(colors[(ssize_t)
                 index].blue));
               q++;
             }
@@ -433,15 +433,15 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
               pixel=XGetPixel(ximage,(int) x,(int) y);
               color=(pixel >> red_shift) & red_mask;
               color=(color*65535UL)/red_mask;
-              SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+              SetPixelRed(q,ScaleShortToQuantum((unsigned short)
                 color));
               color=(pixel >> green_shift) & green_mask;
               color=(color*65535UL)/green_mask;
-              SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+              SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
                 color));
               color=(pixel >> blue_shift) & blue_mask;
               color=(color*65535UL)/blue_mask;
-              SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+              SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
                 color));
               q++;
             }
@@ -477,8 +477,8 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x,
               (int) y));
-            SetIndexPixelComponent(indexes+x,index);
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+            SetPixelIndex(indexes+x,index);
+            SetPixelRGBO(q,image->colormap+(ssize_t) index);
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -769,14 +769,14 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image)
       {
         indexes=GetVirtualIndexQueue(image);
         for (x=0; x < (ssize_t) image->columns; x++)
-          *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
+          *q++=(unsigned char) GetPixelIndex(indexes+x);
       }
     else
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+        *q++=ScaleQuantumToChar(GetPixelRed(p));
+        *q++=ScaleQuantumToChar(GetPixelGreen(p));
+        *q++=ScaleQuantumToChar(GetPixelBlue(p));
         p++;
       }
     for (x=0; x < (ssize_t) scanline_pad; x++)
index c596d24a907f19630b71c72e2eb1b988f91faa55..d73c28879cbad7c9d2fb7c92bb34c6e48529ea6d 100644 (file)
@@ -244,11 +244,11 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
+                SetPixelGreen(q,GetPixelGreen(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 if (image->matte != MagickFalse)
-                  SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                  SetPixelOpacity(q,GetPixelOpacity(p));
                 p++;
                 q++;
               }
@@ -320,22 +320,22 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                   {
                     case RedQuantum:
                     {
-                      SetRedPixelComponent(q,GetRedPixelComponent(p));
+                      SetPixelRed(q,GetPixelRed(p));
                       break;
                     }
                     case GreenQuantum:
                     {
-                      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                      SetPixelGreen(q,GetPixelGreen(p));
                       break;
                     }
                     case BlueQuantum:
                     {
-                      SetBluePixelComponent(q,GetBluePixelComponent(p));
+                      SetPixelBlue(q,GetPixelBlue(p));
                       break;
                     }
                     case OpacityQuantum:
                     {
-                      SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                      SetPixelOpacity(q,GetPixelOpacity(p));
                       break;
                     }
                     default:
@@ -397,7 +397,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -440,7 +440,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -483,7 +483,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -529,7 +529,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
@@ -607,7 +607,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,GetRedPixelComponent(p));
+                SetPixelRed(q,GetPixelRed(p));
                 p++;
                 q++;
               }
@@ -669,7 +669,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetGreenPixelComponent(q,GetGreenPixelComponent(p));
+                SetPixelGreen(q,GetPixelGreen(p));
                 p++;
                 q++;
               }
@@ -731,7 +731,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetBluePixelComponent(q,GetBluePixelComponent(p));
+                SetPixelBlue(q,GetPixelBlue(p));
                 p++;
                 q++;
               }
@@ -796,7 +796,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
-                    SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+                    SetPixelOpacity(q,GetPixelOpacity(p));
                     p++;
                     q++;
                   }
index 7d1a3b1db82495254c7004aa831905ab9840fcb5..35945be92643c3b438c1bec2945e98db88c85fa8 100644 (file)
@@ -238,41 +238,41 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) image->columns; x+=2)
           {
-            SetRedPixelComponent(chroma_pixels,0);
+            SetPixelRed(chroma_pixels,0);
             if (quantum == 1)
-              SetGreenPixelComponent(chroma_pixels,ScaleCharToQuantum(*p++));
+              SetPixelGreen(chroma_pixels,ScaleCharToQuantum(*p++));
             else
               {
-                SetGreenPixelComponent(chroma_pixels,ScaleShortToQuantum(
+                SetPixelGreen(chroma_pixels,ScaleShortToQuantum(
                   ((*p) << 8) | *(p+1)));
                 p+=2;
               }
             if (quantum == 1)
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
             else
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum(((*p) << 8) |
+                SetPixelRed(q,ScaleShortToQuantum(((*p) << 8) |
                   *(p+1)));
                 p+=2;
               }
-            SetGreenPixelComponent(q,0);
-            SetBluePixelComponent(q,0);
+            SetPixelGreen(q,0);
+            SetPixelBlue(q,0);
             q++;
-            SetGreenPixelComponent(q,0);
-            SetBluePixelComponent(q,0);
+            SetPixelGreen(q,0);
+            SetPixelBlue(q,0);
             if (quantum == 1)
-              SetBluePixelComponent(chroma_pixels,ScaleCharToQuantum(*p++));
+              SetPixelBlue(chroma_pixels,ScaleCharToQuantum(*p++));
             else
               {
-                SetBluePixelComponent(chroma_pixels,ScaleShortToQuantum(
+                SetPixelBlue(chroma_pixels,ScaleShortToQuantum(
                   ((*p) << 8) | *(p+1)));
                 p+=2;
               }
             if (quantum == 1)
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
             else
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum(((*p) << 8) |
+                SetPixelRed(q,ScaleShortToQuantum(((*p) << 8) |
                   *(p+1)));
                 p+=2;
               }
@@ -291,15 +291,15 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             if (quantum == 1)
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
             else
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum(((*p) << 8) |
+                SetPixelRed(q,ScaleShortToQuantum(((*p) << 8) |
                   *(p+1)));
                 p+=2;
               }
-            SetGreenPixelComponent(q,0);
-            SetBluePixelComponent(q,0);
+            SetPixelGreen(q,0);
+            SetPixelBlue(q,0);
             q++;
           }
         }
@@ -339,16 +339,16 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           for (x=0; x < (ssize_t) chroma_image->columns; x++)
           {
-            SetRedPixelComponent(q,0);
+            SetPixelRed(q,0);
             if (quantum == 1)
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
             else
               {
-                SetGreenPixelComponent(q,ScaleShortToQuantum(((*p) << 8) |
+                SetPixelGreen(q,ScaleShortToQuantum(((*p) << 8) |
                   *(p+1)));
                 p+=2;
               }
-            SetBluePixelComponent(q,0);
+            SetPixelBlue(q,0);
             q++;
           }
           if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
@@ -376,10 +376,10 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) chroma_image->columns; x++)
         {
           if (quantum == 1)
-            SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+            SetPixelBlue(q,ScaleCharToQuantum(*p++));
           else
             {
-              SetBluePixelComponent(q,ScaleShortToQuantum(((*p) << 8) |
+              SetPixelBlue(q,ScaleShortToQuantum(((*p) << 8) |
                 *(p+1)));
               p+=2;
             }
@@ -407,8 +407,8 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetGreenPixelComponent(q,GetGreenPixelComponent(chroma_pixels));
-        SetBluePixelComponent(q,GetBluePixelComponent(chroma_pixels));
+        SetPixelGreen(q,GetPixelGreen(chroma_pixels));
+        SetPixelBlue(q,GetPixelBlue(chroma_pixels));
         chroma_pixels++;
         q++;
       }
@@ -672,26 +672,26 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
             if (quantum == 1)
               {
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
-                  GetGreenPixelComponent(s)));
+                  GetPixelGreen(s)));
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
-                  GetRedPixelComponent(p)));
+                  GetPixelRed(p)));
                 p++;
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
-                  GetBluePixelComponent(s)));
+                  GetPixelBlue(s)));
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
-                  GetRedPixelComponent(p)));
+                  GetPixelRed(p)));
               }
             else
               {
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
-                  GetGreenPixelComponent(s)));
+                  GetPixelGreen(s)));
                 (void) WriteBlobShort(image,ScaleQuantumToShort(
-                  GetRedPixelComponent(p)));
+                  GetPixelRed(p)));
                 p++;
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
-                  GetBluePixelComponent(s)));
+                  GetPixelBlue(s)));
                 (void) WriteBlobShort(image,ScaleQuantumToShort(
-                  GetRedPixelComponent(p)));
+                  GetPixelRed(p)));
               }
             p++;
             s++;
@@ -722,10 +722,10 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
           {
             if (quantum == 1)
               (void) WriteBlobByte(image,ScaleQuantumToChar(
-                GetRedPixelComponent(p)));
+                GetPixelRed(p)));
             else
               (void) WriteBlobShort(image,ScaleQuantumToShort(
-                GetRedPixelComponent(p)));
+                GetPixelRed(p)));
             p++;
           }
           if (image->previous == (Image *) NULL)
@@ -765,10 +765,10 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
           {
             if (quantum == 1)
               (void) WriteBlobByte(image,ScaleQuantumToChar(
-                GetGreenPixelComponent(p)));
+                GetPixelGreen(p)));
             else
               (void) WriteBlobShort(image,ScaleQuantumToShort(
-                GetGreenPixelComponent(p)));
+                GetPixelGreen(p)));
             p++;
           }
         }
@@ -800,10 +800,10 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
           {
             if (quantum == 1)
               (void) WriteBlobByte(image,ScaleQuantumToChar(
-                GetBluePixelComponent(p)));
+                GetPixelBlue(p)));
             else
               (void) WriteBlobShort(image,ScaleQuantumToShort(
-                GetBluePixelComponent(p)));
+                GetPixelBlue(p)));
             p++;
           }
         }
index b993e73b070fda3f131ddebe0aed958c291574c1..43905f7e68ec4cf29b4ef01b88bb218e4b043264 100644 (file)
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x670"/>
   <configure name="LIB_VERSION_NUMBER" value="6,7,0,9"/>
   <configure name="SVN_REVISION" value="4615" />
-  <configure name="RELEASE_DATE" value="2011-06-15"/>
+  <configure name="RELEASE_DATE" value="2011-06-25"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
index 6606a1494f73fc2610489d578adfa0146fd78183..69778fcb1b702eb85f87af216af017e1cd73d3c0 100644 (file)
@@ -165,7 +165,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         }
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        ConvertRGBToHSB(GetRedPixelComponent(p),GetGreenPixelComponent(p),GetBluePixelComponent(p),&hue,&saturation,&brightness);
+        ConvertRGBToHSB(GetPixelRed(p),GetPixelGreen(p),GetPixelBlue(p),&hue,&saturation,&brightness);
         brightness*=QuantumRange;
         brightness_sum_x+=brightness;
         brightness_sum_x2+=brightness*brightness;
index 8933e44e494720b9046f764403de0d3f7c099936..3c355fca094f0c26b53cecc2a43310d9048db3df 100644 (file)
@@ -1791,12 +1791,12 @@ static MagickBooleanType RenderPostscript(Image *image,
         for (x=0; x < (ssize_t) annotate_image->columns; x++)
         {
           (void) GetFillColor(draw_info,x,y,&fill_color);
-          SetAlphaPixelComponent(q,ClampToQuantum((((QuantumRange-
+          SetPixelAlpha(q,ClampToQuantum((((QuantumRange-
             (MagickRealType) PixelIntensityToQuantum(q))*(QuantumRange-
             fill_color.opacity))/QuantumRange)));
-          SetRedPixelComponent(q,fill_color.red);
-          SetGreenPixelComponent(q,fill_color.green);
-          SetBluePixelComponent(q,fill_color.blue);
+          SetPixelRed(q,fill_color.red);
+          SetPixelGreen(q,fill_color.green);
+          SetPixelBlue(q,fill_color.blue);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(annotate_view,exception);
index c4fee6ac41fb09a0f58428e279f8c1d9f9404730..f58c794e5e6339aaefe9284fcce11057dae25954 100644 (file)
@@ -344,13 +344,13 @@ MagickExport size_t GetImageChannelDepth(const Image *image,
           status=0;
           range=GetQuantumRange(current_depth[id]);
           if ((channel & RedChannel) != 0)
-            status|=GetRedPixelComponent(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetRedPixelComponent(p),
+            status|=GetPixelRed(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelRed(p),
               range),range);
           if ((channel & GreenChannel) != 0)
-            status|=GetGreenPixelComponent(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetGreenPixelComponent(p),
+            status|=GetPixelGreen(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelGreen(p),
               range),range);
           if ((channel & BlueChannel) != 0)
-            status|=GetBluePixelComponent(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetBluePixelComponent(p),
+            status|=GetPixelBlue(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelBlue(p),
               range),range);
           if (status == 0)
             break;
@@ -402,21 +402,21 @@ MagickExport size_t GetImageChannelDepth(const Image *image,
         status=0;
         range=GetQuantumRange(current_depth[id]);
         if ((channel & RedChannel) != 0)
-          status|=GetRedPixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetRedPixelComponent(p),range),range);
+          status|=GetPixelRed(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelRed(p),range),range);
         if ((channel & GreenChannel) != 0)
-          status|=GetGreenPixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetGreenPixelComponent(p),range),range);
+          status|=GetPixelGreen(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelGreen(p),range),range);
         if ((channel & BlueChannel) != 0)
-          status|=GetBluePixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetBluePixelComponent(p),range),range);
+          status|=GetPixelBlue(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelBlue(p),range),range);
         if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
-          status|=GetOpacityPixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetOpacityPixelComponent(p),range),range);
+          status|=GetPixelOpacity(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelOpacity(p),range),range);
         if (((channel & IndexChannel) != 0) &&
             (image->colorspace == CMYKColorspace))
-          status|=GetIndexPixelComponent(indexes+x) !=
-            ScaleAnyToQuantum(ScaleQuantumToAny(GetIndexPixelComponent(indexes+
+          status|=GetPixelIndex(indexes+x) !=
+            ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelIndex(indexes+
             x),range),range);
         if (status == 0)
           break;
@@ -778,7 +778,7 @@ MagickExport MagickBooleanType IsOpaqueImage(const Image *image,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+      if (GetPixelOpacity(p) != OpaqueOpacity)
         break;
       p++;
     }
@@ -885,21 +885,21 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
-          GetRedPixelComponent(q),range),range));
+        SetPixelRed(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+          GetPixelRed(q),range),range));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
-          GetGreenPixelComponent(q),range),range));
+        SetPixelGreen(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+          GetPixelGreen(q),range),range));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
-          GetBluePixelComponent(q),range),range));
+        SetPixelBlue(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+          GetPixelBlue(q),range),range));
       if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
-        SetOpacityPixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
-          GetOpacityPixelComponent(q),range),range));
+        SetPixelOpacity(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+          GetPixelOpacity(q),range),range));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(ScaleQuantumToAny(
-          GetIndexPixelComponent(indexes+x),range),range));
+        SetPixelIndex(indexes+x,ScaleAnyToQuantum(ScaleQuantumToAny(
+          GetPixelIndex(indexes+x),range),range));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index f44526cacd57c4adf85a64bdc14a52928788adef..7bdb875bc47cb20b4aee6911ccd91f40aef25322 100644 (file)
@@ -460,12 +460,12 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image,
       break;
     if (PixelIntensityToQuantum(r) > ((Quantum) QuantumRange/2))
       {
-        SetRedPixelComponent(q,GetRedPixelComponent(p));
-        SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-        SetBluePixelComponent(q,GetBluePixelComponent(p));
-        SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+        SetPixelRed(q,GetPixelRed(p));
+        SetPixelGreen(q,GetPixelGreen(p));
+        SetPixelBlue(q,GetPixelBlue(p));
+        SetPixelOpacity(q,GetPixelOpacity(p));
         if (cache_info->active_index_channel != MagickFalse)
-          SetIndexPixelComponent(nexus_indexes+i,GetIndexPixelComponent(
+          SetPixelIndex(nexus_indexes+i,GetPixelIndex(
             indexes+i));
       }
     p++;
@@ -2202,7 +2202,6 @@ MagickExport MagickBooleanType GetOneAuthenticPixel(Image *image,
        (GetOneAuthenticPixelFromHandler) NULL)
     return(cache_info->methods.get_one_authentic_pixel_from_handler(image,x,y,
       pixel,exception));
-  *pixel=image->background_color;
   pixels=GetAuthenticPixelsCache(image,x,y,1UL,1UL,exception);
   if (pixels == (PixelPacket *) NULL)
     return(MagickFalse);
@@ -3314,35 +3313,35 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
   {
     case BlackVirtualPixelMethod:
     {
-      SetRedPixelComponent(&virtual_pixel,0);
-      SetGreenPixelComponent(&virtual_pixel,0);
-      SetBluePixelComponent(&virtual_pixel,0);
-      SetOpacityPixelComponent(&virtual_pixel,OpaqueOpacity);
+      SetPixelRed(&virtual_pixel,0);
+      SetPixelGreen(&virtual_pixel,0);
+      SetPixelBlue(&virtual_pixel,0);
+      SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
       break;
     }
     case GrayVirtualPixelMethod:
     {
-      SetRedPixelComponent(&virtual_pixel,QuantumRange/2);
-      SetGreenPixelComponent(&virtual_pixel,QuantumRange/2);
-      SetBluePixelComponent(&virtual_pixel,QuantumRange/2);
-      SetOpacityPixelComponent(&virtual_pixel,OpaqueOpacity);
+      SetPixelRed(&virtual_pixel,QuantumRange/2);
+      SetPixelGreen(&virtual_pixel,QuantumRange/2);
+      SetPixelBlue(&virtual_pixel,QuantumRange/2);
+      SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
       break;
     }
     case TransparentVirtualPixelMethod:
     {
-      SetRedPixelComponent(&virtual_pixel,0);
-      SetGreenPixelComponent(&virtual_pixel,0);
-      SetBluePixelComponent(&virtual_pixel,0);
-      SetOpacityPixelComponent(&virtual_pixel,TransparentOpacity);
+      SetPixelRed(&virtual_pixel,0);
+      SetPixelGreen(&virtual_pixel,0);
+      SetPixelBlue(&virtual_pixel,0);
+      SetPixelOpacity(&virtual_pixel,TransparentOpacity);
       break;
     }
     case MaskVirtualPixelMethod:
     case WhiteVirtualPixelMethod:
     {
-      SetRedPixelComponent(&virtual_pixel,QuantumRange);
-      SetGreenPixelComponent(&virtual_pixel,QuantumRange);
-      SetBluePixelComponent(&virtual_pixel,QuantumRange);
-      SetOpacityPixelComponent(&virtual_pixel,OpaqueOpacity);
+      SetPixelRed(&virtual_pixel,QuantumRange);
+      SetPixelGreen(&virtual_pixel,QuantumRange);
+      SetPixelBlue(&virtual_pixel,QuantumRange);
+      SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
       break;
     }
     default:
@@ -3912,12 +3911,12 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
     SetMagickPixelPacket(image,q,nexus_indexes+i,&beta);
     MagickPixelCompositeMask(&beta,(MagickRealType) PixelIntensityToQuantum(r),
       &alpha,alpha.opacity,&beta);
-    SetRedPixelComponent(q,ClampToQuantum(beta.red));
-    SetGreenPixelComponent(q,ClampToQuantum(beta.green));
-    SetBluePixelComponent(q,ClampToQuantum(beta.blue));
-    SetOpacityPixelComponent(q,ClampToQuantum(beta.opacity));
+    SetPixelRed(q,ClampToQuantum(beta.red));
+    SetPixelGreen(q,ClampToQuantum(beta.green));
+    SetPixelBlue(q,ClampToQuantum(beta.blue));
+    SetPixelOpacity(q,ClampToQuantum(beta.opacity));
     if (cache_info->active_index_channel != MagickFalse)
-      SetIndexPixelComponent(nexus_indexes+i,GetIndexPixelComponent(indexes+i));
+      SetPixelIndex(nexus_indexes+i,GetPixelIndex(indexes+i));
     p++;
     q++;
     r++;
index 93b7292bdc740b27f1e3dc041dfb0a016adf42c8..77482aede9dec929eee02ecb6cda2ff19b13e424 100644 (file)
@@ -29,17 +29,17 @@ extern "C" {
 static inline MagickBooleanType IsColorEqual(const PixelPacket *p,
   const PixelPacket *q)
 {
-  if ((GetRedPixelComponent(p) == GetRedPixelComponent(q)) &&
-      (GetGreenPixelComponent(p) == GetGreenPixelComponent(q)) &&
-      (GetBluePixelComponent(p) == GetBluePixelComponent(q)))
+  if ((GetPixelRed(p) == GetPixelRed(q)) &&
+      (GetPixelGreen(p) == GetPixelGreen(q)) &&
+      (GetPixelBlue(p) == GetPixelBlue(q)))
     return(MagickTrue);
   return(MagickFalse);
 }
 
 static inline MagickBooleanType IsGray(const PixelPacket *pixel)
 {
-  if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
-      (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+  if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
     return(MagickTrue);
   return(MagickFalse);
 }
@@ -135,34 +135,34 @@ static inline MagickRealType PixelIntensity(const PixelPacket *pixel)
   MagickRealType
     intensity;
 
-  if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
-      (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+  if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
     return((MagickRealType) pixel->red);
-  intensity=(MagickRealType) (0.299*GetRedPixelComponent(pixel)+0.587*
-    GetGreenPixelComponent(pixel)+0.114*GetBluePixelComponent(pixel));
+  intensity=(MagickRealType) (0.299*GetPixelRed(pixel)+0.587*
+    GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel));
   return(intensity);
 }
 
 static inline Quantum PixelIntensityToQuantum(const PixelPacket *pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
-      (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
-    return(GetRedPixelComponent(pixel));
-  return((Quantum) (0.299*GetRedPixelComponent(pixel)+0.587*
-    GetGreenPixelComponent(pixel)+0.114*GetBluePixelComponent(pixel)+0.5));
+  if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
+    return(GetPixelRed(pixel));
+  return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
+    GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)+0.5));
 #else
   {
     double
       alpha,
       beta;
 
-    alpha=GetRedPixelComponent(pixel)-GetGreenPixelComponent(pixel);
-    beta=GetGreenPixelComponent(pixel)-GetBluePixelComponent(pixel);
+    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
+    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
     if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
-      return(GetRedPixelComponent(pixel));
-    return((Quantum) (0.299*GetRedPixelComponent(pixel)+0.587*
-      GetGreenPixelComponent(pixel)+0.114*GetBluePixelComponent(pixel)));
+      return(GetPixelRed(pixel));
+    return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
+      GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)));
   }
 #endif
 }
index 0ea6572e59484f672220c310ba377ebd00a4f431..ee02edbc8d11c528f8051ec7dd02f7997f5a642b 100644 (file)
@@ -1564,7 +1564,7 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
       /*
         Transparencies are involved - set alpha distance
       */
-      pixel=(MagickRealType) ((image->matte != MagickFalse ? GetOpacityPixelComponent(p) :
+      pixel=(MagickRealType) ((image->matte != MagickFalse ? GetPixelOpacity(p) :
         OpaqueOpacity)-(image->matte != MagickFalse ? q->opacity :
         OpaqueOpacity));
       distance=pixel*pixel;
@@ -1574,8 +1574,8 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
         Generate a alpha scaling factor to generate a 4D cone on colorspace
         Note that if one color is transparent, distance has no color component.
       */
-      scale=(QuantumScale*GetAlphaPixelComponent(p));
-      scale*=(QuantumScale*GetAlphaPixelComponent(q));
+      scale=(QuantumScale*GetPixelAlpha(p));
+      scale*=(QuantumScale*GetPixelAlpha(q));
       if (scale <= MagickEpsilon)
         return(MagickTrue);
     }
@@ -1584,7 +1584,7 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
   */
   distance*=3.0;  /* rescale appropriately */
   fuzz*=3.0;
-  pixel=(MagickRealType) GetRedPixelComponent(p)-GetRedPixelComponent(q);
+  pixel=(MagickRealType) GetPixelRed(p)-GetPixelRed(q);
   if ((image->colorspace == HSLColorspace) ||
       (image->colorspace == HSBColorspace) ||
       (image->colorspace == HWBColorspace))
@@ -1600,11 +1600,11 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
   distance+=scale*pixel*pixel;
   if (distance > fuzz)
     return(MagickFalse);
-  pixel=(MagickRealType) GetGreenPixelComponent(p)-q->green;
+  pixel=(MagickRealType) GetPixelGreen(p)-q->green;
   distance+=scale*pixel*pixel;
   if (distance > fuzz)
     return(MagickFalse);
-  pixel=(MagickRealType) GetBluePixelComponent(p)-q->blue;
+  pixel=(MagickRealType) GetPixelBlue(p)-q->blue;
   distance+=scale*pixel*pixel;
   if (distance > fuzz)
     return(MagickFalse);
@@ -1810,7 +1810,7 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
       /*
         Transparencies are involved - set alpha distance.
       */
-      pixel=(p->matte != MagickFalse ? GetOpacityPixelComponent(p) :
+      pixel=(p->matte != MagickFalse ? GetPixelOpacity(p) :
         OpaqueOpacity)-(q->matte != MagickFalse ? q->opacity : OpaqueOpacity);
       distance=pixel*pixel;
       if (distance > fuzz)
@@ -1820,9 +1820,9 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
         Note that if one color is transparent, distance has no color component
       */
       if (p->matte != MagickFalse)
-        scale=(QuantumScale*GetAlphaPixelComponent(p));
+        scale=(QuantumScale*GetPixelAlpha(p));
       if (q->matte != MagickFalse)
-        scale*=(QuantumScale*GetAlphaPixelComponent(q));
+        scale*=(QuantumScale*GetPixelAlpha(q));
       if ( scale <= MagickEpsilon )
         return(MagickTrue);
     }
@@ -1859,11 +1859,11 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
   distance+=pixel*pixel*scale;
   if (distance > fuzz)
     return(MagickFalse);
-  pixel=GetGreenPixelComponent(p)-q->green;
+  pixel=GetPixelGreen(p)-q->green;
   distance+=pixel*pixel*scale;
   if (distance > fuzz)
     return(MagickFalse);
-  pixel=GetBluePixelComponent(p)-q->blue;
+  pixel=GetPixelBlue(p)-q->blue;
   distance+=pixel*pixel*scale;
   if (distance > fuzz)
     return(MagickFalse);
@@ -1912,10 +1912,10 @@ MagickExport MagickBooleanType IsOpacitySimilar(const Image *image,
 
   if (image->matte == MagickFalse)
     return(MagickTrue);
-  if (GetOpacityPixelComponent(p) == q->opacity)
+  if (GetPixelOpacity(p) == q->opacity)
     return(MagickTrue);
   fuzz=MagickMax(image->fuzz,MagickSQ1_2)*MagickMax(image->fuzz,MagickSQ1_2);
-  pixel=(MagickRealType) GetOpacityPixelComponent(p)-(MagickRealType) q->opacity;
+  pixel=(MagickRealType) GetPixelOpacity(p)-(MagickRealType) q->opacity;
   distance=pixel*pixel;
   if (distance > fuzz)
     return(MagickFalse);
@@ -2304,11 +2304,11 @@ static MagickBooleanType LoadColorLists(const char *filename,
     color_info->name=(char *) p->name;
     GetMagickPixelPacket((Image *) NULL,&color_info->color);
     color_info->color.red=(MagickRealType) ScaleCharToQuantum(
-      GetRedPixelComponent(p));
+      GetPixelRed(p));
     color_info->color.green=(MagickRealType) ScaleCharToQuantum(
-      GetGreenPixelComponent(p));
+      GetPixelGreen(p));
     color_info->color.blue=(MagickRealType) ScaleCharToQuantum(
-      GetBluePixelComponent(p));
+      GetPixelBlue(p));
     color_info->color.opacity=(MagickRealType) (QuantumRange-QuantumRange*
       p->alpha);
     color_info->compliance=(ComplianceType) p->compliance;
@@ -2384,23 +2384,23 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name,
     pixel;
 
   status=QueryMagickColorCompliance(name,compliance,&pixel,exception);
-  SetOpacityPixelComponent(color,ClampToQuantum(pixel.opacity));
+  SetPixelOpacity(color,ClampToQuantum(pixel.opacity));
   if (pixel.colorspace == CMYKColorspace)
     {
-      SetRedPixelComponent(color,ClampToQuantum((MagickRealType)
+      SetPixelRed(color,ClampToQuantum((MagickRealType)
         (QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
         pixel.red*(QuantumRange-pixel.index)+pixel.index)))));
-      SetGreenPixelComponent(color,ClampToQuantum((MagickRealType)
+      SetPixelGreen(color,ClampToQuantum((MagickRealType)
         (QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
         pixel.green*(QuantumRange-pixel.index)+pixel.index)))));
-      SetBluePixelComponent(color,ClampToQuantum((MagickRealType)
+      SetPixelBlue(color,ClampToQuantum((MagickRealType)
         (QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
         pixel.blue*(QuantumRange-pixel.index)+pixel.index)))));
       return(status);
     }
-  SetRedPixelComponent(color,ClampToQuantum(pixel.red));
-  SetGreenPixelComponent(color,ClampToQuantum(pixel.green));
-  SetBluePixelComponent(color,ClampToQuantum(pixel.blue));
+  SetPixelRed(color,ClampToQuantum(pixel.red));
+  SetPixelGreen(color,ClampToQuantum(pixel.green));
+  SetPixelBlue(color,ClampToQuantum(pixel.blue));
   return(status);
 }
 \f
index 26adf3b18484c79684da12e6a869e954eed78fc3..bc24068d23ec77718d38d3305151831e5da9b17d 100644 (file)
@@ -232,12 +232,12 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      index=(ssize_t) (GetIndexPixelComponent(indexes+x)+displace) %
+      index=(ssize_t) (GetPixelIndex(indexes+x)+displace) %
         image->colors;
       if (index < 0)
         index+=(ssize_t) image->colors;
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -376,9 +376,9 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      index=(IndexPacket) pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      index=(IndexPacket) pixels[(ssize_t) GetPixelIndex(indexes+x)];
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index e99fc56603ff9ce2b08aaa2f139abc7f063dd418..730717cd7711a1f603d349e62a28cfe992c08e1f 100644 (file)
@@ -269,12 +269,12 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
-            (QuantumRange-GetRedPixelComponent(q))));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
-            (QuantumRange-GetGreenPixelComponent(q))));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
-            (QuantumRange-GetBluePixelComponent(q))));
+          SetPixelRed(q,ClampToQuantum((MagickRealType)
+            (QuantumRange-GetPixelRed(q))));
+          SetPixelGreen(q,ClampToQuantum((MagickRealType)
+            (QuantumRange-GetPixelGreen(q))));
+          SetPixelBlue(q,ClampToQuantum((MagickRealType)
+            (QuantumRange-GetPixelBlue(q))));
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -390,13 +390,13 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
         brightness=0.0;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          ConvertRGBToHSB(GetRedPixelComponent(q),GetGreenPixelComponent(q),
-            GetBluePixelComponent(q),&hue,&saturation,&brightness);
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+          ConvertRGBToHSB(GetPixelRed(q),GetPixelGreen(q),
+            GetPixelBlue(q),&hue,&saturation,&brightness);
+          SetPixelRed(q,ClampToQuantum((MagickRealType)
             QuantumRange*hue));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelGreen(q,ClampToQuantum((MagickRealType)
             QuantumRange*saturation));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelBlue(q,ClampToQuantum((MagickRealType)
             QuantumRange*brightness));
           q++;
         }
@@ -450,13 +450,13 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
         lightness=0.0;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          ConvertRGBToHSL(GetRedPixelComponent(q),GetGreenPixelComponent(q),
-            GetBluePixelComponent(q),&hue,&saturation,&lightness);
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+          ConvertRGBToHSL(GetPixelRed(q),GetPixelGreen(q),
+            GetPixelBlue(q),&hue,&saturation,&lightness);
+          SetPixelRed(q,ClampToQuantum((MagickRealType)
             QuantumRange*hue));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelGreen(q,ClampToQuantum((MagickRealType)
             QuantumRange*saturation));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelBlue(q,ClampToQuantum((MagickRealType)
             QuantumRange*lightness));
           q++;
         }
@@ -510,13 +510,13 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
         blackness=0.0;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          ConvertRGBToHWB(GetRedPixelComponent(q),GetGreenPixelComponent(q),
-            GetBluePixelComponent(q),&hue,&whiteness,&blackness);
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+          ConvertRGBToHWB(GetPixelRed(q),GetPixelGreen(q),
+            GetPixelBlue(q),&hue,&whiteness,&blackness);
+          SetPixelRed(q,ClampToQuantum((MagickRealType)
             QuantumRange*hue));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelGreen(q,ClampToQuantum((MagickRealType)
             QuantumRange*whiteness));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelBlue(q,ClampToQuantum((MagickRealType)
             QuantumRange*blackness));
           q++;
         }
@@ -576,14 +576,14 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
         Z=0.0;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          ConvertRGBToXYZ(GetRedPixelComponent(q),GetGreenPixelComponent(q),
-            GetBluePixelComponent(q),&X,&Y,&Z);
+          ConvertRGBToXYZ(GetPixelRed(q),GetPixelGreen(q),
+            GetPixelBlue(q),&X,&Y,&Z);
           ConvertXYZToLab(X,Y,Z,&L,&a,&b);
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelRed(q,ClampToQuantum((MagickRealType)
             QuantumRange*L));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelGreen(q,ClampToQuantum((MagickRealType)
             QuantumRange*a));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+          SetPixelBlue(q,ClampToQuantum((MagickRealType)
             QuantumRange*b));
           q++;
         }
@@ -673,12 +673,12 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           }
         for (x=(ssize_t) image->columns; x != 0; x--)
         {
-          SetRedPixelComponent(q,logmap[ScaleQuantumToMap(
-            GetRedPixelComponent(q))]);
-          SetGreenPixelComponent(q,logmap[ScaleQuantumToMap(
-            GetGreenPixelComponent(q))]);
-          SetBluePixelComponent(q,logmap[ScaleQuantumToMap(
-            GetBluePixelComponent(q))]);
+          SetPixelRed(q,logmap[ScaleQuantumToMap(
+            GetPixelRed(q))]);
+          SetPixelGreen(q,logmap[ScaleQuantumToMap(
+            GetPixelGreen(q))]);
+          SetPixelBlue(q,logmap[ScaleQuantumToMap(
+            GetPixelBlue(q))]);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1089,18 +1089,18 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          red=ScaleQuantumToMap(GetRedPixelComponent(q));
-          green=ScaleQuantumToMap(GetGreenPixelComponent(q));
-          blue=ScaleQuantumToMap(GetBluePixelComponent(q));
+          red=ScaleQuantumToMap(GetPixelRed(q));
+          green=ScaleQuantumToMap(GetPixelGreen(q));
+          blue=ScaleQuantumToMap(GetPixelBlue(q));
           pixel.red=(x_map[red].x+y_map[green].x+z_map[blue].x)+
             (MagickRealType) primary_info.x;
           pixel.green=(x_map[red].y+y_map[green].y+z_map[blue].y)+
             (MagickRealType) primary_info.y;
           pixel.blue=(x_map[red].z+y_map[green].z+z_map[blue].z)+
             (MagickRealType) primary_info.z;
-          SetRedPixelComponent(q,ScaleMapToQuantum(pixel.red));
-          SetGreenPixelComponent(q,ScaleMapToQuantum(pixel.green));
-          SetBluePixelComponent(q,ScaleMapToQuantum(pixel.blue));
+          SetPixelRed(q,ScaleMapToQuantum(pixel.red));
+          SetPixelGreen(q,ScaleMapToQuantum(pixel.green));
+          SetPixelBlue(q,ScaleMapToQuantum(pixel.blue));
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1701,12 +1701,12 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
-            (QuantumRange-GetRedPixelComponent(q))));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
-            (QuantumRange-GetGreenPixelComponent(q))));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
-            (QuantumRange-GetBluePixelComponent(q))));
+          SetPixelRed(q,ClampToQuantum((MagickRealType)
+            (QuantumRange-GetPixelRed(q))));
+          SetPixelGreen(q,ClampToQuantum((MagickRealType)
+            (QuantumRange-GetPixelGreen(q))));
+          SetPixelBlue(q,ClampToQuantum((MagickRealType)
+            (QuantumRange-GetPixelBlue(q))));
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1830,13 +1830,13 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             green,
             red;
 
-          hue=(double) (QuantumScale*GetRedPixelComponent(q));
-          saturation=(double) (QuantumScale*GetGreenPixelComponent(q));
-          brightness=(double) (QuantumScale*GetBluePixelComponent(q));
+          hue=(double) (QuantumScale*GetPixelRed(q));
+          saturation=(double) (QuantumScale*GetPixelGreen(q));
+          brightness=(double) (QuantumScale*GetPixelBlue(q));
           ConvertHSBToRGB(hue,saturation,brightness,&red,&green,&blue);
-          SetRedPixelComponent(q,red);
-          SetGreenPixelComponent(q,green);
-          SetBluePixelComponent(q,blue);
+          SetPixelRed(q,red);
+          SetPixelGreen(q,green);
+          SetPixelBlue(q,blue);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1896,13 +1896,13 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             green,
             red;
 
-          hue=(double) (QuantumScale*GetRedPixelComponent(q));
-          saturation=(double) (QuantumScale*GetGreenPixelComponent(q));
-          lightness=(double) (QuantumScale*GetBluePixelComponent(q));
+          hue=(double) (QuantumScale*GetPixelRed(q));
+          saturation=(double) (QuantumScale*GetPixelGreen(q));
+          lightness=(double) (QuantumScale*GetPixelBlue(q));
           ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue);
-          SetRedPixelComponent(q,red);
-          SetGreenPixelComponent(q,green);
-          SetBluePixelComponent(q,blue);
+          SetPixelRed(q,red);
+          SetPixelGreen(q,green);
+          SetPixelBlue(q,blue);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1962,13 +1962,13 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             green,
             red;
 
-          hue=(double) (QuantumScale*GetRedPixelComponent(q));
-          whiteness=(double) (QuantumScale*GetGreenPixelComponent(q));
-          blackness=(double) (QuantumScale*GetBluePixelComponent(q));
+          hue=(double) (QuantumScale*GetPixelRed(q));
+          whiteness=(double) (QuantumScale*GetPixelGreen(q));
+          blackness=(double) (QuantumScale*GetPixelBlue(q));
           ConvertHWBToRGB(hue,whiteness,blackness,&red,&green,&blue);
-          SetRedPixelComponent(q,red);
-          SetGreenPixelComponent(q,green);
-          SetBluePixelComponent(q,blue);
+          SetPixelRed(q,red);
+          SetPixelGreen(q,green);
+          SetPixelBlue(q,blue);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2034,14 +2034,14 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             green,
             red;
 
-          L=QuantumScale*GetRedPixelComponent(q);
-          a=QuantumScale*GetGreenPixelComponent(q);
-          b=QuantumScale*GetBluePixelComponent(q);
+          L=QuantumScale*GetPixelRed(q);
+          a=QuantumScale*GetPixelGreen(q);
+          b=QuantumScale*GetPixelBlue(q);
           ConvertLabToXYZ(L,a,b,&X,&Y,&Z);
           ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
-          SetRedPixelComponent(q,red);
-          SetGreenPixelComponent(q,green);
-          SetBluePixelComponent(q,blue);
+          SetPixelRed(q,red);
+          SetPixelGreen(q,green);
+          SetPixelBlue(q,blue);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2133,12 +2133,12 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           }
         for (x=(ssize_t) image->columns; x != 0; x--)
         {
-          SetRedPixelComponent(q,logmap[ScaleQuantumToMap(
-            GetRedPixelComponent(q))]);
-          SetGreenPixelComponent(q,logmap[ScaleQuantumToMap(
-            GetGreenPixelComponent(q))]);
-          SetBluePixelComponent(q,logmap[ScaleQuantumToMap(
-            GetBluePixelComponent(q))]);
+          SetPixelRed(q,logmap[ScaleQuantumToMap(
+            GetPixelRed(q))]);
+          SetPixelGreen(q,logmap[ScaleQuantumToMap(
+            GetPixelGreen(q))]);
+          SetPixelBlue(q,logmap[ScaleQuantumToMap(
+            GetPixelBlue(q))]);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2511,9 +2511,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             green,
             red;
 
-          red=ScaleQuantumToMap(GetRedPixelComponent(q));
-          green=ScaleQuantumToMap(GetGreenPixelComponent(q));
-          blue=ScaleQuantumToMap(GetBluePixelComponent(q));
+          red=ScaleQuantumToMap(GetPixelRed(q));
+          green=ScaleQuantumToMap(GetPixelGreen(q));
+          blue=ScaleQuantumToMap(GetPixelBlue(q));
           pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x;
           pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y;
           pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
@@ -2553,11 +2553,11 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             default:
               break;
           }
-          SetRedPixelComponent(q,ScaleMapToQuantum((MagickRealType) MaxMap*
+          SetPixelRed(q,ScaleMapToQuantum((MagickRealType) MaxMap*
             QuantumScale*pixel.red));
-          SetGreenPixelComponent(q,ScaleMapToQuantum((MagickRealType) MaxMap*
+          SetPixelGreen(q,ScaleMapToQuantum((MagickRealType) MaxMap*
             QuantumScale*pixel.green));
-          SetBluePixelComponent(q,ScaleMapToQuantum((MagickRealType) MaxMap*
+          SetPixelBlue(q,ScaleMapToQuantum((MagickRealType) MaxMap*
             QuantumScale*pixel.blue));
           q++;
         }
index 586d93084733b5e56f8fcbfba643f18bf8e7f6a5..b95185c960aa7d5c3a07226325cd809df73e8a95 100644 (file)
@@ -263,23 +263,23 @@ MagickExport Image *CompareImageChannels(Image *image,
       else
         {
           if (((channel & RedChannel) != 0) &&
-              (GetRedPixelComponent(p) != GetRedPixelComponent(q)))
+              (GetPixelRed(p) != GetPixelRed(q)))
             difference=MagickTrue;
           if (((channel & GreenChannel) != 0) &&
-              (GetGreenPixelComponent(p) != GetGreenPixelComponent(q)))
+              (GetPixelGreen(p) != GetPixelGreen(q)))
             difference=MagickTrue;
           if (((channel & BlueChannel) != 0) &&
-              (GetBluePixelComponent(p) != GetBluePixelComponent(q)))
+              (GetPixelBlue(p) != GetPixelBlue(q)))
             difference=MagickTrue;
           if (((channel & OpacityChannel) != 0) &&
               (image->matte != MagickFalse) &&
-              (GetOpacityPixelComponent(p) != GetOpacityPixelComponent(q)))
+              (GetPixelOpacity(p) != GetPixelOpacity(q)))
             difference=MagickTrue;
           if ((((channel & IndexChannel) != 0) &&
                (image->colorspace == CMYKColorspace) &&
                (reconstruct_image->colorspace == CMYKColorspace)) &&
-              (GetIndexPixelComponent(indexes+x) !=
-               GetIndexPixelComponent(reconstruct_indexes+x)))
+              (GetPixelIndex(indexes+x) !=
+               GetPixelIndex(reconstruct_indexes+x)))
             difference=MagickTrue;
         }
       if (difference != MagickFalse)
@@ -532,22 +532,22 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
 
       if ((channel & RedChannel) != 0)
         {
-          distance=QuantumScale*(GetRedPixelComponent(p)-(MagickRealType)
-            GetRedPixelComponent(q));
+          distance=QuantumScale*(GetPixelRed(p)-(MagickRealType)
+            GetPixelRed(q));
           channel_distortion[RedChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
       if ((channel & GreenChannel) != 0)
         {
-          distance=QuantumScale*(GetGreenPixelComponent(p)-(MagickRealType)
-            GetGreenPixelComponent(q));
+          distance=QuantumScale*(GetPixelGreen(p)-(MagickRealType)
+            GetPixelGreen(q));
           channel_distortion[GreenChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
       if ((channel & BlueChannel) != 0)
         {
-          distance=QuantumScale*(GetBluePixelComponent(p)-(MagickRealType)
-            GetBluePixelComponent(q));
+          distance=QuantumScale*(GetPixelBlue(p)-(MagickRealType)
+            GetPixelBlue(q));
           channel_distortion[BlueChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
@@ -555,9 +555,9 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
           (reconstruct_image->matte != MagickFalse)))
         {
           distance=QuantumScale*((image->matte != MagickFalse ?
-            GetOpacityPixelComponent(p) : OpaqueOpacity)-
+            GetPixelOpacity(p) : OpaqueOpacity)-
             (reconstruct_image->matte != MagickFalse ?
-            GetOpacityPixelComponent(q): OpaqueOpacity));
+            GetPixelOpacity(q): OpaqueOpacity));
           channel_distortion[OpacityChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
@@ -565,8 +565,8 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
           (image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         {
-          distance=QuantumScale*(GetIndexPixelComponent(indexes+x)-
-            (MagickRealType) GetIndexPixelComponent(reconstruct_indexes+x));
+          distance=QuantumScale*(GetPixelIndex(indexes+x)-
+            (MagickRealType) GetPixelIndex(reconstruct_indexes+x));
           channel_distortion[BlackChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
@@ -652,38 +652,38 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image,
 
       if ((channel & RedChannel) != 0)
         {
-          distance=QuantumScale*fabs(GetRedPixelComponent(p)-(double)
-            GetRedPixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelRed(p)-(double)
+            GetPixelRed(q));
           channel_distortion[RedChannel]+=distance;
           channel_distortion[CompositeChannels]+=distance;
         }
       if ((channel & GreenChannel) != 0)
         {
-          distance=QuantumScale*fabs(GetGreenPixelComponent(p)-(double)
-            GetGreenPixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelGreen(p)-(double)
+            GetPixelGreen(q));
           channel_distortion[GreenChannel]+=distance;
           channel_distortion[CompositeChannels]+=distance;
         }
       if ((channel & BlueChannel) != 0)
         {
-          distance=QuantumScale*fabs(GetBluePixelComponent(p)-(double)
-            GetBluePixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelBlue(p)-(double)
+            GetPixelBlue(q));
           channel_distortion[BlueChannel]+=distance;
           channel_distortion[CompositeChannels]+=distance;
         }
       if (((channel & OpacityChannel) != 0) &&
           (image->matte != MagickFalse))
         {
-          distance=QuantumScale*fabs(GetOpacityPixelComponent(p)-(double)
-            GetOpacityPixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelOpacity(p)-(double)
+            GetPixelOpacity(q));
           channel_distortion[OpacityChannel]+=distance;
           channel_distortion[CompositeChannels]+=distance;
         }
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
         {
-          distance=QuantumScale*fabs(GetIndexPixelComponent(indexes+x)-(double)
-            GetIndexPixelComponent(reconstruct_indexes+x));
+          distance=QuantumScale*fabs(GetPixelIndex(indexes+x)-(double)
+            GetPixelIndex(reconstruct_indexes+x));
           channel_distortion[BlackChannel]+=distance;
           channel_distortion[CompositeChannels]+=distance;
         }
@@ -764,14 +764,14 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
       if ((channel & OpacityChannel) != 0)
         {
           if (image->matte != MagickFalse)
-            alpha=(MagickRealType) (QuantumScale*(GetAlphaPixelComponent(p)));
+            alpha=(MagickRealType) (QuantumScale*(GetPixelAlpha(p)));
           if (reconstruct_image->matte != MagickFalse)
-            beta=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(q));
+            beta=(MagickRealType) (QuantumScale*GetPixelAlpha(q));
         }
       if ((channel & RedChannel) != 0)
         {
-          distance=fabs(alpha*GetRedPixelComponent(p)-beta*
-            GetRedPixelComponent(q));
+          distance=fabs(alpha*GetPixelRed(p)-beta*
+            GetPixelRed(q));
           distortion[RedChannel]+=distance;
           distortion[CompositeChannels]+=distance;
           mean_error+=distance*distance;
@@ -781,8 +781,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
         }
       if ((channel & GreenChannel) != 0)
         {
-          distance=fabs(alpha*GetGreenPixelComponent(p)-beta*
-            GetGreenPixelComponent(q));
+          distance=fabs(alpha*GetPixelGreen(p)-beta*
+            GetPixelGreen(q));
           distortion[GreenChannel]+=distance;
           distortion[CompositeChannels]+=distance;
           mean_error+=distance*distance;
@@ -792,8 +792,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
         }
       if ((channel & BlueChannel) != 0)
         {
-          distance=fabs(alpha*GetBluePixelComponent(p)-beta*
-            GetBluePixelComponent(q));
+          distance=fabs(alpha*GetPixelBlue(p)-beta*
+            GetPixelBlue(q));
           distortion[BlueChannel]+=distance;
           distortion[CompositeChannels]+=distance;
           mean_error+=distance*distance;
@@ -804,8 +804,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
       if (((channel & OpacityChannel) != 0) &&
           (image->matte != MagickFalse))
         {
-          distance=fabs((double) GetOpacityPixelComponent(p)-
-            GetOpacityPixelComponent(q));
+          distance=fabs((double) GetPixelOpacity(p)-
+            GetPixelOpacity(q));
           distortion[OpacityChannel]+=distance;
           distortion[CompositeChannels]+=distance;
           mean_error+=distance*distance;
@@ -817,8 +817,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
           (image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         {
-          distance=fabs(alpha*GetIndexPixelComponent(indexes+x)-beta*
-            GetIndexPixelComponent(reconstruct_indexes+x));
+          distance=fabs(alpha*GetPixelIndex(indexes+x)-beta*
+            GetPixelIndex(reconstruct_indexes+x));
           distortion[BlackChannel]+=distance;
           distortion[CompositeChannels]+=distance;
           mean_error+=distance*distance;
@@ -898,30 +898,30 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
 
       if ((channel & RedChannel) != 0)
         {
-          distance=QuantumScale*(GetRedPixelComponent(p)-(MagickRealType)
-            GetRedPixelComponent(q));
+          distance=QuantumScale*(GetPixelRed(p)-(MagickRealType)
+            GetPixelRed(q));
           channel_distortion[RedChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
       if ((channel & GreenChannel) != 0)
         {
-          distance=QuantumScale*(GetGreenPixelComponent(p)-(MagickRealType)
-            GetGreenPixelComponent(q));
+          distance=QuantumScale*(GetPixelGreen(p)-(MagickRealType)
+            GetPixelGreen(q));
           channel_distortion[GreenChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
       if ((channel & BlueChannel) != 0)
         {
-          distance=QuantumScale*(GetBluePixelComponent(p)-(MagickRealType)
-            GetBluePixelComponent(q));
+          distance=QuantumScale*(GetPixelBlue(p)-(MagickRealType)
+            GetPixelBlue(q));
           channel_distortion[BlueChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
       if (((channel & OpacityChannel) != 0) &&
           (image->matte != MagickFalse))
         {
-          distance=QuantumScale*(GetOpacityPixelComponent(p)-(MagickRealType)
-            GetOpacityPixelComponent(q));
+          distance=QuantumScale*(GetPixelOpacity(p)-(MagickRealType)
+            GetPixelOpacity(q));
           channel_distortion[OpacityChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
@@ -929,8 +929,8 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
           (image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         {
-          distance=QuantumScale*(GetIndexPixelComponent(indexes+x)-
-            (MagickRealType) GetIndexPixelComponent(reconstruct_indexes+x));
+          distance=QuantumScale*(GetPixelIndex(indexes+x)-
+            (MagickRealType) GetPixelIndex(reconstruct_indexes+x));
           channel_distortion[BlackChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
@@ -1020,30 +1020,30 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion(
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        distortion[RedChannel]+=area*QuantumScale*(GetRedPixelComponent(p)-
-          image_statistics[RedChannel].mean)*(GetRedPixelComponent(q)-
+        distortion[RedChannel]+=area*QuantumScale*(GetPixelRed(p)-
+          image_statistics[RedChannel].mean)*(GetPixelRed(q)-
           reconstruct_statistics[RedChannel].mean);
       if ((channel & GreenChannel) != 0)
-        distortion[GreenChannel]+=area*QuantumScale*(GetGreenPixelComponent(p)-
-          image_statistics[GreenChannel].mean)*(GetGreenPixelComponent(q)-
+        distortion[GreenChannel]+=area*QuantumScale*(GetPixelGreen(p)-
+          image_statistics[GreenChannel].mean)*(GetPixelGreen(q)-
           reconstruct_statistics[GreenChannel].mean);
       if ((channel & BlueChannel) != 0)
-        distortion[BlueChannel]+=area*QuantumScale*(GetBluePixelComponent(p)-
-          image_statistics[BlueChannel].mean)*(GetBluePixelComponent(q)-
+        distortion[BlueChannel]+=area*QuantumScale*(GetPixelBlue(p)-
+          image_statistics[BlueChannel].mean)*(GetPixelBlue(q)-
           reconstruct_statistics[BlueChannel].mean);
       if (((channel & OpacityChannel) != 0) &&
           (image->matte != MagickFalse))
         distortion[OpacityChannel]+=area*QuantumScale*(
-          GetOpacityPixelComponent(p)-image_statistics[OpacityChannel].mean)*
-          (GetOpacityPixelComponent(q)-
+          GetPixelOpacity(p)-image_statistics[OpacityChannel].mean)*
+          (GetPixelOpacity(q)-
           reconstruct_statistics[OpacityChannel].mean);
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         distortion[BlackChannel]+=area*QuantumScale*(
-          GetIndexPixelComponent(indexes+x)-
+          GetPixelIndex(indexes+x)-
           image_statistics[OpacityChannel].mean)*(
-          GetIndexPixelComponent(reconstruct_indexes+x)-
+          GetPixelIndex(reconstruct_indexes+x)-
           reconstruct_statistics[OpacityChannel].mean);
       p++;
       q++;
@@ -1160,8 +1160,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
 
       if ((channel & RedChannel) != 0)
         {
-          distance=QuantumScale*fabs(GetRedPixelComponent(p)-(double)
-            GetRedPixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelRed(p)-(double)
+            GetPixelRed(q));
           if (distance > channel_distortion[RedChannel])
             channel_distortion[RedChannel]=distance;
           if (distance > channel_distortion[CompositeChannels])
@@ -1169,8 +1169,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
         }
       if ((channel & GreenChannel) != 0)
         {
-          distance=QuantumScale*fabs(GetGreenPixelComponent(p)-(double)
-            GetGreenPixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelGreen(p)-(double)
+            GetPixelGreen(q));
           if (distance > channel_distortion[GreenChannel])
             channel_distortion[GreenChannel]=distance;
           if (distance > channel_distortion[CompositeChannels])
@@ -1178,8 +1178,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
         }
       if ((channel & BlueChannel) != 0)
         {
-          distance=QuantumScale*fabs(GetBluePixelComponent(p)-(double)
-            GetBluePixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelBlue(p)-(double)
+            GetPixelBlue(q));
           if (distance > channel_distortion[BlueChannel])
             channel_distortion[BlueChannel]=distance;
           if (distance > channel_distortion[CompositeChannels])
@@ -1188,8 +1188,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
       if (((channel & OpacityChannel) != 0) &&
           (image->matte != MagickFalse))
         {
-          distance=QuantumScale*fabs(GetOpacityPixelComponent(p)-(double)
-            GetOpacityPixelComponent(q));
+          distance=QuantumScale*fabs(GetPixelOpacity(p)-(double)
+            GetPixelOpacity(q));
           if (distance > channel_distortion[OpacityChannel])
             channel_distortion[OpacityChannel]=distance;
           if (distance > channel_distortion[CompositeChannels])
@@ -1199,8 +1199,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
           (image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         {
-          distance=QuantumScale*fabs(GetIndexPixelComponent(indexes+x)-(double)
-            GetIndexPixelComponent(reconstruct_indexes+x));
+          distance=QuantumScale*fabs(GetPixelIndex(indexes+x)-(double)
+            GetPixelIndex(reconstruct_indexes+x));
           if (distance > channel_distortion[BlackChannel])
             channel_distortion[BlackChannel]=distance;
           if (distance > channel_distortion[CompositeChannels])
@@ -1621,22 +1621,22 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
       MagickRealType
         distance;
 
-      distance=fabs(GetRedPixelComponent(p)-(double)
-        GetRedPixelComponent(q));
+      distance=fabs(GetPixelRed(p)-(double)
+        GetPixelRed(q));
       mean_error_per_pixel+=distance;
       mean_error+=distance*distance;
       if (distance > maximum_error)
         maximum_error=distance;
       area++;
-      distance=fabs(GetGreenPixelComponent(p)-(double)
-        GetGreenPixelComponent(q));
+      distance=fabs(GetPixelGreen(p)-(double)
+        GetPixelGreen(q));
       mean_error_per_pixel+=distance;
       mean_error+=distance*distance;
       if (distance > maximum_error)
         maximum_error=distance;
       area++;
-      distance=fabs(GetBluePixelComponent(p)-(double)
-        GetBluePixelComponent(q));
+      distance=fabs(GetPixelBlue(p)-(double)
+        GetPixelBlue(q));
       mean_error_per_pixel+=distance;
       mean_error+=distance*distance;
       if (distance > maximum_error)
@@ -1644,8 +1644,8 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
       area++;
       if (image->matte != MagickFalse)
         {
-          distance=fabs(GetOpacityPixelComponent(p)-(double)
-            GetOpacityPixelComponent(q));
+          distance=fabs(GetPixelOpacity(p)-(double)
+            GetPixelOpacity(q));
           mean_error_per_pixel+=distance;
           mean_error+=distance*distance;
           if (distance > maximum_error)
@@ -1655,8 +1655,8 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
       if ((image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         {
-          distance=fabs(GetIndexPixelComponent(indexes+x)-(double)
-            GetIndexPixelComponent(reconstruct_indexes+x));
+          distance=fabs(GetPixelIndex(indexes+x)-(double)
+            GetPixelIndex(reconstruct_indexes+x));
           mean_error_per_pixel+=distance;
           mean_error+=distance*distance;
           if (distance > maximum_error)
@@ -1777,23 +1777,23 @@ static double GetNCCDistortion(const Image *image,
     reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      distortion+=area*QuantumScale*(GetRedPixelComponent(p)-
-        image_statistics[RedChannel].mean)*(GetRedPixelComponent(q)-
+      distortion+=area*QuantumScale*(GetPixelRed(p)-
+        image_statistics[RedChannel].mean)*(GetPixelRed(q)-
         reconstruct_statistics[RedChannel].mean);
-      distortion+=area*QuantumScale*(GetGreenPixelComponent(p)-
-        image_statistics[GreenChannel].mean)*(GetGreenPixelComponent(q)-
+      distortion+=area*QuantumScale*(GetPixelGreen(p)-
+        image_statistics[GreenChannel].mean)*(GetPixelGreen(q)-
         reconstruct_statistics[GreenChannel].mean);
-      distortion+=area*QuantumScale*(GetBluePixelComponent(p)-
+      distortion+=area*QuantumScale*(GetPixelBlue(p)-
         image_statistics[BlueChannel].mean)*(q->blue-
         reconstruct_statistics[BlueChannel].mean);
       if (image->matte != MagickFalse)
-        distortion+=area*QuantumScale*(GetOpacityPixelComponent(p)-
-          image_statistics[OpacityChannel].mean)*(GetOpacityPixelComponent(q)-
+        distortion+=area*QuantumScale*(GetPixelOpacity(p)-
+          image_statistics[OpacityChannel].mean)*(GetPixelOpacity(q)-
           reconstruct_statistics[OpacityChannel].mean);
       if ((image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
-        distortion+=area*QuantumScale*(GetIndexPixelComponent(indexes+x)-
-          image_statistics[BlackChannel].mean)*(GetIndexPixelComponent(
+        distortion+=area*QuantumScale*(GetPixelIndex(indexes+x)-
+          image_statistics[BlackChannel].mean)*(GetPixelIndex(
           reconstruct_indexes+x)-reconstruct_statistics[BlackChannel].mean);
       p++;
       q++;
@@ -1934,10 +1934,10 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
           offset->x=x;
           offset->y=y;
         }
-      SetRedPixelComponent(q,ClampToQuantum(QuantumRange-QuantumRange*
+      SetPixelRed(q,ClampToQuantum(QuantumRange-QuantumRange*
         similarity));
-      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-      SetBluePixelComponent(q,GetRedPixelComponent(q));
+      SetPixelGreen(q,GetPixelRed(q));
+      SetPixelBlue(q,GetPixelRed(q));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse)
index 6a4e09a427ed597ad8e3d631404efd0d60b4d6ab..abe108d8dba420cf433e734f6e7efee384f85554 100644 (file)
@@ -62,27 +62,27 @@ static inline void MagickCompositeOver(const PixelPacket *p,
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   composite->opacity=(Quantum) (QuantumRange*(1.0-gamma)+0.5);
   gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
-  SetRedPixelComponent(composite,gamma*MagickOver_((MagickRealType)
-    GetRedPixelComponent(p),alpha,(MagickRealType)
-    GetRedPixelComponent(q),beta)+0.5);
-  SetGreenPixelComponent(composite,gamma*MagickOver_((MagickRealType)
-    GetGreenPixelComponent(p),alpha,(MagickRealType)
-    GetGreenPixelComponent(q),beta)+0.5);
-  SetBluePixelComponent(composite,gamma*MagickOver_((MagickRealType)
-    GetBluePixelComponent(p),alpha,(MagickRealType)
-    GetBluePixelComponent(q),beta)+0.5);
+  SetPixelRed(composite,gamma*MagickOver_((MagickRealType)
+    GetPixelRed(p),alpha,(MagickRealType)
+    GetPixelRed(q),beta)+0.5);
+  SetPixelGreen(composite,gamma*MagickOver_((MagickRealType)
+    GetPixelGreen(p),alpha,(MagickRealType)
+    GetPixelGreen(q),beta)+0.5);
+  SetPixelBlue(composite,gamma*MagickOver_((MagickRealType)
+    GetPixelBlue(p),alpha,(MagickRealType)
+    GetPixelBlue(q),beta)+0.5);
 #else
-  SetOpacityPixelComponent(composite,QuantumRange*(1.0-gamma));
+  SetPixelOpacity(composite,QuantumRange*(1.0-gamma));
   gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
-  SetRedPixelComponent(composite,gamma*MagickOver_((MagickRealType)
-    GetRedPixelComponent(p),alpha,(MagickRealType)
-    GetRedPixelComponent(q),beta));
-  SetGreenPixelComponent(composite,gamma*MagickOver_((MagickRealType)
-    GetGreenPixelComponent(p),alpha,(MagickRealType)
-    GetGreenPixelComponent(q),beta));
-  SetBluePixelComponent(composite,gamma*MagickOver_((MagickRealType)
-    GetBluePixelComponent(p),alpha,(MagickRealType)
-    GetBluePixelComponent(q),beta));
+  SetPixelRed(composite,gamma*MagickOver_((MagickRealType)
+    GetPixelRed(p),alpha,(MagickRealType)
+    GetPixelRed(q),beta));
+  SetPixelGreen(composite,gamma*MagickOver_((MagickRealType)
+    GetPixelGreen(p),alpha,(MagickRealType)
+    GetPixelGreen(q),beta));
+  SetPixelBlue(composite,gamma*MagickOver_((MagickRealType)
+    GetPixelBlue(p),alpha,(MagickRealType)
+    GetPixelBlue(q),beta));
 #endif
 }
 
index c5033fcc05f81ff6c853de2365dbdde916ace16d..bc089881c9cabd39c19c0323d88920c91b8ff985 100644 (file)
@@ -1878,17 +1878,17 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
                 angle;
 
               angle=angle_start+angle_range*QuantumScale*
-                GetBluePixelComponent(p);
+                GetPixelBlue(p);
               blur.x1=width*cos(angle);
               blur.x2=width*sin(angle);
               blur.y1=(-height*sin(angle));
               blur.y2=height*cos(angle);
             }
           ScaleResampleFilter(resample_filter,blur.x1*QuantumScale*
-            GetRedPixelComponent(p),blur.y1*QuantumScale*
-            GetGreenPixelComponent(p),blur.x2*QuantumScale*
-            GetRedPixelComponent(p),blur.y2*QuantumScale*
-            GetGreenPixelComponent(p));
+            GetPixelRed(p),blur.y1*QuantumScale*
+            GetPixelGreen(p),blur.x2*QuantumScale*
+            GetPixelRed(p),blur.y2*QuantumScale*
+            GetPixelGreen(p));
           (void) ResamplePixelColor(resample_filter,(double) x_offset+x,
             (double) y_offset+y,&pixel);
           SetPixelPacket(destination_image,&pixel,r,destination_indexes+x);
@@ -2051,11 +2051,11 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           /*
             Displace the offset.
           */
-          offset.x=(horizontal_scale*(GetRedPixelComponent(p)-
+          offset.x=(horizontal_scale*(GetPixelRed(p)-
             (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
             QuantumRange+1.0)/2.0)+center.x+((compose == DisplaceCompositeOp) ?
             x : 0);
-          offset.y=(vertical_scale*(GetGreenPixelComponent(p)-
+          offset.y=(vertical_scale*(GetPixelGreen(p)-
             (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
             QuantumRange+1.0)/2.0)+center.y+((compose == DisplaceCompositeOp) ?
             y : 0);
@@ -2066,7 +2066,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
             Mask with the 'invalid pixel mask' in alpha channel.
           */
           pixel.opacity=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale*
-            pixel.opacity)*(1.0-QuantumScale*GetOpacityPixelComponent(p)));
+            pixel.opacity)*(1.0-QuantumScale*GetPixelOpacity(p)));
           SetPixelPacket(destination_image,&pixel,r,destination_indexes+x);
           p++;
           r++;
@@ -2278,13 +2278,13 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           if ((x-x_offset) >= (ssize_t) composite_image->columns)
             break;
         }
-      destination.red=(MagickRealType) GetRedPixelComponent(q);
-      destination.green=(MagickRealType) GetGreenPixelComponent(q);
-      destination.blue=(MagickRealType) GetBluePixelComponent(q);
+      destination.red=(MagickRealType) GetPixelRed(q);
+      destination.green=(MagickRealType) GetPixelGreen(q);
+      destination.blue=(MagickRealType) GetPixelBlue(q);
       if (image->matte != MagickFalse)
-        destination.opacity=(MagickRealType) GetOpacityPixelComponent(q);
+        destination.opacity=(MagickRealType) GetPixelOpacity(q);
       if (image->colorspace == CMYKColorspace)
-        destination.index=(MagickRealType) GetIndexPixelComponent(indexes+x);
+        destination.index=(MagickRealType) GetPixelIndex(indexes+x);
       if (image->colorspace == CMYKColorspace)
         {
           destination.red=(MagickRealType) QuantumRange-destination.red;
@@ -2340,26 +2340,26 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
               composite.blue=(MagickRealType) QuantumRange-composite.blue;
               composite.index=(MagickRealType) QuantumRange-composite.index;
             }
-          SetRedPixelComponent(q,ClampToQuantum(composite.red));
-          SetGreenPixelComponent(q,ClampToQuantum(composite.green));
-          SetBluePixelComponent(q,ClampToQuantum(composite.blue));
+          SetPixelRed(q,ClampToQuantum(composite.red));
+          SetPixelGreen(q,ClampToQuantum(composite.green));
+          SetPixelBlue(q,ClampToQuantum(composite.blue));
           if (image->matte != MagickFalse)
-            SetOpacityPixelComponent(q,ClampToQuantum(composite.opacity));
+            SetPixelOpacity(q,ClampToQuantum(composite.opacity));
           if (image->colorspace == CMYKColorspace)
-            SetIndexPixelComponent(indexes+x,ClampToQuantum(composite.index));
+            SetPixelIndex(indexes+x,ClampToQuantum(composite.index));
           q++;
           continue;
         }
       /*
         Handle normal overlay of source onto destination.
       */
-      source.red=(MagickRealType) GetRedPixelComponent(p);
-      source.green=(MagickRealType) GetGreenPixelComponent(p);
-      source.blue=(MagickRealType) GetBluePixelComponent(p);
+      source.red=(MagickRealType) GetPixelRed(p);
+      source.green=(MagickRealType) GetPixelGreen(p);
+      source.blue=(MagickRealType) GetPixelBlue(p);
       if (composite_image->matte != MagickFalse)
-        source.opacity=(MagickRealType) GetOpacityPixelComponent(p);
+        source.opacity=(MagickRealType) GetPixelOpacity(p);
       if (composite_image->colorspace == CMYKColorspace)
-        source.index=(MagickRealType) GetIndexPixelComponent(composite_indexes+
+        source.index=(MagickRealType) GetPixelIndex(composite_indexes+
           x-x_offset);
       if (composite_image->colorspace == CMYKColorspace)
         {
@@ -2759,12 +2759,12 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           composite.blue=(MagickRealType) QuantumRange-composite.blue;
           composite.index=(MagickRealType) QuantumRange-composite.index;
         }
-      SetRedPixelComponent(q,ClampToQuantum(composite.red));
-      SetGreenPixelComponent(q,ClampToQuantum(composite.green));
-      SetBluePixelComponent(q,ClampToQuantum(composite.blue));
-      SetOpacityPixelComponent(q,ClampToQuantum(composite.opacity));
+      SetPixelRed(q,ClampToQuantum(composite.red));
+      SetPixelGreen(q,ClampToQuantum(composite.green));
+      SetPixelBlue(q,ClampToQuantum(composite.blue));
+      SetPixelOpacity(q,ClampToQuantum(composite.opacity));
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(indexes+x,ClampToQuantum(composite.index));
+        SetPixelIndex(indexes+x,ClampToQuantum(composite.index));
       p++;
       if (p >= (pixels+composite_image->columns))
         p=pixels;
index c5c903194d9cb18d4b3e36d8cb06331cc42000b2..313bd689647529f4776bdd9b4e172a615321a5e5 100644 (file)
@@ -637,8 +637,8 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image)
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       index=(IndexPacket) (*p++);
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       break;
index 01aed66d54e0e13dc9f21fbc16bfed00c9302eb1..15954376eaa85c0e1524d271c0497f3a2e383676 100644 (file)
@@ -747,40 +747,40 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
     for (x=0; x < y; x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
       q++;
     }
     for ( ; x < (ssize_t) (image->columns-y); x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*AccentuateFactor+(MagickRealType) foreground*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*AccentuateFactor+(MagickRealType) foreground*
         (QuantumRange-AccentuateFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*AccentuateFactor+(MagickRealType) foreground*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*AccentuateFactor+(MagickRealType) foreground*
         (QuantumRange-AccentuateFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*AccentuateFactor+(MagickRealType) foreground*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*AccentuateFactor+(MagickRealType) foreground*
         (QuantumRange-AccentuateFactor))));
       q++;
     }
     for ( ; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType) 
-        GetRedPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType) 
+        GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
       q++;
     }
@@ -817,14 +817,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
     for (x=0; x < (ssize_t) raise_info->width; x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
       q++;
     }
@@ -832,14 +832,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       q++;
     for ( ; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
       q++;
     }
@@ -876,40 +876,40 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
     for (x=0; x < (ssize_t) (image->rows-y); x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))));
       q++;
     }
     for ( ; x < (ssize_t) (image->columns-(image->rows-y)); x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*TroughFactor+(MagickRealType) background*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*TroughFactor+(MagickRealType) background*
         (QuantumRange-TroughFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*TroughFactor+(MagickRealType) background*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*TroughFactor+(MagickRealType) background*
         (QuantumRange-TroughFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*TroughFactor+(MagickRealType) background*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*TroughFactor+(MagickRealType) background*
         (QuantumRange-TroughFactor))));
       q++;
     }
     for ( ; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetRedPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
-      SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetGreenPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
-      SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
-        GetBluePixelComponent(q)*ShadowFactor+(MagickRealType) background*
+      SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+        GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))));
       q++;
     }
index 2042269a57fa877393f91f121250773bf11c9b0d..129a5ad020c36896e7d5e381413776f03ba5d3b1 100644 (file)
@@ -1360,7 +1360,7 @@ MagickExport MagickBooleanType ColorFloodfillImage(Image *image,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+      if (GetPixelOpacity(p) != OpaqueOpacity)
         {
           (void) GetFillColor(draw_info,x,y,&fill_color);
           MagickCompositeOver(&fill_color,(MagickRealType) fill_color.opacity,q,
@@ -1833,26 +1833,26 @@ static double GetSimilarityMetric(const Image *image,const Image *reference,
       MagickRealType
         pixel;
 
-      pixel=QuantumScale*(GetRedPixelComponent(p)-(double)
-        GetRedPixelComponent(q));
+      pixel=QuantumScale*(GetPixelRed(p)-(double)
+        GetPixelRed(q));
       similarity+=pixel*pixel;
-      pixel=QuantumScale*(GetGreenPixelComponent(p)-(double)
-        GetGreenPixelComponent(q));
+      pixel=QuantumScale*(GetPixelGreen(p)-(double)
+        GetPixelGreen(q));
       similarity+=pixel*pixel;
-      pixel=QuantumScale*(GetBluePixelComponent(p)-(double)
-        GetBluePixelComponent(q));
+      pixel=QuantumScale*(GetPixelBlue(p)-(double)
+        GetPixelBlue(q));
       similarity+=pixel*pixel;
       if ((image->matte != MagickFalse) && (reference->matte != MagickFalse))
         {
-          pixel=QuantumScale*(GetOpacityPixelComponent(p)-(double)
-            GetOpacityPixelComponent(q));
+          pixel=QuantumScale*(GetPixelOpacity(p)-(double)
+            GetPixelOpacity(q));
           similarity+=pixel*pixel;
         }
       if ((image->colorspace == CMYKColorspace) &&
           (reference->colorspace == CMYKColorspace))
         {
-          pixel=QuantumScale*(GetIndexPixelComponent(indexes+x)-(double)
-            GetIndexPixelComponent(reference_indexes+x));
+          pixel=QuantumScale*(GetPixelIndex(indexes+x)-(double)
+            GetPixelIndex(reference_indexes+x));
           similarity+=pixel*pixel;
         }
       p++;
@@ -2151,20 +2151,20 @@ MagickExport unsigned int FuzzyColorMatch(const PixelPacket *p,
   register MagickRealType
     distance;
 
-  if ((fuzz == 0.0) && (GetRedPixelComponent(p) == GetRedPixelComponent(q)) &&
-      (GetGreenPixelComponent(p) == GetGreenPixelComponent(q)) &&
-      (GetBluePixelComponent(p) == GetBluePixelComponent(q)))
+  if ((fuzz == 0.0) && (GetPixelRed(p) == GetPixelRed(q)) &&
+      (GetPixelGreen(p) == GetPixelGreen(q)) &&
+      (GetPixelBlue(p) == GetPixelBlue(q)))
     return(MagickTrue);
-  pixel.red=GetRedPixelComponent(p)-(MagickRealType) GetRedPixelComponent(q);
+  pixel.red=GetPixelRed(p)-(MagickRealType) GetPixelRed(q);
   distance=pixel.red*pixel.red;
   if (distance > (fuzz*fuzz))
     return(MagickFalse);
-  pixel.green=GetGreenPixelComponent(p)-(MagickRealType)
-    GetGreenPixelComponent(q);
+  pixel.green=GetPixelGreen(p)-(MagickRealType)
+    GetPixelGreen(q);
   distance+=pixel.green*pixel.green;
   if (distance > (fuzz*fuzz))
     return(MagickFalse);
-  pixel.blue=GetBluePixelComponent(p)-(MagickRealType) GetBluePixelComponent(q);
+  pixel.blue=GetPixelBlue(p)-(MagickRealType) GetPixelBlue(q);
   distance+=pixel.blue*pixel.blue;
   if (distance > (fuzz*fuzz))
     return(MagickFalse);
@@ -3519,7 +3519,7 @@ MagickExport MagickPixelPacket InterpolatePixelColor(const Image *image,
         alpha[i]=1.0;
         if (image->matte != MagickFalse)
           {
-            alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+            alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
             pixels[i].red*=alpha[i];
             pixels[i].green*=alpha[i];
             pixels[i].blue*=alpha[i];
@@ -3562,7 +3562,7 @@ MagickExport MagickPixelPacket InterpolatePixelColor(const Image *image,
         alpha[i]=1.0;
         if (image->matte != MagickFalse)
           {
-            alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+            alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
             pixels[i].red*=alpha[i];
             pixels[i].green*=alpha[i];
             pixels[i].blue*=alpha[i];
@@ -3603,7 +3603,7 @@ MagickExport MagickPixelPacket InterpolatePixelColor(const Image *image,
         alpha[i]=1.0;
         if (image->matte != MagickFalse)
           {
-            alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+            alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
             pixels[i].red*=alpha[i];
             pixels[i].green*=alpha[i];
             pixels[i].blue*=alpha[i];
@@ -3710,7 +3710,7 @@ MagickExport MagickPixelPacket InterpolatePixelColor(const Image *image,
         alpha[i]=1.0;
         if (image->matte != MagickFalse)
           {
-            alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+            alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
             pixels[i].red*=alpha[i];
             pixels[i].green*=alpha[i];
             pixels[i].blue*=alpha[i];
@@ -3868,7 +3868,7 @@ MagickExport MagickPixelPacket InterpolatePixelColor(const Image *image,
           if (image->matte != MagickFalse)
             {
               alpha[n]=QuantumScale*((MagickRealType)
-                GetAlphaPixelComponent(p));
+                GetPixelAlpha(p));
               pixels[n].red*=alpha[n];
               pixels[n].green*=alpha[n];
               pixels[n].blue*=alpha[n];
@@ -4535,7 +4535,7 @@ MagickExport MagickBooleanType MatteFloodfillImage(Image *image,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+      if (GetPixelOpacity(p) != OpaqueOpacity)
         q->opacity=opacity;
       p++;
       q++;
@@ -5553,8 +5553,8 @@ MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char
           else if (order == 4)
             threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)];
           index=(IndexPacket) (intensity <= threshold ? 0 : 1);
-          SetIndexPixelComponent(indexes+x,index);
-          SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+          SetPixelIndex(indexes+x,index);
+          SetPixelRGBO(q,image->colormap+(ssize_t) index);
           q++;
         }
       }
@@ -5581,7 +5581,7 @@ MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char
                 threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)];
               else if (order == 4)
                 threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)]/1.7;
-              SetOpacityPixelComponent(q,(MagickRealType) q->opacity <=
+              SetPixelOpacity(q,(MagickRealType) q->opacity <=
                 threshold ? 0 : QuantumRange);
               q++;
             }
@@ -5955,12 +5955,12 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRGBOPixelComponents(q,&background_color);
+          SetPixelRGBO(q,&background_color);
           q++;
         }
         indexes=GetAuthenticIndexQueue(image);
         for (x=0; x < (ssize_t) image->columns; x++)
-          SetIndexPixelComponent(indexes+x,0);
+          SetPixelIndex(indexes+x,0);
         if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
           break;
       }
@@ -5982,7 +5982,7 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRGBOPixelComponents(q,&background_color);
+      SetPixelRGBO(q,&background_color);
       q++;
     }
     if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
@@ -6620,8 +6620,8 @@ MagickExport unsigned int ThresholdImage(Image *image,const double threshold)
     {
       index=(IndexPacket) ((MagickRealType) PixelIntensityToQuantum(q) <=
         threshold ? 0 : 1);
-      SetIndexPixelComponent(indexes+x,index);
-      SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      SetPixelIndex(indexes+x,index);
+      SetPixelRGBO(q,image->colormap+(ssize_t) index);
       q++;
     }
     if (!SyncAuthenticPixels(image,&image->exception))
@@ -6735,22 +6735,22 @@ MagickExport unsigned int ThresholdImageChannel(Image *image,
       {
         index=(IndexPacket) ((MagickRealType)
           PixelIntensityToQuantum(q) <= pixel.red ? 0 : 1);
-        SetIndexPixelComponent(indexes+x,index);
-        SetRedPixelComponent(q,image->colormap[(ssize_t) index].red);
-        SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green);
-        SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue);
+        SetPixelIndex(indexes+x,index);
+        SetPixelRed(q,image->colormap[(ssize_t) index].red);
+        SetPixelGreen(q,image->colormap[(ssize_t) index].green);
+        SetPixelBlue(q,image->colormap[(ssize_t) index].blue);
         q++;
       }
     else
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetRedPixelComponent(q,(MagickRealType) q->red <= pixel.red
+        SetPixelRed(q,(MagickRealType) q->red <= pixel.red
           ? 0 : QuantumRange);
-        SetGreenPixelComponent(q,(MagickRealType) q->green <= pixel.green
+        SetPixelGreen(q,(MagickRealType) q->green <= pixel.green
           ? 0 : QuantumRange);
-        SetBluePixelComponent(q,(MagickRealType) q->blue <= pixel.blue
+        SetPixelBlue(q,(MagickRealType) q->blue <= pixel.blue
           ?  0 : QuantumRange);
-        SetOpacityPixelComponent(q,(MagickRealType) q->opacity <= pixel.opacity
+        SetPixelOpacity(q,(MagickRealType) q->opacity <= pixel.opacity
           ? 0 : QuantumRange);
         q++;
       }
index 70a867654d516ef397ec85bf2e005b65b0810ec6..e585e751b0ca12aff861911c5066b004c23fc882 100644 (file)
@@ -2547,7 +2547,7 @@ if ( i == 0 && j == 0 ) {
               ScaleFilter( resample_filter[id],
                     cx*cx, 0.0, s.y*cx/coeff[1], cx );
 #if 1
-//if ( i == 0 && j == 0 ) {
+/*if ( i == 0 && j == 0 ) {*/
 if ( d.x == 0.5 && d.y == 0.5 ) {
   fprintf(stderr, "x=%lf  y=%lf  u=%lf  v=%lf\n", d.x*coeff[1], d.y, s.x, s.y);
   fprintf(stderr, "radius = %lf  phi = %lf  validity = %lf\n",
index c79c0e0f5fd2f4ab3a836e984671eed540122d50..d40c927f78497eec1eccf82889dceda8cecb8a61 100644 (file)
@@ -3624,7 +3624,7 @@ static PolygonInfo **AcquirePolygonThreadSet(const DrawInfo *draw_info,
   return(polygon_info);
 }
 
-static MagickRealType GetPixelOpacity(PolygonInfo *polygon_info,
+static MagickRealType GetOpacityPixel(PolygonInfo *polygon_info,
   const MagickRealType mid,const MagickBooleanType fill,
   const FillRule fill_rule,const double x,const double y,
   MagickRealType *stroke_opacity)
@@ -3968,7 +3968,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
       /*
         Fill and/or stroke.
       */
-      fill_opacity=GetPixelOpacity(polygon_info[id],mid,fill,
+      fill_opacity=GetOpacityPixel(polygon_info[id],mid,fill,
         draw_info->fill_rule,(double) x,(double) y,&stroke_opacity);
       if (draw_info->stroke_antialias == MagickFalse)
         {
@@ -4302,7 +4302,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           if (q == (PixelPacket *) NULL)
             break;
           (void) GetFillColor(draw_info,x,y,&pixel);
-          SetOpacityPixelComponent(q,pixel.opacity);
+          SetPixelOpacity(q,pixel.opacity);
           (void) SyncCacheViewAuthenticPixels(image_view,exception);
           break;
         }
@@ -4336,7 +4336,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
                   continue;
                 }
               (void) GetFillColor(draw_info,x,y,&pixel);
-              SetOpacityPixelComponent(q,pixel.opacity);
+              SetPixelOpacity(q,pixel.opacity);
               q++;
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -4386,7 +4386,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               (void) GetFillColor(draw_info,x,y,&pixel);
-              SetOpacityPixelComponent(q,pixel.opacity);
+              SetPixelOpacity(q,pixel.opacity);
               q++;
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
index 95912fb394047de0fdae965340de33559812b321..668be1486ef52a69ef560dfcdcc4a501c29b7085 100644 (file)
@@ -340,19 +340,18 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
           alpha=1.0;
           if (((channel & OpacityChannel) != 0) &&
               (image->matte != MagickFalse))
-            alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(p));
+            alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
           if ((channel & RedChannel) != 0)
-            pixel.red+=(*k)*alpha*GetRedPixelComponent(p);
+            pixel.red+=(*k)*alpha*GetPixelRed(p);
           if ((channel & GreenChannel) != 0)
-            pixel.green+=(*k)*alpha*GetGreenPixelComponent(p);
+            pixel.green+=(*k)*alpha*GetPixelGreen(p);
           if ((channel & BlueChannel) != 0)
-            pixel.blue+=(*k)*alpha*GetBluePixelComponent(p);
+            pixel.blue+=(*k)*alpha*GetPixelBlue(p);
           if ((channel & OpacityChannel) != 0)
-            pixel.opacity+=(*k)*GetOpacityPixelComponent(p);
+            pixel.opacity+=(*k)*GetPixelOpacity(p);
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            pixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes+x+(width-i)*
-              v+u);
+            pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+(width-i)*v+u);
           gamma+=(*k)*alpha;
           k++;
           p++;
@@ -360,17 +359,16 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
       }
       gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+        SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+        SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+        SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+        SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
-          pixel.index));
+        SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*pixel.index));
       q++;
       r++;
     }
@@ -660,19 +658,18 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
           alpha=1.0;
           if (((channel & OpacityChannel) != 0) &&
               (image->matte != MagickFalse))
-            alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(p));
+            alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
           if ((channel & RedChannel) != 0)
-            pixel.red+=(*k)*alpha*GetRedPixelComponent(p);
+            pixel.red+=(*k)*alpha*GetPixelRed(p);
           if ((channel & GreenChannel) != 0)
-            pixel.green+=(*k)*alpha*GetGreenPixelComponent(p);
+            pixel.green+=(*k)*alpha*GetPixelGreen(p);
           if ((channel & BlueChannel) != 0)
-            pixel.blue+=(*k)*alpha*GetBluePixelComponent(p);
+            pixel.blue+=(*k)*alpha*GetPixelBlue(p);
           if ((channel & OpacityChannel) != 0)
-            pixel.opacity+=(*k)*GetOpacityPixelComponent(p);
+            pixel.opacity+=(*k)*GetPixelOpacity(p);
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            pixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes+x+(width-i)*
-              v+u);
+            pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+(width-i)*v+u);
           gamma+=(*k)*alpha;
           k++;
           p++;
@@ -680,17 +677,16 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
       }
       gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+        SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+        SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+        SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+        SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(sharp_indexes+x,ClampToQuantum(gamma*
-          pixel.index));
+        SetPixelIndex(sharp_indexes+x,ClampToQuantum(gamma*pixel.index));
       q++;
       r++;
     }
@@ -959,29 +955,29 @@ MagickExport Image *BlurImageChannel(const Image *image,
         {
           for (i=0; i < (ssize_t) width; i++)
           {
-            pixel.red+=(*k)*GetRedPixelComponent(kernel_pixels);
-            pixel.green+=(*k)*GetGreenPixelComponent(kernel_pixels);
-            pixel.blue+=(*k)*GetBluePixelComponent(kernel_pixels);
+            pixel.red+=(*k)*GetPixelRed(kernel_pixels);
+            pixel.green+=(*k)*GetPixelGreen(kernel_pixels);
+            pixel.blue+=(*k)*GetPixelBlue(kernel_pixels);
             k++;
             kernel_pixels++;
           }
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+            SetPixelRed(q,ClampToQuantum(pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+            SetPixelGreen(q,ClampToQuantum(pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=kernel;
               kernel_pixels=p;
               for (i=0; i < (ssize_t) width; i++)
               {
-                pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+                pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
                 k++;
                 kernel_pixels++;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -993,12 +989,11 @@ MagickExport Image *BlurImageChannel(const Image *image,
               kernel_indexes=indexes;
               for (i=0; i < (ssize_t) width; i++)
               {
-                pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes);
+                pixel.index+=(*k)*GetPixelIndex(kernel_indexes);
                 k++;
                 kernel_indexes++;
               }
-              SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(
-                pixel.index));
+              SetPixelIndex(blur_indexes+x,ClampToQuantum(pixel.index));
             }
         }
       else
@@ -1010,33 +1005,32 @@ MagickExport Image *BlurImageChannel(const Image *image,
           gamma=0.0;
           for (i=0; i < (ssize_t) width; i++)
           {
-            alpha=(MagickRealType) (QuantumScale*
-              GetAlphaPixelComponent(kernel_pixels));
-            pixel.red+=(*k)*alpha*GetRedPixelComponent(kernel_pixels);
-            pixel.green+=(*k)*alpha*GetGreenPixelComponent(kernel_pixels);
-            pixel.blue+=(*k)*alpha*GetBluePixelComponent(kernel_pixels);
+            alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(kernel_pixels));
+            pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels);
+            pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels);
+            pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels);
             gamma+=(*k)*alpha;
             k++;
             kernel_pixels++;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+            SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+            SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=kernel;
               kernel_pixels=p;
               for (i=0; i < (ssize_t) width; i++)
               {
-                pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+                pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
                 k++;
                 kernel_pixels++;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -1050,14 +1044,13 @@ MagickExport Image *BlurImageChannel(const Image *image,
               for (i=0; i < (ssize_t) width; i++)
               {
                 alpha=(MagickRealType) (QuantumScale*
-                  GetAlphaPixelComponent(kernel_pixels));
+                  GetPixelAlpha(kernel_pixels));
                 pixel.index+=(*k)*alpha*(*kernel_indexes);
                 k++;
                 kernel_pixels++;
                 kernel_indexes++;
               }
-              SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
-                pixel.index));
+              SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*pixel.index));
             }
         }
       indexes++;
@@ -1140,29 +1133,29 @@ MagickExport Image *BlurImageChannel(const Image *image,
         {
           for (i=0; i < (ssize_t) width; i++)
           {
-            pixel.red+=(*k)*GetRedPixelComponent(kernel_pixels);
-            pixel.green+=(*k)*GetGreenPixelComponent(kernel_pixels);
-            pixel.blue+=(*k)*GetBluePixelComponent(kernel_pixels);
+            pixel.red+=(*k)*GetPixelRed(kernel_pixels);
+            pixel.green+=(*k)*GetPixelGreen(kernel_pixels);
+            pixel.blue+=(*k)*GetPixelBlue(kernel_pixels);
             k++;
             kernel_pixels++;
           }
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+            SetPixelRed(q,ClampToQuantum(pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+            SetPixelGreen(q,ClampToQuantum(pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=kernel;
               kernel_pixels=p;
               for (i=0; i < (ssize_t) width; i++)
               {
-                pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+                pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
                 k++;
                 kernel_pixels++;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -1174,12 +1167,11 @@ MagickExport Image *BlurImageChannel(const Image *image,
               kernel_indexes=indexes;
               for (i=0; i < (ssize_t) width; i++)
               {
-                pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes);
+                pixel.index+=(*k)*GetPixelIndex(kernel_indexes);
                 k++;
                 kernel_indexes++;
               }
-              SetIndexPixelComponent(blur_indexes+y,ClampToQuantum(
-                pixel.index));
+              SetPixelIndex(blur_indexes+y,ClampToQuantum(pixel.index));
             }
         }
       else
@@ -1192,32 +1184,32 @@ MagickExport Image *BlurImageChannel(const Image *image,
           for (i=0; i < (ssize_t) width; i++)
           {
             alpha=(MagickRealType) (QuantumScale*
-              GetAlphaPixelComponent(kernel_pixels));
-            pixel.red+=(*k)*alpha*GetRedPixelComponent(kernel_pixels);
-            pixel.green+=(*k)*alpha*GetGreenPixelComponent(kernel_pixels);
-            pixel.blue+=(*k)*alpha*GetBluePixelComponent(kernel_pixels);
+              GetPixelAlpha(kernel_pixels));
+            pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels);
+            pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels);
+            pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels);
             gamma+=(*k)*alpha;
             k++;
             kernel_pixels++;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+            SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+            SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=kernel;
               kernel_pixels=p;
               for (i=0; i < (ssize_t) width; i++)
               {
-                pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+                pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
                 k++;
                 kernel_pixels++;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -1231,14 +1223,13 @@ MagickExport Image *BlurImageChannel(const Image *image,
               for (i=0; i < (ssize_t) width; i++)
               {
                 alpha=(MagickRealType) (QuantumScale*
-                  GetAlphaPixelComponent(kernel_pixels));
+                  GetPixelAlpha(kernel_pixels));
                 pixel.index+=(*k)*alpha*(*kernel_indexes);
                 k++;
                 kernel_pixels++;
                 kernel_indexes++;
               }
-              SetIndexPixelComponent(blur_indexes+y,ClampToQuantum(gamma*
-                pixel.index));
+              SetPixelIndex(blur_indexes+y,ClampToQuantum(gamma*pixel.index));
             }
         }
       indexes++;
@@ -1500,11 +1491,11 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
             kernel_pixels+=image->columns+width;
           }
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+            SetPixelRed(q,ClampToQuantum(pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+            SetPixelGreen(q,ClampToQuantum(pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=normal_kernel;
@@ -1518,7 +1509,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
                 }
                 kernel_pixels+=image->columns+width;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -1532,13 +1523,12 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
               {
                 for (u=0; u < (ssize_t) width; u++)
                 {
-                  pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes+u);
+                  pixel.index+=(*k)*GetPixelIndex(kernel_indexes+u);
                   k++;
                 }
                 kernel_indexes+=image->columns+width;
               }
-              SetIndexPixelComponent(convolve_indexes+x,ClampToQuantum(
-                pixel.index));
+              SetPixelIndex(convolve_indexes+x,ClampToQuantum(pixel.index));
             }
         }
       else
@@ -1564,11 +1554,11 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+            SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+            SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=normal_kernel;
@@ -1577,12 +1567,12 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
               {
                 for (u=0; u < (ssize_t) width; u++)
                 {
-                  pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels+u);
+                  pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels+u);
                   k++;
                 }
                 kernel_pixels+=image->columns+width;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -1599,14 +1589,14 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
                 {
                   alpha=(MagickRealType) (QuantumScale*(QuantumRange-
                     kernel_pixels[u].opacity));
-                  pixel.index+=(*k)*alpha*GetIndexPixelComponent(
+                  pixel.index+=(*k)*alpha*GetPixelIndex(
                     kernel_indexes+u);
                   k++;
                 }
                 kernel_pixels+=image->columns+width;
                 kernel_indexes+=image->columns+width;
               }
-              SetIndexPixelComponent(convolve_indexes+x,ClampToQuantum(gamma*
+              SetPixelIndex(convolve_indexes+x,ClampToQuantum(gamma*
                 pixel.index));
             }
         }
@@ -1872,11 +1862,11 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
       {
         switch (i)
         {
-          case 0: pixel[j]=GetRedPixelComponent(p); break;
-          case 1: pixel[j]=GetGreenPixelComponent(p); break;
-          case 2: pixel[j]=GetBluePixelComponent(p); break;
-          case 3: pixel[j]=GetOpacityPixelComponent(p); break;
-          case 4: pixel[j]=GetBlackPixelComponent(indexes+x); break;
+          case 0: pixel[j]=GetPixelRed(p); break;
+          case 1: pixel[j]=GetPixelGreen(p); break;
+          case 2: pixel[j]=GetPixelBlue(p); break;
+          case 3: pixel[j]=GetPixelOpacity(p); break;
+          case 4: pixel[j]=GetPixelBlack(indexes+x); break;
           default: break;
         }
         p++;
@@ -1914,11 +1904,11 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
       {
         switch (i)
         {
-          case 0: SetRedPixelComponent(q,pixel[j]); break;
-          case 1: SetGreenPixelComponent(q,pixel[j]); break;
-          case 2: SetBluePixelComponent(q,pixel[j]); break;
-          case 3: SetOpacityPixelComponent(q,pixel[j]); break;
-          case 4: SetIndexPixelComponent(indexes+x,pixel[j]); break;
+          case 0: SetPixelRed(q,pixel[j]); break;
+          case 1: SetPixelGreen(q,pixel[j]); break;
+          case 2: SetPixelBlue(q,pixel[j]); break;
+          case 3: SetPixelOpacity(q,pixel[j]); break;
+          case 4: SetPixelIndex(indexes+x,pixel[j]); break;
           default: break;
         }
         q++;
@@ -2303,11 +2293,11 @@ MagickExport Image *FilterImageChannel(const Image *image,
             kernel_pixels+=image->columns+kernel->width;
           }
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+            SetPixelRed(q,ClampToQuantum(pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+            SetPixelGreen(q,ClampToQuantum(pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=kernel->values;
@@ -2321,7 +2311,7 @@ MagickExport Image *FilterImageChannel(const Image *image,
                 }
                 kernel_pixels+=image->columns+kernel->width;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -2335,13 +2325,12 @@ MagickExport Image *FilterImageChannel(const Image *image,
               {
                 for (u=0; u < (ssize_t) kernel->height; u++)
                 {
-                  pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes+u);
+                  pixel.index+=(*k)*GetPixelIndex(kernel_indexes+u);
                   k++;
                 }
                 kernel_indexes+=image->columns+kernel->width;
               }
-              SetIndexPixelComponent(filter_indexes+x,ClampToQuantum(
-                pixel.index));
+              SetPixelIndex(filter_indexes+x,ClampToQuantum(pixel.index));
             }
         }
       else
@@ -2356,10 +2345,10 @@ MagickExport Image *FilterImageChannel(const Image *image,
             for (u=0; u < (ssize_t) kernel->height; u++)
             {
               alpha=(MagickRealType) (QuantumScale*(QuantumRange-
-                GetOpacityPixelComponent(kernel_pixels+u)));
-              pixel.red+=(*k)*alpha*GetRedPixelComponent(kernel_pixels+u);
-              pixel.green+=(*k)*alpha*GetGreenPixelComponent(kernel_pixels+u);
-              pixel.blue+=(*k)*alpha*GetBluePixelComponent(kernel_pixels+u);
+                GetPixelOpacity(kernel_pixels+u)));
+              pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels+u);
+              pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels+u);
+              pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels+u);
               gamma+=(*k)*alpha;
               k++;
             }
@@ -2367,11 +2356,11 @@ MagickExport Image *FilterImageChannel(const Image *image,
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+            SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+            SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+            SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
           if ((channel & OpacityChannel) != 0)
             {
               k=kernel->values;
@@ -2380,12 +2369,12 @@ MagickExport Image *FilterImageChannel(const Image *image,
               {
                 for (u=0; u < (ssize_t) kernel->height; u++)
                 {
-                  pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels+u);
+                  pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels+u);
                   k++;
                 }
                 kernel_pixels+=image->columns+kernel->width;
               }
-              SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+              SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
             }
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
@@ -2402,15 +2391,13 @@ MagickExport Image *FilterImageChannel(const Image *image,
                 {
                   alpha=(MagickRealType) (QuantumScale*(QuantumRange-
                     kernel_pixels[u].opacity));
-                  pixel.index+=(*k)*alpha*GetIndexPixelComponent(
-                    kernel_indexes+u);
+                  pixel.index+=(*k)*alpha*GetPixelIndex(kernel_indexes+u);
                   k++;
                 }
                 kernel_pixels+=image->columns+kernel->width;
                 kernel_indexes+=image->columns+kernel->width;
               }
-              SetIndexPixelComponent(filter_indexes+x,ClampToQuantum(gamma*
-                pixel.index));
+              SetPixelIndex(filter_indexes+x,ClampToQuantum(gamma*pixel.index));
             }
         }
       indexes++;
@@ -2763,16 +2750,16 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
             k++;
           }
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(qixel.red));
+            SetPixelRed(q,ClampToQuantum(qixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(qixel.green));
+            SetPixelGreen(q,ClampToQuantum(qixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(qixel.blue));
+            SetPixelBlue(q,ClampToQuantum(qixel.blue));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,ClampToQuantum(qixel.opacity));
+            SetPixelOpacity(q,ClampToQuantum(qixel.opacity));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(qixel.index));
+            SetPixelIndex(blur_indexes+x,ClampToQuantum(qixel.index));
         }
       else
         {
@@ -2786,8 +2773,7 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
           {
             (void) GetOneCacheViewVirtualPixel(image_view,x+offset[i].x,y+
               offset[i].y,&pixel,exception);
-            alpha=(MagickRealType) (QuantumScale*
-              GetAlphaPixelComponent(&pixel));
+            alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(&pixel));
             qixel.red+=(*k)*alpha*pixel.red;
             qixel.green+=(*k)*alpha*pixel.green;
             qixel.blue+=(*k)*alpha*pixel.blue;
@@ -2795,24 +2781,23 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
             if (image->colorspace == CMYKColorspace)
               {
                 indexes=GetCacheViewVirtualIndexQueue(image_view);
-                qixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes);
+                qixel.index+=(*k)*alpha*GetPixelIndex(indexes);
               }
             gamma+=(*k)*alpha;
             k++;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(gamma*qixel.red));
+            SetPixelRed(q,ClampToQuantum(gamma*qixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*qixel.green));
+            SetPixelGreen(q,ClampToQuantum(gamma*qixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(gamma*qixel.blue));
+            SetPixelBlue(q,ClampToQuantum(gamma*qixel.blue));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,ClampToQuantum(qixel.opacity));
+            SetPixelOpacity(q,ClampToQuantum(qixel.opacity));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
-              qixel.index));
+            SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*qixel.index));
         }
       q++;
     }
@@ -3577,17 +3562,16 @@ MagickExport Image *RadialBlurImageChannel(const Image *image,
           normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
             normalize);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(normalize*qixel.red));
+            SetPixelRed(q,ClampToQuantum(normalize*qixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(normalize*qixel.green));
+            SetPixelGreen(q,ClampToQuantum(normalize*qixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(normalize*qixel.blue));
+            SetPixelBlue(q,ClampToQuantum(normalize*qixel.blue));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,ClampToQuantum(normalize*qixel.opacity));
+            SetPixelOpacity(q,ClampToQuantum(normalize*qixel.opacity));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(normalize*
-              qixel.index));
+            SetPixelIndex(blur_indexes+x,ClampToQuantum(normalize*qixel.index));
         }
       else
         {
@@ -3604,7 +3588,7 @@ MagickExport Image *RadialBlurImageChannel(const Image *image,
               (ssize_t) (blur_center.y+center.x*sin_theta[i]+center.y*
               cos_theta[i]+0.5),&pixel,exception);
             alpha=(MagickRealType) (QuantumScale*
-              GetAlphaPixelComponent(&pixel));
+              GetPixelAlpha(&pixel));
             qixel.red+=alpha*pixel.red;
             qixel.green+=alpha*pixel.green;
             qixel.blue+=alpha*pixel.blue;
@@ -3621,17 +3605,16 @@ MagickExport Image *RadialBlurImageChannel(const Image *image,
           normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
             normalize);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(gamma*qixel.red));
+            SetPixelRed(q,ClampToQuantum(gamma*qixel.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*qixel.green));
+            SetPixelGreen(q,ClampToQuantum(gamma*qixel.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(gamma*qixel.blue));
+            SetPixelBlue(q,ClampToQuantum(gamma*qixel.blue));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,ClampToQuantum(normalize*qixel.opacity));
+            SetPixelOpacity(q,ClampToQuantum(normalize*qixel.opacity));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
-              qixel.index));
+            SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*qixel.index));
         }
       q++;
     }
@@ -3893,9 +3876,9 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
             {
               if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
                 {
-                  pixel.red+=(*k)*GetRedPixelComponent(p+u+j);
-                  pixel.green+=(*k)*GetGreenPixelComponent(p+u+j);
-                  pixel.blue+=(*k)*GetBluePixelComponent(p+u+j);
+                  pixel.red+=(*k)*GetPixelRed(p+u+j);
+                  pixel.green+=(*k)*GetPixelGreen(p+u+j);
+                  pixel.blue+=(*k)*GetPixelBlue(p+u+j);
                   gamma+=(*k);
                   k++;
                 }
@@ -3906,11 +3889,11 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
             {
               gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
               if ((channel & RedChannel) != 0)
-                SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+                SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
               if ((channel & GreenChannel) != 0)
-                SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+                SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
               if ((channel & BlueChannel) != 0)
-                SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+                SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
             }
           if ((channel & OpacityChannel) != 0)
             {
@@ -3933,8 +3916,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 {
                   gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
                     gamma);
-                  SetOpacityPixelComponent(q,ClampToQuantum(gamma*
-                    pixel.opacity));
+                  SetPixelOpacity(q,ClampToQuantum(gamma*pixel.opacity));
                 }
             }
           if (((channel & IndexChannel) != 0) &&
@@ -3948,7 +3930,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 {
                   if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
                     {
-                      pixel.index+=(*k)*GetIndexPixelComponent(indexes+x+u+j);
+                      pixel.index+=(*k)*GetPixelIndex(indexes+x+u+j);
                       gamma+=(*k);
                       k++;
                     }
@@ -3959,7 +3941,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 {
                   gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
                     gamma);
-                  SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
+                  SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*
                     pixel.index));
                 }
             }
@@ -3975,12 +3957,11 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
             {
               if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
                 {
-                  alpha=(MagickRealType) (QuantumScale*
-                    GetAlphaPixelComponent(p+u+j));
-                  pixel.red+=(*k)*alpha*GetRedPixelComponent(p+u+j);
-                  pixel.green+=(*k)*alpha*GetGreenPixelComponent(p+u+j);
-                  pixel.blue+=(*k)*alpha*GetBluePixelComponent(p+u+j);
-                  pixel.opacity+=(*k)*GetOpacityPixelComponent(p+u+j);
+                  alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p+u+j));
+                  pixel.red+=(*k)*alpha*GetPixelRed(p+u+j);
+                  pixel.green+=(*k)*alpha*GetPixelGreen(p+u+j);
+                  pixel.blue+=(*k)*alpha*GetPixelBlue(p+u+j);
+                  pixel.opacity+=(*k)*GetPixelOpacity(p+u+j);
                   gamma+=(*k)*alpha;
                   k++;
                 }
@@ -3991,11 +3972,11 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
             {
               gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
               if ((channel & RedChannel) != 0)
-                SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+                SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
               if ((channel & GreenChannel) != 0)
-                SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+                SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
               if ((channel & BlueChannel) != 0)
-                SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+                SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
             }
           if ((channel & OpacityChannel) != 0)
             {
@@ -4007,7 +3988,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 {
                   if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
                     {
-                      pixel.opacity+=(*k)*GetOpacityPixelComponent(p+u+j);
+                      pixel.opacity+=(*k)*GetPixelOpacity(p+u+j);
                       gamma+=(*k);
                       k++;
                     }
@@ -4018,7 +3999,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 {
                   gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
                     gamma);
-                  SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+                  SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
                 }
             }
           if (((channel & IndexChannel) != 0) &&
@@ -4033,9 +4014,8 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                   if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
                     {
                       alpha=(MagickRealType) (QuantumScale*
-                        GetAlphaPixelComponent(p+u+j));
-                      pixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes+x+
-                        u+j);
+                        GetPixelAlpha(p+u+j));
+                      pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+u+j);
                       gamma+=(*k);
                       k++;
                     }
@@ -4046,7 +4026,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 {
                   gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
                     gamma);
-                  SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
+                  SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*
                     pixel.index));
                 }
             }
@@ -4238,18 +4218,15 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
         }
       if (gray != MagickFalse)
         {
-          SetRedPixelComponent(q,shade);
-          SetGreenPixelComponent(q,shade);
-          SetBluePixelComponent(q,shade);
+          SetPixelRed(q,shade);
+          SetPixelGreen(q,shade);
+          SetPixelBlue(q,shade);
         }
       else
         {
-          SetRedPixelComponent(q,ClampToQuantum(QuantumScale*shade*
-            GetRedPixelComponent(s1)));
-          SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*shade*
-            GetGreenPixelComponent(s1)));
-          SetBluePixelComponent(q,ClampToQuantum(QuantumScale*shade*
-            GetBluePixelComponent(s1)));
+          SetPixelRed(q,ClampToQuantum(QuantumScale*shade*GetPixelRed(s1)));
+          SetPixelGreen(q,ClampToQuantum(QuantumScale*shade*GetPixelGreen(s1)));
+          SetPixelBlue(q,ClampToQuantum(QuantumScale*shade*GetPixelBlue(s1)));
         }
       q->opacity=s1->opacity;
       s0++;
@@ -5104,32 +5081,32 @@ static inline void InsertPixelList(const Image *image,const PixelPacket *pixel,
   unsigned short
     index;
 
-  index=ScaleQuantumToShort(GetRedPixelComponent(pixel));
+  index=ScaleQuantumToShort(GetPixelRed(pixel));
   signature=pixel_list->lists[0].nodes[index].signature;
   if (signature == pixel_list->signature)
     pixel_list->lists[0].nodes[index].count++;
   else
     AddNodePixelList(pixel_list,0,index);
-  index=ScaleQuantumToShort(GetGreenPixelComponent(pixel));
+  index=ScaleQuantumToShort(GetPixelGreen(pixel));
   signature=pixel_list->lists[1].nodes[index].signature;
   if (signature == pixel_list->signature)
     pixel_list->lists[1].nodes[index].count++;
   else
     AddNodePixelList(pixel_list,1,index);
-  index=ScaleQuantumToShort(GetBluePixelComponent(pixel));
+  index=ScaleQuantumToShort(GetPixelBlue(pixel));
   signature=pixel_list->lists[2].nodes[index].signature;
   if (signature == pixel_list->signature)
     pixel_list->lists[2].nodes[index].count++;
   else
     AddNodePixelList(pixel_list,2,index);
-  index=ScaleQuantumToShort(GetOpacityPixelComponent(pixel));
+  index=ScaleQuantumToShort(GetPixelOpacity(pixel));
   signature=pixel_list->lists[3].nodes[index].signature;
   if (signature == pixel_list->signature)
     pixel_list->lists[3].nodes[index].count++;
   else
     AddNodePixelList(pixel_list,3,index);
   if (image->colorspace == CMYKColorspace)
-    index=ScaleQuantumToShort(GetIndexPixelComponent(indexes));
+    index=ScaleQuantumToShort(GetPixelIndex(indexes));
   signature=pixel_list->lists[4].nodes[index].signature;
   if (signature == pixel_list->signature)
     pixel_list->lists[4].nodes[index].count++;
@@ -5364,17 +5341,17 @@ MagickExport Image *StatisticImageChannel(const Image *image,
         }
       }
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+        SetPixelRed(q,ClampToQuantum(pixel.red));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+        SetPixelGreen(q,ClampToQuantum(pixel.green));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+        SetPixelBlue(q,ClampToQuantum(pixel.blue));
       if (((channel & OpacityChannel) != 0) &&
           (image->matte != MagickFalse))
-        SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+        SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(statistic_indexes+x,ClampToQuantum(pixel.index));
+        SetPixelIndex(statistic_indexes+x,ClampToQuantum(pixel.index));
       p++;
       q++;
     }
@@ -5542,53 +5519,51 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image,
     {
       if ((channel & RedChannel) != 0)
         {
-          pixel.red=GetRedPixelComponent(p)-(MagickRealType)
-            GetRedPixelComponent(q);
+          pixel.red=GetPixelRed(p)-(MagickRealType) GetPixelRed(q);
           if (fabs(2.0*pixel.red) < quantum_threshold)
-            pixel.red=(MagickRealType) GetRedPixelComponent(p);
+            pixel.red=(MagickRealType) GetPixelRed(p);
           else
-            pixel.red=(MagickRealType) GetRedPixelComponent(p)+
-              (pixel.red*amount);
-          SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+            pixel.red=(MagickRealType) GetPixelRed(p)+(pixel.red*amount);
+          SetPixelRed(q,ClampToQuantum(pixel.red));
         }
       if ((channel & GreenChannel) != 0)
         {
-          pixel.green=GetGreenPixelComponent(p)-(MagickRealType) q->green;
+          pixel.green=GetPixelGreen(p)-(MagickRealType) q->green;
           if (fabs(2.0*pixel.green) < quantum_threshold)
-            pixel.green=(MagickRealType) GetGreenPixelComponent(p);
+            pixel.green=(MagickRealType) GetPixelGreen(p);
           else
-            pixel.green=(MagickRealType) GetGreenPixelComponent(p)+(pixel.green*amount);
-          SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+            pixel.green=(MagickRealType) GetPixelGreen(p)+(pixel.green*amount);
+          SetPixelGreen(q,ClampToQuantum(pixel.green));
         }
       if ((channel & BlueChannel) != 0)
         {
-          pixel.blue=GetBluePixelComponent(p)-(MagickRealType) q->blue;
+          pixel.blue=GetPixelBlue(p)-(MagickRealType) q->blue;
           if (fabs(2.0*pixel.blue) < quantum_threshold)
-            pixel.blue=(MagickRealType) GetBluePixelComponent(p);
+            pixel.blue=(MagickRealType) GetPixelBlue(p);
           else
-            pixel.blue=(MagickRealType) GetBluePixelComponent(p)+(pixel.blue*amount);
-          SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+            pixel.blue=(MagickRealType) GetPixelBlue(p)+(pixel.blue*amount);
+          SetPixelBlue(q,ClampToQuantum(pixel.blue));
         }
       if ((channel & OpacityChannel) != 0)
         {
-          pixel.opacity=GetOpacityPixelComponent(p)-(MagickRealType) q->opacity;
+          pixel.opacity=GetPixelOpacity(p)-(MagickRealType) q->opacity;
           if (fabs(2.0*pixel.opacity) < quantum_threshold)
-            pixel.opacity=(MagickRealType) GetOpacityPixelComponent(p);
+            pixel.opacity=(MagickRealType) GetPixelOpacity(p);
           else
-            pixel.opacity=GetOpacityPixelComponent(p)+(pixel.opacity*amount);
-          SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+            pixel.opacity=GetPixelOpacity(p)+(pixel.opacity*amount);
+          SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
         }
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
         {
-          pixel.index=GetIndexPixelComponent(indexes+x)-(MagickRealType)
-            GetIndexPixelComponent(unsharp_indexes+x);
+          pixel.index=GetPixelIndex(indexes+x)-(MagickRealType)
+            GetPixelIndex(unsharp_indexes+x);
           if (fabs(2.0*pixel.index) < quantum_threshold)
-            pixel.index=(MagickRealType) GetIndexPixelComponent(indexes+x);
+            pixel.index=(MagickRealType) GetPixelIndex(indexes+x);
           else
-            pixel.index=(MagickRealType) GetIndexPixelComponent(indexes+x)+
+            pixel.index=(MagickRealType) GetPixelIndex(indexes+x)+
               (pixel.index*amount);
-          SetIndexPixelComponent(unsharp_indexes+x,ClampToQuantum(pixel.index));
+          SetPixelIndex(unsharp_indexes+x,ClampToQuantum(pixel.index));
         }
       p++;
       q++;
index bbb7611a4dde85777f26e09bc8dbe802838ad018..6320a6e0eadd68efb3526c24b5d3b4d030c95ab4 100644 (file)
@@ -658,14 +658,14 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      luma=0.2126*GetRedPixelComponent(q)+0.7152*GetGreenPixelComponent(q)+
-        0.0722*GetBluePixelComponent(q);
-      SetRedPixelComponent(q,ClampToQuantum(luma+color_correction.saturation*
-        (cdl_map[ScaleQuantumToMap(GetRedPixelComponent(q))].red-luma)));
-      SetGreenPixelComponent(q,ClampToQuantum(luma+color_correction.saturation*
-        (cdl_map[ScaleQuantumToMap(GetGreenPixelComponent(q))].green-luma)));
-      SetBluePixelComponent(q,ClampToQuantum(luma+color_correction.saturation*
-        (cdl_map[ScaleQuantumToMap(GetBluePixelComponent(q))].blue-luma)));
+      luma=0.2126*GetPixelRed(q)+0.7152*GetPixelGreen(q)+
+        0.0722*GetPixelBlue(q);
+      SetPixelRed(q,ClampToQuantum(luma+color_correction.saturation*
+        (cdl_map[ScaleQuantumToMap(GetPixelRed(q))].red-luma)));
+      SetPixelGreen(q,ClampToQuantum(luma+color_correction.saturation*
+        (cdl_map[ScaleQuantumToMap(GetPixelGreen(q))].green-luma)));
+      SetPixelBlue(q,ClampToQuantum(luma+color_correction.saturation*
+        (cdl_map[ScaleQuantumToMap(GetPixelBlue(q))].blue-luma)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -831,31 +831,31 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
     {
       SetMagickPixelPacket(image,q,indexes+x,&pixel);
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampRedPixelComponent(clut_map+
-          ScaleQuantumToMap(GetRedPixelComponent(q))));
+        SetPixelRed(q,ClampPixelRed(clut_map+
+          ScaleQuantumToMap(GetPixelRed(q))));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampGreenPixelComponent(clut_map+
-          ScaleQuantumToMap(GetGreenPixelComponent(q))));
+        SetPixelGreen(q,ClampPixelGreen(clut_map+
+          ScaleQuantumToMap(GetPixelGreen(q))));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampBluePixelComponent(clut_map+
-          ScaleQuantumToMap(GetBluePixelComponent(q))));
+        SetPixelBlue(q,ClampPixelBlue(clut_map+
+          ScaleQuantumToMap(GetPixelBlue(q))));
       if ((channel & OpacityChannel) != 0)
         {
           if (clut_image->matte == MagickFalse)
-            SetAlphaPixelComponent(q,MagickPixelIntensityToQuantum(clut_map+
-              ScaleQuantumToMap((Quantum) GetAlphaPixelComponent(q))));
+            SetPixelAlpha(q,MagickPixelIntensityToQuantum(clut_map+
+              ScaleQuantumToMap((Quantum) GetPixelAlpha(q))));
           else
             if (image->matte == MagickFalse)
-              SetOpacityPixelComponent(q,ClampOpacityPixelComponent(clut_map+
+              SetPixelOpacity(q,ClampPixelOpacity(clut_map+
                 ScaleQuantumToMap((Quantum) MagickPixelIntensity(&pixel))));
             else
-              SetOpacityPixelComponent(q,ClampOpacityPixelComponent(
-                clut_map+ScaleQuantumToMap(GetOpacityPixelComponent(q))));
+              SetPixelOpacity(q,ClampPixelOpacity(
+                clut_map+ScaleQuantumToMap(GetPixelOpacity(q))));
         }
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,ClampToQuantum((clut_map+(ssize_t)
-          GetIndexPixelComponent(indexes+x))->index));
+        SetPixelIndex(indexes+x,ClampToQuantum((clut_map+(ssize_t)
+          GetPixelIndex(indexes+x))->index));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1008,13 +1008,13 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      red=GetRedPixelComponent(q);
-      green=GetGreenPixelComponent(q);
-      blue=GetBluePixelComponent(q);
+      red=GetPixelRed(q);
+      green=GetPixelGreen(q);
+      blue=GetPixelBlue(q);
       Contrast(sign,&red,&green,&blue);
-      SetRedPixelComponent(q,red);
-      SetGreenPixelComponent(q,green);
-      SetBluePixelComponent(q,blue);
+      SetPixelRed(q,red);
+      SetPixelGreen(q,green);
+      SetPixelBlue(q,blue);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1207,16 +1207,16 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         if ((channel & RedChannel) != 0)
-          histogram[ScaleQuantumToMap(GetRedPixelComponent(p))].red++;
+          histogram[ScaleQuantumToMap(GetPixelRed(p))].red++;
         if ((channel & GreenChannel) != 0)
-          histogram[ScaleQuantumToMap(GetGreenPixelComponent(p))].green++;
+          histogram[ScaleQuantumToMap(GetPixelGreen(p))].green++;
         if ((channel & BlueChannel) != 0)
-          histogram[ScaleQuantumToMap(GetBluePixelComponent(p))].blue++;
+          histogram[ScaleQuantumToMap(GetPixelBlue(p))].blue++;
         if ((channel & OpacityChannel) != 0)
-          histogram[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity++;
+          histogram[ScaleQuantumToMap(GetPixelOpacity(p))].opacity++;
         if (((channel & IndexChannel) != 0) &&
             (image->colorspace == CMYKColorspace))
-          histogram[ScaleQuantumToMap(GetIndexPixelComponent(
+          histogram[ScaleQuantumToMap(GetPixelIndex(
             indexes+x))].index++;
         p++;
       }
@@ -1480,33 +1480,33 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
       if ((channel & RedChannel) != 0)
         {
           if (black.red != white.red)
-            SetRedPixelComponent(q,ClampToQuantum(stretch_map[
-              ScaleQuantumToMap(GetRedPixelComponent(q))].red));
+            SetPixelRed(q,ClampToQuantum(stretch_map[
+              ScaleQuantumToMap(GetPixelRed(q))].red));
         }
       if ((channel & GreenChannel) != 0)
         {
           if (black.green != white.green)
-            SetGreenPixelComponent(q,ClampToQuantum(stretch_map[
-              ScaleQuantumToMap(GetGreenPixelComponent(q))].green));
+            SetPixelGreen(q,ClampToQuantum(stretch_map[
+              ScaleQuantumToMap(GetPixelGreen(q))].green));
         }
       if ((channel & BlueChannel) != 0)
         {
           if (black.blue != white.blue)
-            SetBluePixelComponent(q,ClampToQuantum(stretch_map[
-              ScaleQuantumToMap(GetBluePixelComponent(q))].blue));
+            SetPixelBlue(q,ClampToQuantum(stretch_map[
+              ScaleQuantumToMap(GetPixelBlue(q))].blue));
         }
       if ((channel & OpacityChannel) != 0)
         {
           if (black.opacity != white.opacity)
-            SetOpacityPixelComponent(q,ClampToQuantum(stretch_map[
-              ScaleQuantumToMap(GetOpacityPixelComponent(q))].opacity));
+            SetPixelOpacity(q,ClampToQuantum(stretch_map[
+              ScaleQuantumToMap(GetPixelOpacity(q))].opacity));
         }
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
         {
           if (black.index != white.index)
-            SetIndexPixelComponent(indexes+x,ClampToQuantum(stretch_map[
-              ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index));
+            SetPixelIndex(indexes+x,ClampToQuantum(stretch_map[
+              ScaleQuantumToMap(GetPixelIndex(indexes+x))].index));
         }
       q++;
     }
@@ -1559,16 +1559,16 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
 MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
 {
 #define Enhance(weight) \
-  mean=((MagickRealType) GetRedPixelComponent(r)+pixel.red)/2; \
-  distance=(MagickRealType) GetRedPixelComponent(r)-(MagickRealType) pixel.red; \
+  mean=((MagickRealType) GetPixelRed(r)+pixel.red)/2; \
+  distance=(MagickRealType) GetPixelRed(r)-(MagickRealType) pixel.red; \
   distance_squared=QuantumScale*(2.0*((MagickRealType) QuantumRange+1.0)+ \
      mean)*distance*distance; \
-  mean=((MagickRealType) GetGreenPixelComponent(r)+pixel.green)/2; \
-  distance=(MagickRealType) GetGreenPixelComponent(r)-(MagickRealType) \
+  mean=((MagickRealType) GetPixelGreen(r)+pixel.green)/2; \
+  distance=(MagickRealType) GetPixelGreen(r)-(MagickRealType) \
     pixel.green; \
   distance_squared+=4.0*distance*distance; \
-  mean=((MagickRealType) GetBluePixelComponent(r)+pixel.blue)/2; \
-  distance=(MagickRealType) GetBluePixelComponent(r)-(MagickRealType) \
+  mean=((MagickRealType) GetPixelBlue(r)+pixel.blue)/2; \
+  distance=(MagickRealType) GetPixelBlue(r)-(MagickRealType) \
     pixel.blue; \
   distance_squared+=QuantumScale*(3.0*((MagickRealType) \
     QuantumRange+1.0)-1.0-mean)*distance*distance; \
@@ -1579,10 +1579,10 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
   if (distance_squared < ((MagickRealType) QuantumRange*(MagickRealType) \
       QuantumRange/25.0f)) \
     { \
-      aggregate.red+=(weight)*GetRedPixelComponent(r); \
-      aggregate.green+=(weight)*GetGreenPixelComponent(r); \
-      aggregate.blue+=(weight)*GetBluePixelComponent(r); \
-      aggregate.opacity+=(weight)*GetOpacityPixelComponent(r); \
+      aggregate.red+=(weight)*GetPixelRed(r); \
+      aggregate.green+=(weight)*GetPixelGreen(r); \
+      aggregate.blue+=(weight)*GetPixelBlue(r); \
+      aggregate.opacity+=(weight)*GetPixelOpacity(r); \
       total_weight+=(weight); \
     } \
   r++;
@@ -1697,11 +1697,11 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
       Enhance(8.0); Enhance(20.0); Enhance(40.0); Enhance(20.0); Enhance(8.0);
       r=p+4*(image->columns+4);
       Enhance(5.0); Enhance(8.0); Enhance(10.0); Enhance(8.0); Enhance(5.0);
-      SetRedPixelComponent(q,(aggregate.red+(total_weight/2)-1)/total_weight);
-      SetGreenPixelComponent(q,(aggregate.green+(total_weight/2)-1)/
+      SetPixelRed(q,(aggregate.red+(total_weight/2)-1)/total_weight);
+      SetPixelGreen(q,(aggregate.green+(total_weight/2)-1)/
         total_weight);
-      SetBluePixelComponent(q,(aggregate.blue+(total_weight/2)-1)/total_weight);
-      SetOpacityPixelComponent(q,(aggregate.opacity+(total_weight/2)-1)/
+      SetPixelBlue(q,(aggregate.blue+(total_weight/2)-1)/total_weight);
+      SetPixelOpacity(q,(aggregate.opacity+(total_weight/2)-1)/
         total_weight);
       p++;
       q++;
@@ -1837,16 +1837,16 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        histogram[ScaleQuantumToMap(GetRedPixelComponent(p))].red++;
+        histogram[ScaleQuantumToMap(GetPixelRed(p))].red++;
       if ((channel & GreenChannel) != 0)
-        histogram[ScaleQuantumToMap(GetGreenPixelComponent(p))].green++;
+        histogram[ScaleQuantumToMap(GetPixelGreen(p))].green++;
       if ((channel & BlueChannel) != 0)
-        histogram[ScaleQuantumToMap(GetBluePixelComponent(p))].blue++;
+        histogram[ScaleQuantumToMap(GetPixelBlue(p))].blue++;
       if ((channel & OpacityChannel) != 0)
-        histogram[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity++;
+        histogram[ScaleQuantumToMap(GetPixelOpacity(p))].opacity++;
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        histogram[ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index++;
+        histogram[ScaleQuantumToMap(GetPixelIndex(indexes+x))].index++;
       p++;
     }
   }
@@ -1956,22 +1956,22 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if (((channel & RedChannel) != 0) && (white.red != black.red))
-        SetRedPixelComponent(q,ClampToQuantum(equalize_map[
-          ScaleQuantumToMap(GetRedPixelComponent(q))].red));
+        SetPixelRed(q,ClampToQuantum(equalize_map[
+          ScaleQuantumToMap(GetPixelRed(q))].red));
       if (((channel & GreenChannel) != 0) && (white.green != black.green))
-        SetGreenPixelComponent(q,ClampToQuantum(equalize_map[
-          ScaleQuantumToMap(GetGreenPixelComponent(q))].green));
+        SetPixelGreen(q,ClampToQuantum(equalize_map[
+          ScaleQuantumToMap(GetPixelGreen(q))].green));
       if (((channel & BlueChannel) != 0) && (white.blue != black.blue))
-        SetBluePixelComponent(q,ClampToQuantum(equalize_map[
-          ScaleQuantumToMap(GetBluePixelComponent(q))].blue));
+        SetPixelBlue(q,ClampToQuantum(equalize_map[
+          ScaleQuantumToMap(GetPixelBlue(q))].blue));
       if (((channel & OpacityChannel) != 0) && (white.opacity != black.opacity))
-        SetOpacityPixelComponent(q,ClampToQuantum(equalize_map[
-          ScaleQuantumToMap(GetOpacityPixelComponent(q))].opacity));
+        SetPixelOpacity(q,ClampToQuantum(equalize_map[
+          ScaleQuantumToMap(GetPixelOpacity(q))].opacity));
       if ((((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace)) &&
           (white.index != black.index))
-        SetIndexPixelComponent(indexes+x,ClampToQuantum(equalize_map[
-          ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index));
+        SetPixelIndex(indexes+x,ClampToQuantum(equalize_map[
+          ScaleQuantumToMap(GetPixelIndex(indexes+x))].index));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2183,32 +2183,32 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image,
     {
       if (channel == DefaultChannels)
         {
-          SetRedPixelComponent(q,gamma_map[ScaleQuantumToMap(
-            GetRedPixelComponent(q))]);
-          SetGreenPixelComponent(q,gamma_map[ScaleQuantumToMap(
-            GetGreenPixelComponent(q))]);
-          SetBluePixelComponent(q,gamma_map[ScaleQuantumToMap(
-            GetBluePixelComponent(q))]);
+          SetPixelRed(q,gamma_map[ScaleQuantumToMap(
+            GetPixelRed(q))]);
+          SetPixelGreen(q,gamma_map[ScaleQuantumToMap(
+            GetPixelGreen(q))]);
+          SetPixelBlue(q,gamma_map[ScaleQuantumToMap(
+            GetPixelBlue(q))]);
         }
       else
         {
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,gamma_map[ScaleQuantumToMap(
-              GetRedPixelComponent(q))]);
+            SetPixelRed(q,gamma_map[ScaleQuantumToMap(
+              GetPixelRed(q))]);
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,gamma_map[ScaleQuantumToMap(
-              GetGreenPixelComponent(q))]);
+            SetPixelGreen(q,gamma_map[ScaleQuantumToMap(
+              GetPixelGreen(q))]);
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,gamma_map[ScaleQuantumToMap(
-              GetBluePixelComponent(q))]);
+            SetPixelBlue(q,gamma_map[ScaleQuantumToMap(
+              GetPixelBlue(q))]);
           if ((channel & OpacityChannel) != 0)
             {
               if (image->matte == MagickFalse)
-                SetOpacityPixelComponent(q,gamma_map[ScaleQuantumToMap(
-                  GetOpacityPixelComponent(q))]);
+                SetPixelOpacity(q,gamma_map[ScaleQuantumToMap(
+                  GetPixelOpacity(q))]);
               else
-                SetAlphaPixelComponent(q,gamma_map[ScaleQuantumToMap((Quantum)
-                  GetAlphaPixelComponent(q))]);
+                SetPixelAlpha(q,gamma_map[ScaleQuantumToMap((Quantum)
+                  GetPixelAlpha(q))]);
             }
         }
       q++;
@@ -2216,8 +2216,8 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image,
     if (((channel & IndexChannel) != 0) &&
         (image->colorspace == CMYKColorspace))
       for (x=0; x < (ssize_t) image->columns; x++)
-        SetIndexPixelComponent(indexes+x,gamma_map[ScaleQuantumToMap(
-          GetIndexPixelComponent(indexes+x))]);
+        SetPixelIndex(indexes+x,gamma_map[ScaleQuantumToMap(
+          GetPixelIndex(indexes+x))]);
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
     if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2394,9 +2394,9 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
     pixel4=zero;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      point.x=QuantumScale*(level-1.0)*GetRedPixelComponent(q);
-      point.y=QuantumScale*(level-1.0)*GetGreenPixelComponent(q);
-      point.z=QuantumScale*(level-1.0)*GetBluePixelComponent(q);
+      point.x=QuantumScale*(level-1.0)*GetPixelRed(q);
+      point.y=QuantumScale*(level-1.0)*GetPixelGreen(q);
+      point.z=QuantumScale*(level-1.0)*GetPixelBlue(q);
       offset=point.x+level*floor(point.y)+cube_size*floor(point.z);
       point.x-=floor(point.x);
       point.y-=floor(point.y);
@@ -2421,16 +2421,16 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
       MagickPixelCompositeAreaBlend(&pixel3,pixel3.opacity,&pixel4,
         pixel4.opacity,point.z,&pixel);
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+        SetPixelRed(q,ClampToQuantum(pixel.red));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+        SetPixelGreen(q,ClampToQuantum(pixel.green));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+        SetPixelBlue(q,ClampToQuantum(pixel.blue));
       if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
-        SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+        SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel.index));
+        SetPixelIndex(indexes+x,ClampToQuantum(pixel.index));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2668,18 +2668,18 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,LevelQuantum(GetRedPixelComponent(q)));
+        SetPixelRed(q,LevelQuantum(GetPixelRed(q)));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,LevelQuantum(GetGreenPixelComponent(q)));
+        SetPixelGreen(q,LevelQuantum(GetPixelGreen(q)));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,LevelQuantum(GetBluePixelComponent(q)));
+        SetPixelBlue(q,LevelQuantum(GetPixelBlue(q)));
       if (((channel & OpacityChannel) != 0) &&
           (image->matte == MagickTrue))
-        SetAlphaPixelComponent(q,LevelQuantum(GetAlphaPixelComponent(q)));
+        SetPixelAlpha(q,LevelQuantum(GetPixelAlpha(q)));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,LevelQuantum(
-          GetIndexPixelComponent(indexes+x)));
+        SetPixelIndex(indexes+x,LevelQuantum(
+          GetPixelIndex(indexes+x)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2840,18 +2840,18 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,LevelizeValue(GetRedPixelComponent(q)));
+        SetPixelRed(q,LevelizeValue(GetPixelRed(q)));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,LevelizeValue(GetGreenPixelComponent(q)));
+        SetPixelGreen(q,LevelizeValue(GetPixelGreen(q)));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,LevelizeValue(GetBluePixelComponent(q)));
+        SetPixelBlue(q,LevelizeValue(GetPixelBlue(q)));
       if (((channel & OpacityChannel) != 0) &&
           (image->matte == MagickTrue))
-        SetOpacityPixelComponent(q,LevelizeValue(GetOpacityPixelComponent(q)));
+        SetPixelOpacity(q,LevelizeValue(GetPixelOpacity(q)));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,LevelizeValue(
-          GetIndexPixelComponent(indexes+x)));
+        SetPixelIndex(indexes+x,LevelizeValue(
+          GetPixelIndex(indexes+x)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3326,9 +3326,9 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      red=GetRedPixelComponent(q);
-      green=GetGreenPixelComponent(q);
-      blue=GetBluePixelComponent(q);
+      red=GetPixelRed(q);
+      green=GetPixelGreen(q);
+      blue=GetPixelBlue(q);
       switch (colorspace)
       {
         case HSBColorspace:
@@ -3351,9 +3351,9 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
           break;
         }
       }
-      SetRedPixelComponent(q,red);
-      SetGreenPixelComponent(q,green);
-      SetBluePixelComponent(q,blue);
+      SetPixelRed(q,red);
+      SetPixelGreen(q,green);
+      SetPixelBlue(q,blue);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3506,25 +3506,25 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
         indexes=GetCacheViewAuthenticIndexQueue(image_view);
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          if ((GetRedPixelComponent(q) != GetGreenPixelComponent(q)) ||
-              (GetGreenPixelComponent(q) != GetBluePixelComponent(q)))
+          if ((GetPixelRed(q) != GetPixelGreen(q)) ||
+              (GetPixelGreen(q) != GetPixelBlue(q)))
             {
               q++;
               continue;
             }
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,QuantumRange-GetRedPixelComponent(q));
+            SetPixelRed(q,QuantumRange-GetPixelRed(q));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,QuantumRange-GetGreenPixelComponent(q));
+            SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,QuantumRange-GetBluePixelComponent(q));
+            SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,QuantumRange-
-              GetOpacityPixelComponent(q));
+            SetPixelOpacity(q,QuantumRange-
+              GetPixelOpacity(q));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(indexes+x,QuantumRange-
-              GetIndexPixelComponent(indexes+x));
+            SetPixelIndex(indexes+x,QuantumRange-
+              GetPixelIndex(indexes+x));
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -3576,17 +3576,17 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,QuantumRange-GetRedPixelComponent(q));
+        SetPixelRed(q,QuantumRange-GetPixelRed(q));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,QuantumRange-GetGreenPixelComponent(q));
+        SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,QuantumRange-GetBluePixelComponent(q));
+        SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,QuantumRange-GetOpacityPixelComponent(q));
+        SetPixelOpacity(q,QuantumRange-GetPixelOpacity(q));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,QuantumRange-
-          GetIndexPixelComponent(indexes+x));
+        SetPixelIndex(indexes+x,QuantumRange-
+          GetPixelIndex(indexes+x));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3845,21 +3845,21 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
-          GetRedPixelComponent(q))]));
+        SetPixelRed(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+          GetPixelRed(q))]));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
-          GetGreenPixelComponent(q))]));
+        SetPixelGreen(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+          GetPixelGreen(q))]));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
-          GetBluePixelComponent(q))]));
+        SetPixelBlue(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+          GetPixelBlue(q))]));
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,ClampToQuantum(sigmoidal_map[
-          ScaleQuantumToMap(GetOpacityPixelComponent(q))]));
+        SetPixelOpacity(q,ClampToQuantum(sigmoidal_map[
+          ScaleQuantumToMap(GetPixelOpacity(q))]));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,ClampToQuantum(sigmoidal_map[
-          ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))]));
+        SetPixelIndex(indexes+x,ClampToQuantum(sigmoidal_map[
+          ScaleQuantumToMap(GetPixelIndex(indexes+x))]));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index 57c3a1c23cf9492344f5d25bac6b030b31af476e..6605ba4abb2890291bfe8a9916e838f3a7cee0a4 100644 (file)
@@ -247,18 +247,18 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image,
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      grays[ScaleQuantumToMap(GetRedPixelComponent(p))].red=
-        ScaleQuantumToMap(GetRedPixelComponent(p));
-      grays[ScaleQuantumToMap(GetGreenPixelComponent(p))].green=
-        ScaleQuantumToMap(GetGreenPixelComponent(p));
-      grays[ScaleQuantumToMap(GetBluePixelComponent(p))].blue=
-        ScaleQuantumToMap(GetBluePixelComponent(p));
+      grays[ScaleQuantumToMap(GetPixelRed(p))].red=
+        ScaleQuantumToMap(GetPixelRed(p));
+      grays[ScaleQuantumToMap(GetPixelGreen(p))].green=
+        ScaleQuantumToMap(GetPixelGreen(p));
+      grays[ScaleQuantumToMap(GetPixelBlue(p))].blue=
+        ScaleQuantumToMap(GetPixelBlue(p));
       if (image->colorspace == CMYKColorspace)
-        grays[ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index=
-          ScaleQuantumToMap(GetIndexPixelComponent(indexes+x));
+        grays[ScaleQuantumToMap(GetPixelIndex(indexes+x))].index=
+          ScaleQuantumToMap(GetPixelIndex(indexes+x));
       if (image->matte != MagickFalse)
-        grays[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity=
-          ScaleQuantumToMap(GetOpacityPixelComponent(p));
+        grays[ScaleQuantumToMap(GetPixelOpacity(p))].opacity=
+          ScaleQuantumToMap(GetPixelOpacity(p));
       p++;
     }
   }
@@ -471,23 +471,23 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image,
         }
         u=0;
         v=0;
-        while (grays[u].red != ScaleQuantumToMap(GetRedPixelComponent(p)))
+        while (grays[u].red != ScaleQuantumToMap(GetPixelRed(p)))
           u++;
-        while (grays[v].red != ScaleQuantumToMap(GetRedPixelComponent(p+offset)))
+        while (grays[v].red != ScaleQuantumToMap(GetPixelRed(p+offset)))
           v++;
         cooccurrence[u][v].direction[i].red++;
         cooccurrence[v][u].direction[i].red++;
         u=0;
         v=0;
-        while (grays[u].green != ScaleQuantumToMap(GetGreenPixelComponent(p)))
+        while (grays[u].green != ScaleQuantumToMap(GetPixelGreen(p)))
           u++;
-        while (grays[v].green != ScaleQuantumToMap(GetGreenPixelComponent(p+offset)))
+        while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(p+offset)))
           v++;
         cooccurrence[u][v].direction[i].green++;
         cooccurrence[v][u].direction[i].green++;
         u=0;
         v=0;
-        while (grays[u].blue != ScaleQuantumToMap(GetBluePixelComponent(p)))
+        while (grays[u].blue != ScaleQuantumToMap(GetPixelBlue(p)))
           u++;
         while (grays[v].blue != ScaleQuantumToMap((p+offset)->blue))
           v++;
@@ -497,9 +497,9 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image,
           {
             u=0;
             v=0;
-            while (grays[u].index != ScaleQuantumToMap(GetIndexPixelComponent(indexes+x)))
+            while (grays[u].index != ScaleQuantumToMap(GetPixelIndex(indexes+x)))
               u++;
-            while (grays[v].index != ScaleQuantumToMap(GetIndexPixelComponent(indexes+x+offset)))
+            while (grays[v].index != ScaleQuantumToMap(GetPixelIndex(indexes+x+offset)))
               v++;
             cooccurrence[u][v].direction[i].index++;
             cooccurrence[v][u].direction[i].index++;
@@ -508,7 +508,7 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image,
           {
             u=0;
             v=0;
-            while (grays[u].opacity != ScaleQuantumToMap(GetOpacityPixelComponent(p)))
+            while (grays[u].opacity != ScaleQuantumToMap(GetPixelOpacity(p)))
               u++;
             while (grays[v].opacity != ScaleQuantumToMap((p+offset)->opacity))
               v++;
index a60354d30b848895bb1eda6e5bd2c304de8b20ef..142e774072102a4e80d4e3b76501040ad52237e3 100644 (file)
@@ -305,37 +305,37 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info,
         case RedChannel:
         default:
         {
-          SetRedPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelRed(q,ClampToQuantum(QuantumRange*
             magnitude_source[i]));
           break;
         }
         case GreenChannel:
         {
-          SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelGreen(q,ClampToQuantum(QuantumRange*
             magnitude_source[i]));
           break;
         }
         case BlueChannel:
         {
-          SetBluePixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelBlue(q,ClampToQuantum(QuantumRange*
             magnitude_source[i]));
           break;
         }
         case OpacityChannel:
         {
-          SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelOpacity(q,ClampToQuantum(QuantumRange*
             magnitude_source[i]));
           break;
         }
         case IndexChannel:
         {
-          SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange*
+          SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
             magnitude_source[i]));
           break;
         }
         case GrayChannels:
         {
-          SetGrayPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelGray(q,ClampToQuantum(QuantumRange*
             magnitude_source[i]));
           break;
         }
@@ -362,37 +362,37 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info,
         case RedChannel:
         default:
         {
-          SetRedPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelRed(q,ClampToQuantum(QuantumRange*
             phase_source[i]));
           break;
         }
         case GreenChannel:
         {
-          SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelGreen(q,ClampToQuantum(QuantumRange*
             phase_source[i]));
           break;
         }
         case BlueChannel:
         {
-          SetBluePixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelBlue(q,ClampToQuantum(QuantumRange*
             phase_source[i]));
           break;
         }
         case OpacityChannel:
         {
-          SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*
+          SetPixelOpacity(q,ClampToQuantum(QuantumRange*
             phase_source[i]));
           break;
         }
         case IndexChannel:
         {
-          SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange*
+          SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
             phase_source[i]));
           break;
         }
         case GrayChannels:
         {
-          SetGrayPixelComponent(q,ClampToQuantum(QuantumRange*phase_source[i]));
+          SetPixelGray(q,ClampToQuantum(QuantumRange*phase_source[i]));
           break;
         }
       }
@@ -468,32 +468,32 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info,
         case RedChannel:
         default:
         {
-          source[i]=QuantumScale*GetRedPixelComponent(p);
+          source[i]=QuantumScale*GetPixelRed(p);
           break;
         }
         case GreenChannel:
         {
-          source[i]=QuantumScale*GetGreenPixelComponent(p);
+          source[i]=QuantumScale*GetPixelGreen(p);
           break;
         }
         case BlueChannel:
         {
-          source[i]=QuantumScale*GetBluePixelComponent(p);
+          source[i]=QuantumScale*GetPixelBlue(p);
           break;
         }
         case OpacityChannel:
         {
-          source[i]=QuantumScale*GetOpacityPixelComponent(p);
+          source[i]=QuantumScale*GetPixelOpacity(p);
           break;
         }
         case IndexChannel:
         {
-          source[i]=QuantumScale*GetIndexPixelComponent(indexes+x);
+          source[i]=QuantumScale*GetPixelIndex(indexes+x);
           break;
         }
         case GrayChannels:
         {
-          source[i]=QuantumScale*GetGrayPixelComponent(p);
+          source[i]=QuantumScale*GetPixelGray(p);
           break;
         }
       }
@@ -893,32 +893,32 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info,
         case RedChannel:
         default:
         {
-          magnitude_source[i]=QuantumScale*GetRedPixelComponent(p);
+          magnitude_source[i]=QuantumScale*GetPixelRed(p);
           break;
         }
         case GreenChannel:
         {
-          magnitude_source[i]=QuantumScale*GetGreenPixelComponent(p);
+          magnitude_source[i]=QuantumScale*GetPixelGreen(p);
           break;
         }
         case BlueChannel:
         {
-          magnitude_source[i]=QuantumScale*GetBluePixelComponent(p);
+          magnitude_source[i]=QuantumScale*GetPixelBlue(p);
           break;
         }
         case OpacityChannel:
         {
-          magnitude_source[i]=QuantumScale*GetOpacityPixelComponent(p);
+          magnitude_source[i]=QuantumScale*GetPixelOpacity(p);
           break;
         }
         case IndexChannel:
         {
-          magnitude_source[i]=QuantumScale*GetIndexPixelComponent(indexes+x);
+          magnitude_source[i]=QuantumScale*GetPixelIndex(indexes+x);
           break;
         }
         case GrayChannels:
         {
-          magnitude_source[i]=QuantumScale*GetGrayPixelComponent(p);
+          magnitude_source[i]=QuantumScale*GetPixelGray(p);
           break;
         }
       }
@@ -942,32 +942,32 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info,
         case RedChannel:
         default:
         {
-          phase_source[i]=QuantumScale*GetRedPixelComponent(p);
+          phase_source[i]=QuantumScale*GetPixelRed(p);
           break;
         }
         case GreenChannel:
         {
-          phase_source[i]=QuantumScale*GetGreenPixelComponent(p);
+          phase_source[i]=QuantumScale*GetPixelGreen(p);
           break;
         }
         case BlueChannel:
         {
-          phase_source[i]=QuantumScale*GetBluePixelComponent(p);
+          phase_source[i]=QuantumScale*GetPixelBlue(p);
           break;
         }
         case OpacityChannel:
         {
-          phase_source[i]=QuantumScale*GetOpacityPixelComponent(p);
+          phase_source[i]=QuantumScale*GetPixelOpacity(p);
           break;
         }
         case IndexChannel:
         {
-          phase_source[i]=QuantumScale*GetIndexPixelComponent(indexes+x);
+          phase_source[i]=QuantumScale*GetPixelIndex(indexes+x);
           break;
         }
         case GrayChannels:
         {
-          phase_source[i]=QuantumScale*GetGrayPixelComponent(p);
+          phase_source[i]=QuantumScale*GetPixelGray(p);
           break;
         }
       }
@@ -1110,33 +1110,33 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info,
         case RedChannel:
         default:
         {
-          SetRedPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+          SetPixelRed(q,ClampToQuantum(QuantumRange*source[i]));
           break;
         }
         case GreenChannel:
         {
-          SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+          SetPixelGreen(q,ClampToQuantum(QuantumRange*source[i]));
           break;
         }
         case BlueChannel:
         {
-          SetBluePixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+          SetPixelBlue(q,ClampToQuantum(QuantumRange*source[i]));
           break;
         }
         case OpacityChannel:
         {
-          SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+          SetPixelOpacity(q,ClampToQuantum(QuantumRange*source[i]));
           break;
         }
         case IndexChannel:
         {
-          SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange*
+          SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
             source[i]));
           break;
         }
         case GrayChannels:
         {
-          SetGrayPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+          SetPixelGray(q,ClampToQuantum(QuantumRange*source[i]));
           break;
         }
       }
index a8788026aede7a342b4799c4e4ef56674160f76b..e5a6913d88dfa5bdd9e6524acc8b3c97d16d8ede 100644 (file)
@@ -414,21 +414,21 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
-          random_info[id],GetRedPixelComponent(p),noise_type,attenuate)));
+        SetPixelRed(q,ClampToQuantum(GenerateDifferentialNoise(
+          random_info[id],GetPixelRed(p),noise_type,attenuate)));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
-          random_info[id],GetGreenPixelComponent(p),noise_type,attenuate)));
+        SetPixelGreen(q,ClampToQuantum(GenerateDifferentialNoise(
+          random_info[id],GetPixelGreen(p),noise_type,attenuate)));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
-          random_info[id],GetBluePixelComponent(p),noise_type,attenuate)));
+        SetPixelBlue(q,ClampToQuantum(GenerateDifferentialNoise(
+          random_info[id],GetPixelBlue(p),noise_type,attenuate)));
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
-          random_info[id],GetOpacityPixelComponent(p),noise_type,attenuate)));
+        SetPixelOpacity(q,ClampToQuantum(GenerateDifferentialNoise(
+          random_info[id],GetPixelOpacity(p),noise_type,attenuate)));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(noise_indexes+x,ClampToQuantum(
-          GenerateDifferentialNoise(random_info[id],GetIndexPixelComponent(
+        SetPixelIndex(noise_indexes+x,ClampToQuantum(
+          GenerateDifferentialNoise(random_info[id],GetPixelIndex(
           indexes+x),noise_type,attenuate)));
       p++;
       q++;
@@ -568,25 +568,25 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      quantum=GetRedPixelComponent(p);
-      if (GetGreenPixelComponent(p) < quantum)
-        quantum=GetGreenPixelComponent(p);
-      if (GetBluePixelComponent(p) < quantum)
-        quantum=GetBluePixelComponent(p);
-      pixel.red=0.5*(GetRedPixelComponent(p)+factor*quantum);
-      pixel.green=0.5*(GetGreenPixelComponent(p)+factor*quantum);
-      pixel.blue=0.5*(GetBluePixelComponent(p)+factor*quantum);
-      quantum=GetRedPixelComponent(p);
-      if (GetGreenPixelComponent(p) > quantum)
-        quantum=GetGreenPixelComponent(p);
-      if (GetBluePixelComponent(p) > quantum)
-        quantum=GetBluePixelComponent(p);
+      quantum=GetPixelRed(p);
+      if (GetPixelGreen(p) < quantum)
+        quantum=GetPixelGreen(p);
+      if (GetPixelBlue(p) < quantum)
+        quantum=GetPixelBlue(p);
+      pixel.red=0.5*(GetPixelRed(p)+factor*quantum);
+      pixel.green=0.5*(GetPixelGreen(p)+factor*quantum);
+      pixel.blue=0.5*(GetPixelBlue(p)+factor*quantum);
+      quantum=GetPixelRed(p);
+      if (GetPixelGreen(p) > quantum)
+        quantum=GetPixelGreen(p);
+      if (GetPixelBlue(p) > quantum)
+        quantum=GetPixelBlue(p);
       pixel.red=0.5*(pixel.red+factor*quantum);
       pixel.green=0.5*(pixel.green+factor*quantum);
       pixel.blue=0.5*(pixel.blue+factor*quantum);
-      SetRedPixelComponent(q,ClampToQuantum(pixel.red));
-      SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
-      SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+      SetPixelRed(q,ClampToQuantum(pixel.red));
+      SetPixelGreen(q,ClampToQuantum(pixel.green));
+      SetPixelBlue(q,ClampToQuantum(pixel.blue));
       p++;
       q++;
     }
@@ -811,13 +811,13 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRedPixelComponent(q,((GetRedPixelComponent(p)*(100.0-pixel.red)+
+      SetPixelRed(q,((GetPixelRed(p)*(100.0-pixel.red)+
         colorize.red*pixel.red)/100.0));
-      SetGreenPixelComponent(q,((GetGreenPixelComponent(p)*(100.0-pixel.green)+
+      SetPixelGreen(q,((GetPixelGreen(p)*(100.0-pixel.green)+
         colorize.green*pixel.green)/100.0));
-      SetBluePixelComponent(q,((GetBluePixelComponent(p)*(100.0-pixel.blue)+
+      SetPixelBlue(q,((GetPixelBlue(p)*(100.0-pixel.blue)+
         colorize.blue*pixel.blue)/100.0));
-      SetOpacityPixelComponent(q,((GetOpacityPixelComponent(p)*(100.0-
+      SetPixelOpacity(q,((GetPixelOpacity(p)*(100.0-
         pixel.opacity)+colorize.opacity*pixel.opacity)/100.0));
       p++;
       q++;
@@ -1021,28 +1021,28 @@ MagickExport Image *ColorMatrixImage(const Image *image,
       height=color_matrix->height > 6 ? 6UL : color_matrix->height;
       for (v=0; v < (ssize_t) height; v++)
       {
-        pixel=ColorMatrix[v][0]*GetRedPixelComponent(p)+ColorMatrix[v][1]*
-          GetGreenPixelComponent(p)+ColorMatrix[v][2]*GetBluePixelComponent(p);
+        pixel=ColorMatrix[v][0]*GetPixelRed(p)+ColorMatrix[v][1]*
+          GetPixelGreen(p)+ColorMatrix[v][2]*GetPixelBlue(p);
         if (image->matte != MagickFalse)
-          pixel+=ColorMatrix[v][3]*(QuantumRange-GetOpacityPixelComponent(p));
+          pixel+=ColorMatrix[v][3]*(QuantumRange-GetPixelOpacity(p));
         if (image->colorspace == CMYKColorspace)
-          pixel+=ColorMatrix[v][4]*GetIndexPixelComponent(indexes+x);
+          pixel+=ColorMatrix[v][4]*GetPixelIndex(indexes+x);
         pixel+=QuantumRange*ColorMatrix[v][5];
         switch (v)
         {
-          case 0: SetRedPixelComponent(q,ClampToQuantum(pixel)); break;
-          case 1: SetGreenPixelComponent(q,ClampToQuantum(pixel)); break;
-          case 2: SetBluePixelComponent(q,ClampToQuantum(pixel)); break;
+          case 0: SetPixelRed(q,ClampToQuantum(pixel)); break;
+          case 1: SetPixelGreen(q,ClampToQuantum(pixel)); break;
+          case 2: SetPixelBlue(q,ClampToQuantum(pixel)); break;
           case 3:
           {
             if (image->matte != MagickFalse)
-              SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+              SetPixelAlpha(q,ClampToQuantum(pixel));
             break;
           }
           case 4:
           {
             if (image->colorspace == CMYKColorspace)
-              SetIndexPixelComponent(color_indexes+x,ClampToQuantum(pixel));
+              SetPixelIndex(color_indexes+x,ClampToQuantum(pixel));
             break;
           }
         }
@@ -1533,7 +1533,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
 
           if (pixel.matte == MagickFalse)
             return(1.0);
-          alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(&pixel));
+          alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(&pixel));
           return(alpha);
         }
         case IndexChannel:
@@ -1564,7 +1564,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
     case 'a':
     {
       if (LocaleCompare(symbol,"a") == 0)
-        return((MagickRealType) (QuantumScale*GetAlphaPixelComponent(&pixel)));
+        return((MagickRealType) (QuantumScale*GetPixelAlpha(&pixel)));
       break;
     }
     case 'B':
@@ -3037,21 +3037,21 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
         {
           (void) FxEvaluateChannelExpression(fx_info[id],RedChannel,x,y,
             &alpha,exception);
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+          SetPixelRed(q,ClampToQuantum((MagickRealType) QuantumRange*
             alpha));
         }
       if ((channel & GreenChannel) != 0)
         {
           (void) FxEvaluateChannelExpression(fx_info[id],GreenChannel,x,y,
             &alpha,exception);
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+          SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*
             alpha));
         }
       if ((channel & BlueChannel) != 0)
         {
           (void) FxEvaluateChannelExpression(fx_info[id],BlueChannel,x,y,
             &alpha,exception);
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+          SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*
             alpha));
         }
       if ((channel & OpacityChannel) != 0)
@@ -3059,10 +3059,10 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
           (void) FxEvaluateChannelExpression(fx_info[id],OpacityChannel,x,y,
             &alpha,exception);
           if (image->matte == MagickFalse)
-            SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+            SetPixelOpacity(q,ClampToQuantum((MagickRealType)
               QuantumRange*alpha));
           else
-            SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+            SetPixelOpacity(q,ClampToQuantum((MagickRealType)
               (QuantumRange-QuantumRange*alpha)));
         }
       if (((channel & IndexChannel) != 0) &&
@@ -3070,7 +3070,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
         {
           (void) FxEvaluateChannelExpression(fx_info[id],IndexChannel,x,y,
             &alpha,exception);
-          SetIndexPixelComponent(fx_indexes+x,ClampToQuantum((MagickRealType)
+          SetPixelIndex(fx_indexes+x,ClampToQuantum((MagickRealType)
             QuantumRange*alpha));
         }
       q++;
@@ -3460,14 +3460,14 @@ MagickExport Image *MorphImages(const Image *image,
           }
         for (x=0; x < (ssize_t) morph_images->columns; x++)
         {
-          SetRedPixelComponent(q,ClampToQuantum(alpha*
-            GetRedPixelComponent(q)+beta*GetRedPixelComponent(p)));
-          SetGreenPixelComponent(q,ClampToQuantum(alpha*
-            GetGreenPixelComponent(q)+beta*GetGreenPixelComponent(p)));
-          SetBluePixelComponent(q,ClampToQuantum(alpha*
-            GetBluePixelComponent(q)+beta*GetBluePixelComponent(p)));
-          SetOpacityPixelComponent(q,ClampToQuantum(alpha*
-            GetOpacityPixelComponent(q)+beta*GetOpacityPixelComponent(p)));
+          SetPixelRed(q,ClampToQuantum(alpha*
+            GetPixelRed(q)+beta*GetPixelRed(p)));
+          SetPixelGreen(q,ClampToQuantum(alpha*
+            GetPixelGreen(q)+beta*GetPixelGreen(p)));
+          SetPixelBlue(q,ClampToQuantum(alpha*
+            GetPixelBlue(q)+beta*GetPixelBlue(p)));
+          SetPixelOpacity(q,ClampToQuantum(alpha*
+            GetPixelOpacity(q)+beta*GetPixelOpacity(p)));
           p++;
           q++;
         }
@@ -3639,11 +3639,11 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
       if (q == (PixelPacket *) NULL)
         return(MagickTrue);
-      SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+      SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
         (u.red+v.red)/2.0,plasma));
-      SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+      SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
         (u.green+v.green)/2.0,plasma));
-      SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+      SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
         (u.blue+v.blue)/2.0,plasma));
       (void) SyncCacheViewAuthenticPixels(image_view,exception);
       if (segment->x1 != segment->x2)
@@ -3659,11 +3659,11 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
           q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
           if (q == (PixelPacket *) NULL)
             return(MagickTrue);
-          SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
             (u.red+v.red)/2.0,plasma));
-          SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
             (u.green+v.green)/2.0,plasma));
-          SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
             (u.blue+v.blue)/2.0,plasma));
           (void) SyncCacheViewAuthenticPixels(image_view,exception);
         }
@@ -3686,11 +3686,11 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
           q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
           if (q == (PixelPacket *) NULL)
             return(MagickTrue);
-          SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
             (u.red+v.red)/2.0,plasma));
-          SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
             (u.green+v.green)/2.0,plasma));
-          SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
             (u.blue+v.blue)/2.0,plasma));
           (void) SyncCacheViewAuthenticPixels(image_view,exception);
         }
@@ -3710,11 +3710,11 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
           q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
           if (q == (PixelPacket *) NULL)
             return(MagickTrue);
-          SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
             (u.red+v.red)/2.0,plasma));
-          SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
             (u.green+v.green)/2.0,plasma));
-          SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+          SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
             (u.blue+v.blue)/2.0,plasma));
           (void) SyncCacheViewAuthenticPixels(image_view,exception);
         }
@@ -3736,11 +3736,11 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       q=QueueCacheViewAuthenticPixels(image_view,x_mid,y_mid,1,1,exception);
       if (q == (PixelPacket *) NULL)
         return(MagickTrue);
-      SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+      SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
         (u.red+v.red)/2.0,plasma));
-      SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+      SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
         (u.green+v.green)/2.0,plasma));
-      SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+      SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
         (u.blue+v.blue)/2.0,plasma));
       (void) SyncCacheViewAuthenticPixels(image_view,exception);
     }
@@ -4069,17 +4069,17 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
       intensity=(MagickRealType) PixelIntensityToQuantum(p);
       tone=intensity > threshold ? (MagickRealType) QuantumRange : intensity+
         (MagickRealType) QuantumRange-threshold;
-      SetRedPixelComponent(q,ClampToQuantum(tone));
+      SetPixelRed(q,ClampToQuantum(tone));
       tone=intensity > (7.0*threshold/6.0) ? (MagickRealType) QuantumRange :
         intensity+(MagickRealType) QuantumRange-7.0*threshold/6.0;
-      SetGreenPixelComponent(q,ClampToQuantum(tone));
+      SetPixelGreen(q,ClampToQuantum(tone));
       tone=intensity < (threshold/6.0) ? 0 : intensity-threshold/6.0;
-      SetBluePixelComponent(q,ClampToQuantum(tone));
+      SetPixelBlue(q,ClampToQuantum(tone));
       tone=threshold/7.0;
-      if ((MagickRealType) GetGreenPixelComponent(q) < tone)
-        SetGreenPixelComponent(q,ClampToQuantum(tone));
-      if ((MagickRealType) GetBluePixelComponent(q) < tone)
-        SetBluePixelComponent(q,ClampToQuantum(tone));
+      if ((MagickRealType) GetPixelGreen(q) < tone)
+        SetPixelGreen(q,ClampToQuantum(tone));
+      if ((MagickRealType) GetPixelBlue(q) < tone)
+        SetPixelBlue(q,ClampToQuantum(tone));
       p++;
       q++;
     }
@@ -4218,14 +4218,14 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
       }
     for (x=0; x < (ssize_t) border_image->columns; x++)
     {
-      SetRedPixelComponent(q,border_image->background_color.red);
-      SetGreenPixelComponent(q,border_image->background_color.green);
-      SetBluePixelComponent(q,border_image->background_color.blue);
+      SetPixelRed(q,border_image->background_color.red);
+      SetPixelGreen(q,border_image->background_color.green);
+      SetPixelBlue(q,border_image->background_color.blue);
       if (border_image->matte == MagickFalse)
-        SetOpacityPixelComponent(q,border_image->background_color.opacity);
+        SetPixelOpacity(q,border_image->background_color.opacity);
       else
-        SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
-          (QuantumRange-GetAlphaPixelComponent(q)*opacity/100.0)));
+        SetPixelOpacity(q,ClampToQuantum((MagickRealType)
+          (QuantumRange-GetPixelAlpha(q)*opacity/100.0)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -4515,12 +4515,12 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if ((MagickRealType) GetRedPixelComponent(q) > threshold)
-        SetRedPixelComponent(q,QuantumRange-GetRedPixelComponent(q));
-      if ((MagickRealType) GetGreenPixelComponent(q) > threshold)
-        SetGreenPixelComponent(q,QuantumRange-GetGreenPixelComponent(q));
-      if ((MagickRealType) GetBluePixelComponent(q) > threshold)
-        SetBluePixelComponent(q,QuantumRange-GetBluePixelComponent(q));
+      if ((MagickRealType) GetPixelRed(q) > threshold)
+        SetPixelRed(q,QuantumRange-GetPixelRed(q));
+      if ((MagickRealType) GetPixelGreen(q) > threshold)
+        SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
+      if ((MagickRealType) GetPixelBlue(q) > threshold)
+        SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -4662,19 +4662,19 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
         {
           case 0:
           {
-            SetBit(GetRedPixelComponent(q),j,GetBit(PixelIntensityToQuantum(
+            SetBit(GetPixelRed(q),j,GetBit(PixelIntensityToQuantum(
               &pixel),i));
             break;
           }
           case 1:
           {
-            SetBit(GetGreenPixelComponent(q),j,GetBit(PixelIntensityToQuantum(
+            SetBit(GetPixelGreen(q),j,GetBit(PixelIntensityToQuantum(
               &pixel),i));
             break;
           }
           case 2:
           {
-            SetBit(GetBluePixelComponent(q),j,GetBit(PixelIntensityToQuantum(
+            SetBit(GetPixelBlue(q),j,GetBit(PixelIntensityToQuantum(
               &pixel),i));
             break;
           }
@@ -4829,10 +4829,10 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image,
       break;
     for (x=0; x < (ssize_t) stereo_image->columns; x++)
     {
-      SetRedPixelComponent(r,GetRedPixelComponent(p));
-      SetGreenPixelComponent(r,GetGreenPixelComponent(q));
-      SetBluePixelComponent(r,GetBluePixelComponent(q));
-      SetOpacityPixelComponent(r,(GetOpacityPixelComponent(p)+q->opacity)/2);
+      SetPixelRed(r,GetPixelRed(p));
+      SetPixelGreen(r,GetPixelGreen(q));
+      SetPixelBlue(r,GetPixelBlue(q));
+      SetPixelOpacity(r,(GetPixelOpacity(p)+q->opacity)/2);
       p++;
       q++;
       r++;
@@ -5189,19 +5189,19 @@ MagickExport Image *TintImage(const Image *image,const char *opacity,
       MagickRealType
         weight;
 
-      weight=QuantumScale*GetRedPixelComponent(p)-0.5;
-      pixel.red=(MagickRealType) GetRedPixelComponent(p)+color_vector.red*(1.0-(4.0*
+      weight=QuantumScale*GetPixelRed(p)-0.5;
+      pixel.red=(MagickRealType) GetPixelRed(p)+color_vector.red*(1.0-(4.0*
         (weight*weight)));
-      SetRedPixelComponent(q,ClampToQuantum(pixel.red));
-      weight=QuantumScale*GetGreenPixelComponent(p)-0.5;
-      pixel.green=(MagickRealType) GetGreenPixelComponent(p)+color_vector.green*(1.0-(4.0*
+      SetPixelRed(q,ClampToQuantum(pixel.red));
+      weight=QuantumScale*GetPixelGreen(p)-0.5;
+      pixel.green=(MagickRealType) GetPixelGreen(p)+color_vector.green*(1.0-(4.0*
         (weight*weight)));
-      SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
-      weight=QuantumScale*GetBluePixelComponent(p)-0.5;
-      pixel.blue=(MagickRealType) GetBluePixelComponent(p)+color_vector.blue*(1.0-(4.0*
+      SetPixelGreen(q,ClampToQuantum(pixel.green));
+      weight=QuantumScale*GetPixelBlue(p)-0.5;
+      pixel.blue=(MagickRealType) GetPixelBlue(p)+color_vector.blue*(1.0-(4.0*
         (weight*weight)));
-      SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
-      SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+      SetPixelBlue(q,ClampToQuantum(pixel.blue));
+      SetPixelOpacity(q,GetPixelOpacity(p));
       p++;
       q++;
     }
index 5027c53e6a7ea228ef3474ba3dfec7248a86253a..72888f169ec1e01e17e7e07ff6f72ed68d81b015 100644 (file)
@@ -286,7 +286,7 @@ static CubeInfo *ClassifyImageColors(const Image *image,
           node_info->list[i].pixel=(*p);
           if ((image->colorspace == CMYKColorspace) ||
               (image->storage_class == PseudoClass))
-            node_info->list[i].index=GetIndexPixelComponent(indexes+x);
+            node_info->list[i].index=GetPixelIndex(indexes+x);
           node_info->list[i].count=1;
           node_info->number_unique++;
           cube_info->colors++;
@@ -757,7 +757,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image,
           node_info->list[i].pixel=(*p);
           if ((image->colorspace == CMYKColorspace) ||
               (image->storage_class == PseudoClass))
-            node_info->list[i].index=GetIndexPixelComponent(indexes+x);
+            node_info->list[i].index=GetPixelIndex(indexes+x);
           node_info->list[i].count=1;
           node_info->number_unique++;
           cube_info->colors++;
@@ -920,7 +920,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image,
           node_info->list[i].pixel=(*p);
           if ((image->colorspace == CMYKColorspace) ||
               (image->storage_class == PseudoClass))
-            node_info->list[i].index=GetIndexPixelComponent(indexes+x);
+            node_info->list[i].index=GetPixelIndex(indexes+x);
           node_info->list[i].count=1;
           node_info->number_unique++;
           cube_info->colors++;
index f25e3c6e313bb2138f510e59614e8e1f1f6aa6ef..334115f5bf60406eb9fad1914af49da3ea4f4d03 100644 (file)
@@ -606,7 +606,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             indexes=GetVirtualIndexQueue(image);
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              if (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity)
+              if (GetPixelOpacity(p) == (Quantum) TransparentOpacity)
                 break;
               p++;
             }
index 9f50e61ffd768a385166bf87c461040a7150bfe0..584d7dd6e2d4dce469ec8cd84c61301da41d63ef 100644 (file)
@@ -541,16 +541,15 @@ MagickExport Image *AppendImages(const Image *images,
       append_indexes=GetCacheViewAuthenticIndexQueue(append_view);
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        SetRedPixelComponent(q,GetRedPixelComponent(p));
-        SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-        SetBluePixelComponent(q,GetBluePixelComponent(p));
-        SetOpacityPixelComponent(q,OpaqueOpacity);
+        SetPixelRed(q,GetPixelRed(p));
+        SetPixelGreen(q,GetPixelGreen(p));
+        SetPixelBlue(q,GetPixelBlue(p));
+        SetPixelOpacity(q,OpaqueOpacity);
         if (image->matte != MagickFalse)
-          SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+          SetPixelOpacity(q,GetPixelOpacity(p));
         if ((image->colorspace == CMYKColorspace) &&
             (append_image->colorspace == CMYKColorspace))
-          SetIndexPixelComponent(append_indexes+x,GetIndexPixelComponent(
-            indexes+x));
+          SetPixelIndex(append_indexes+x,GetPixelIndex(indexes+x));
         p++;
         q++;
       }
@@ -1102,7 +1101,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         q=pixels;
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
-          SetRedPixelComponent(q,PixelIntensityToQuantum(p));
+          SetPixelRed(q,PixelIntensityToQuantum(p));
           p++;
           q++;
         }
@@ -1118,7 +1117,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         q=pixels;
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
-          SetGreenPixelComponent(q,PixelIntensityToQuantum(p));
+          SetPixelGreen(q,PixelIntensityToQuantum(p));
           p++;
           q++;
         }
@@ -1134,7 +1133,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         q=pixels;
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
-          SetBluePixelComponent(q,PixelIntensityToQuantum(p));
+          SetPixelBlue(q,PixelIntensityToQuantum(p));
           p++;
           q++;
         }
@@ -1150,7 +1149,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         q=pixels;
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
-          SetOpacityPixelComponent(q,PixelIntensityToQuantum(p));
+          SetPixelOpacity(q,PixelIntensityToQuantum(p));
           p++;
           q++;
         }
@@ -1170,7 +1169,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         indexes=GetCacheViewAuthenticIndexQueue(combine_view);
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
-          SetIndexPixelComponent(indexes+x,PixelIntensityToQuantum(p));
+          SetPixelIndex(indexes+x,PixelIntensityToQuantum(p));
           p++;
         }
         image_view=DestroyCacheView(image_view);
@@ -2407,8 +2406,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetGreenPixelComponent(q,GetRedPixelComponent(q));
-          SetBluePixelComponent(q,GetRedPixelComponent(q));
+          SetPixelGreen(q,GetPixelRed(q));
+          SetPixelBlue(q,GetPixelRed(q));
           q++;
         }
         break;
@@ -2417,8 +2416,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,GetGreenPixelComponent(q));
-          SetBluePixelComponent(q,GetGreenPixelComponent(q));
+          SetPixelRed(q,GetPixelGreen(q));
+          SetPixelBlue(q,GetPixelGreen(q));
           q++;
         }
         break;
@@ -2427,8 +2426,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,GetBluePixelComponent(q));
-          SetGreenPixelComponent(q,GetBluePixelComponent(q));
+          SetPixelRed(q,GetPixelBlue(q));
+          SetPixelGreen(q,GetPixelBlue(q));
           q++;
         }
         break;
@@ -2437,9 +2436,9 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,GetOpacityPixelComponent(q));
-          SetGreenPixelComponent(q,GetOpacityPixelComponent(q));
-          SetBluePixelComponent(q,GetOpacityPixelComponent(q));
+          SetPixelRed(q,GetPixelOpacity(q));
+          SetPixelGreen(q,GetPixelOpacity(q));
+          SetPixelBlue(q,GetPixelOpacity(q));
           q++;
         }
         break;
@@ -2451,9 +2450,9 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,GetIndexPixelComponent(indexes+x));
-          SetGreenPixelComponent(q,GetIndexPixelComponent(indexes+x));
-          SetBluePixelComponent(q,GetIndexPixelComponent(indexes+x));
+          SetPixelRed(q,GetPixelIndex(indexes+x));
+          SetPixelGreen(q,GetPixelIndex(indexes+x));
+          SetPixelBlue(q,GetPixelIndex(indexes+x));
           q++;
         }
         break;
@@ -2462,9 +2461,9 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,GetAlphaPixelComponent(q));
-          SetGreenPixelComponent(q,GetAlphaPixelComponent(q));
-          SetBluePixelComponent(q,GetAlphaPixelComponent(q));
+          SetPixelRed(q,GetPixelAlpha(q));
+          SetPixelGreen(q,GetPixelAlpha(q));
+          SetPixelBlue(q,GetPixelAlpha(q));
           q++;
         }
         break;
@@ -2473,7 +2472,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetAlphaPixelComponent(q,PixelIntensityToQuantum(q));
+          SetPixelAlpha(q,PixelIntensityToQuantum(q));
           q++;
         }
         break;
@@ -2692,9 +2691,9 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
         {
           if (q->opacity == TransparentOpacity)
             {
-              SetRedPixelComponent(q,pixel.red);
-              SetGreenPixelComponent(q,pixel.green);
-              SetBluePixelComponent(q,pixel.blue);
+              SetPixelRed(q,pixel.red);
+              SetPixelGreen(q,pixel.green);
+              SetPixelBlue(q,pixel.blue);
             }
           q++;
         }
@@ -2702,7 +2701,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
           {
             indexes=GetCacheViewAuthenticIndexQueue(image_view);
             for (x=0; x < (ssize_t) image->columns; x++)
-              SetIndexPixelComponent(indexes+x,index);
+              SetPixelIndex(indexes+x,index);
           }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
           status=MagickFalse;
@@ -2866,7 +2865,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
 
         indexes=GetCacheViewAuthenticIndexQueue(image_view);
         for (x=0; x < (ssize_t) image->columns; x++)
-          SetIndexPixelComponent(indexes+x,index);
+          SetPixelIndex(indexes+x,index);
       }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3645,7 +3644,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetOpacityPixelComponent(q,opacity);
+      SetPixelOpacity(q,opacity);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3952,7 +3951,7 @@ static ssize_t SmushXGap(const Image *smush_image,const Image *images,
     {
       p=GetCacheViewVirtualPixels(left_view,x,left_geometry.y+y,1,1,exception);
       if ((p == (const PixelPacket *) NULL) ||
-          (GetOpacityPixelComponent(p) != TransparentOpacity) ||
+          (GetPixelOpacity(p) != TransparentOpacity) ||
           ((left_image->columns-x-1) >= gap))
         break;
     }
@@ -3962,7 +3961,7 @@ static ssize_t SmushXGap(const Image *smush_image,const Image *images,
       p=GetCacheViewVirtualPixels(right_view,x,right_geometry.y+y,1,1,
         exception);
       if ((p == (const PixelPacket *) NULL) ||
-          (GetOpacityPixelComponent(p) != TransparentOpacity) || ((x+i) >= (ssize_t) gap))
+          (GetPixelOpacity(p) != TransparentOpacity) || ((x+i) >= (ssize_t) gap))
         break;
     }
     if ((x+i) < (ssize_t) gap)
@@ -4022,7 +4021,7 @@ static ssize_t SmushYGap(const Image *smush_image,const Image *images,
     {
       p=GetCacheViewVirtualPixels(top_view,top_geometry.x+x,y,1,1,exception);
       if ((p == (const PixelPacket *) NULL) ||
-          (GetOpacityPixelComponent(p) != TransparentOpacity) || ((top_image->rows-y-1) >= gap))
+          (GetPixelOpacity(p) != TransparentOpacity) || ((top_image->rows-y-1) >= gap))
         break;
     }
     i=(ssize_t) top_image->rows-y-1;
@@ -4031,7 +4030,7 @@ static ssize_t SmushYGap(const Image *smush_image,const Image *images,
       p=GetCacheViewVirtualPixels(bottom_view,bottom_geometry.x+x,y,1,1,
         exception);
       if ((p == (const PixelPacket *) NULL) ||
-          (GetOpacityPixelComponent(p) != TransparentOpacity) || ((y+i) >= (ssize_t) gap))
+          (GetPixelOpacity(p) != TransparentOpacity) || ((y+i) >= (ssize_t) gap))
         break;
     }
     if ((y+i) < (ssize_t) gap)
@@ -4295,12 +4294,12 @@ MagickExport MagickBooleanType SyncImage(Image *image)
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      index=PushColormapIndex(image,(size_t) GetIndexPixelComponent(indexes+x),
+      index=PushColormapIndex(image,(size_t) GetPixelIndex(indexes+x),
         &range_exception);
       if (image->matte == MagickFalse)
-        SetRGBPixelComponents(q,image->colormap+(ssize_t) index)
+        SetPixelRGB(q,image->colormap+(ssize_t) index)
       else
-        SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+        SetPixelRGBO(q,image->colormap+(ssize_t) index);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
index 95a04fd8da0f59067f43372b2e1186d67ae72ec5..5cba07755d73584d05fdd73f3d3cbb2d7ba8e4b0 100644 (file)
@@ -191,7 +191,7 @@ static MagickBooleanType IsBoundsCleared(const Image *image1,
       break;
     for (x=0; x < (ssize_t) bounds->width; x++)
     {
-      if ((GetOpacityPixelComponent(p) <= (Quantum) (QuantumRange/2)) &&
+      if ((GetPixelOpacity(p) <= (Quantum) (QuantumRange/2)) &&
           (q->opacity > (Quantum) (QuantumRange/2)))
         break;
       p++;
@@ -538,7 +538,7 @@ static MagickBooleanType ComparePixels(const ImageLayerMethod method,
   if (method == CompareAnyLayer)
     return((MagickBooleanType)(IsMagickColorSimilar(p,q) == MagickFalse));
 
-  o1 = (p->matte != MagickFalse) ? GetOpacityPixelComponent(p) : OpaqueOpacity;
+  o1 = (p->matte != MagickFalse) ? GetPixelOpacity(p) : OpaqueOpacity;
   o2 = (q->matte != MagickFalse) ? q->opacity : OpaqueOpacity;
 
   /*
index 3183d1f36a7af8a307c7a63c982ba920c888bc01..6637e18be61af092bd8eb4f03344cd782fec1d14 100644 (file)
@@ -1364,11 +1364,11 @@ MagickExport Image *ReadPICTImage(const ImageInfo *image_info,
     for (x=0; x < image->columns; x++)
     {
       GetCPixel(x,y,&Pixel);
-      SetRedPixelComponent(q,ScaleCharToQuantum(Pixel.red & 0xff));
-      SetGreenPixelComponent(q,ScaleCharToQuantum(Pixel.green & 0xff));
-      SetBluePixelComponent(q,ScaleCharToQuantum(Pixel.blue & 0xff));
+      SetPixelRed(q,ScaleCharToQuantum(Pixel.red & 0xff));
+      SetPixelGreen(q,ScaleCharToQuantum(Pixel.green & 0xff));
+      SetPixelBlue(q,ScaleCharToQuantum(Pixel.blue & 0xff));
       if (image->storage_class == PseudoClass)
-        SetIndexPixelComponent(indexes+x,Color2Index(&Pixel));
+        SetPixelIndex(indexes+x,Color2Index(&Pixel));
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 79155aa78b27a3eb74ac20b2a0a22f3ee2c36c54..de93e7d60f7b7ad04865b1b47f0e31116de4058c 100644 (file)
@@ -2645,7 +2645,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
         */
         *q = p[r];
         if (image->colorspace == CMYKColorspace)
-          SetIndexPixelComponent(q_indexes+y,GetIndexPixelComponent(
+          SetPixelIndex(q_indexes+y,GetPixelIndex(
             p_indexes+r));
 
         /* Set the bias of the weighted average output */
@@ -2672,10 +2672,10 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
             */
             for (v=0; v < (ssize_t) kernel->height; v++) {
               if ( IsNan(*k) ) continue;
-              result.red     += (*k)*GetRedPixelComponent(k_pixels);
-              result.green   += (*k)*GetGreenPixelComponent(k_pixels);
-              result.blue    += (*k)*GetBluePixelComponent(k_pixels);
-              result.opacity += (*k)*GetOpacityPixelComponent(k_pixels);
+              result.red     += (*k)*GetPixelRed(k_pixels);
+              result.green   += (*k)*GetPixelGreen(k_pixels);
+              result.blue    += (*k)*GetPixelBlue(k_pixels);
+              result.opacity += (*k)*GetPixelOpacity(k_pixels);
               if ( image->colorspace == CMYKColorspace)
                 result.index += (*k)*(*k_indexes);
               k--;
@@ -2683,17 +2683,17 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
               k_indexes++;
             }
             if ((channel & RedChannel) != 0)
-              SetRedPixelComponent(q,ClampToQuantum(result.red));
+              SetPixelRed(q,ClampToQuantum(result.red));
             if ((channel & GreenChannel) != 0)
-              SetGreenPixelComponent(q,ClampToQuantum(result.green));
+              SetPixelGreen(q,ClampToQuantum(result.green));
             if ((channel & BlueChannel) != 0)
-              SetBluePixelComponent(q,ClampToQuantum(result.blue));
+              SetPixelBlue(q,ClampToQuantum(result.blue));
             if ((channel & OpacityChannel) != 0
                 && image->matte == MagickTrue )
-              SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+              SetPixelOpacity(q,ClampToQuantum(result.opacity));
             if ((channel & IndexChannel) != 0
                 && image->colorspace == CMYKColorspace)
-              SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+              SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
           }
         else
           { /* Channel 'Sync' Flag, and Alpha Channel enabled.
@@ -2707,12 +2707,12 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
             gamma=0.0;
             for (v=0; v < (ssize_t) kernel->height; v++) {
               if ( IsNan(*k) ) continue;
-              alpha=(*k)*(QuantumScale*(QuantumRange-GetOpacityPixelComponent(k_pixels)));
+              alpha=(*k)*(QuantumScale*(QuantumRange-GetPixelOpacity(k_pixels)));
               gamma += alpha;
-              result.red     += alpha*GetRedPixelComponent(k_pixels);
-              result.green   += alpha*GetGreenPixelComponent(k_pixels);
-              result.blue    += alpha*GetBluePixelComponent(k_pixels);
-              result.opacity += (*k)*GetOpacityPixelComponent(k_pixels);
+              result.red     += alpha*GetPixelRed(k_pixels);
+              result.green   += alpha*GetPixelGreen(k_pixels);
+              result.blue    += alpha*GetPixelBlue(k_pixels);
+              result.opacity += (*k)*GetPixelOpacity(k_pixels);
               if ( image->colorspace == CMYKColorspace)
                 result.index += alpha*(*k_indexes);
               k--;
@@ -2721,22 +2721,22 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
             }
             /* Sync'ed channels, all channels are modified */
             gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
-            SetRedPixelComponent(q,ClampToQuantum(gamma*result.red));
-            SetGreenPixelComponent(q,ClampToQuantum(gamma*result.green));
-            SetBluePixelComponent(q,ClampToQuantum(gamma*result.blue));
-            SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+            SetPixelRed(q,ClampToQuantum(gamma*result.red));
+            SetPixelGreen(q,ClampToQuantum(gamma*result.green));
+            SetPixelBlue(q,ClampToQuantum(gamma*result.blue));
+            SetPixelOpacity(q,ClampToQuantum(result.opacity));
             if (image->colorspace == CMYKColorspace)
-              SetIndexPixelComponent(q_indexes+x,ClampToQuantum(gamma*
+              SetPixelIndex(q_indexes+x,ClampToQuantum(gamma*
                 result.index));
           }
 
         /* Count up changed pixels */
-        if (   ( p[r].red != GetRedPixelComponent(q))
-            || ( p[r].green != GetGreenPixelComponent(q))
-            || ( p[r].blue != GetBluePixelComponent(q))
-            || ( p[r].opacity != GetOpacityPixelComponent(q))
+        if (   ( p[r].red != GetPixelRed(q))
+            || ( p[r].green != GetPixelGreen(q))
+            || ( p[r].blue != GetPixelBlue(q))
+            || ( p[r].opacity != GetPixelOpacity(q))
             || ( image->colorspace == CMYKColorspace &&
-                GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+                GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
           changed++;  /* The pixel was changed in some way! */
         p++;
         q++;
@@ -2832,7 +2832,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
        */
       *q = p[r];
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(q_indexes+x,GetIndexPixelComponent(p_indexes+r));
+        SetPixelIndex(q_indexes+x,GetPixelIndex(p_indexes+r));
 
       /* Defaults */
       min.red     =
@@ -2852,7 +2852,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
       result.opacity = QuantumRange - (MagickRealType) p[r].opacity;
       result.index   = 0.0;
       if ( image->colorspace == CMYKColorspace)
-         result.index   = (MagickRealType) GetIndexPixelComponent(p_indexes+r);
+         result.index   = (MagickRealType) GetPixelIndex(p_indexes+r);
 
       switch (method) {
         case ConvolveMorphology:
@@ -2908,23 +2908,23 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                     result.blue    += (*k)*k_pixels[u].blue;
                     result.opacity += (*k)*k_pixels[u].opacity;
                     if ( image->colorspace == CMYKColorspace)
-                      result.index += (*k)*GetIndexPixelComponent(k_indexes+u);
+                      result.index += (*k)*GetPixelIndex(k_indexes+u);
                   }
                   k_pixels += virt_width;
                   k_indexes += virt_width;
                 }
                 if ((channel & RedChannel) != 0)
-                  SetRedPixelComponent(q,ClampToQuantum(result.red));
+                  SetPixelRed(q,ClampToQuantum(result.red));
                 if ((channel & GreenChannel) != 0)
-                  SetGreenPixelComponent(q,ClampToQuantum(result.green));
+                  SetPixelGreen(q,ClampToQuantum(result.green));
                 if ((channel & BlueChannel) != 0)
-                  SetBluePixelComponent(q,ClampToQuantum(result.blue));
+                  SetPixelBlue(q,ClampToQuantum(result.blue));
                 if ((channel & OpacityChannel) != 0
                     && image->matte == MagickTrue )
-                  SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+                  SetPixelOpacity(q,ClampToQuantum(result.opacity));
                 if ((channel & IndexChannel) != 0
                     && image->colorspace == CMYKColorspace)
-                  SetIndexPixelComponent(q_indexes+x,ClampToQuantum(
+                  SetPixelIndex(q_indexes+x,ClampToQuantum(
                     result.index));
               }
             else
@@ -2948,19 +2948,19 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                     result.blue    += alpha*k_pixels[u].blue;
                     result.opacity += (*k)*k_pixels[u].opacity;
                     if ( image->colorspace == CMYKColorspace)
-                      result.index+=alpha*GetIndexPixelComponent(k_indexes+u);
+                      result.index+=alpha*GetPixelIndex(k_indexes+u);
                   }
                   k_pixels += virt_width;
                   k_indexes += virt_width;
                 }
                 /* Sync'ed channels, all channels are modified */
                 gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
-                SetRedPixelComponent(q,ClampToQuantum(gamma*result.red));
-                SetGreenPixelComponent(q,ClampToQuantum(gamma*result.green));
-                SetBluePixelComponent(q,ClampToQuantum(gamma*result.blue));
-                SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+                SetPixelRed(q,ClampToQuantum(gamma*result.red));
+                SetPixelGreen(q,ClampToQuantum(gamma*result.green));
+                SetPixelBlue(q,ClampToQuantum(gamma*result.blue));
+                SetPixelOpacity(q,ClampToQuantum(result.opacity));
                 if (image->colorspace == CMYKColorspace)
-                  SetIndexPixelComponent(q_indexes+x,ClampToQuantum(gamma*
+                  SetPixelIndex(q_indexes+x,ClampToQuantum(gamma*
                    result.index));
               }
             break;
@@ -2986,7 +2986,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                 Minimize(min.opacity,
                             QuantumRange-(double) k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Minimize(min.index,(double) GetIndexPixelComponent(
+                  Minimize(min.index,(double) GetPixelIndex(
                     k_indexes+u));
               }
               k_pixels += virt_width;
@@ -3018,7 +3018,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                 Maximize(max.opacity,
                             QuantumRange-(double) k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Maximize(max.index,   (double) GetIndexPixelComponent(
+                  Maximize(max.index,   (double) GetPixelIndex(
                     k_indexes+u));
               }
               k_pixels += virt_width;
@@ -3054,7 +3054,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                   Minimize(min.opacity,
                               QuantumRange-(double) k_pixels[u].opacity);
                   if ( image->colorspace == CMYKColorspace)
-                    Minimize(min.index,(double) GetIndexPixelComponent(
+                    Minimize(min.index,(double) GetPixelIndex(
                       k_indexes+u));
                 }
                 else if ( (*k) < 0.3 )
@@ -3065,7 +3065,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                   Maximize(max.opacity,
                               QuantumRange-(double) k_pixels[u].opacity);
                   if ( image->colorspace == CMYKColorspace)
-                    Maximize(max.index,   (double) GetIndexPixelComponent(
+                    Maximize(max.index,   (double) GetPixelIndex(
                       k_indexes+u));
                 }
               }
@@ -3167,7 +3167,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
                 Minimize(result.blue,    (*k)+k_pixels[u].blue);
                 Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Minimize(result.index,(*k)+GetIndexPixelComponent(
+                  Minimize(result.index,(*k)+GetPixelIndex(
                     k_indexes+u));
               }
               k_pixels += virt_width;
@@ -3223,26 +3223,26 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
           break;  /* full pixel was directly assigned - not a channel method */
         default:
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(result.red));
+            SetPixelRed(q,ClampToQuantum(result.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(result.green));
+            SetPixelGreen(q,ClampToQuantum(result.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(result.blue));
+            SetPixelBlue(q,ClampToQuantum(result.blue));
           if ((channel & OpacityChannel) != 0
               && image->matte == MagickTrue )
-            SetAlphaPixelComponent(q,ClampToQuantum(result.opacity));
+            SetPixelAlpha(q,ClampToQuantum(result.opacity));
           if ((channel & IndexChannel) != 0
               && image->colorspace == CMYKColorspace)
-            SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+            SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
           break;
       }
       /* Count up changed pixels */
-      if (   ( p[r].red != GetRedPixelComponent(q) )
-          || ( p[r].green != GetGreenPixelComponent(q) )
-          || ( p[r].blue != GetBluePixelComponent(q) )
-          || ( p[r].opacity != GetOpacityPixelComponent(q) )
+      if (   ( p[r].red != GetPixelRed(q) )
+          || ( p[r].green != GetPixelGreen(q) )
+          || ( p[r].blue != GetPixelBlue(q) )
+          || ( p[r].opacity != GetPixelOpacity(q) )
           || ( image->colorspace == CMYKColorspace &&
-               GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+               GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
         changed++;  /* The pixel was changed in some way! */
       p++;
       q++;
@@ -3420,7 +3420,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 Minimize(result.blue,    (*k)+k_pixels[u].blue);
                 Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Minimize(result.index,   (*k)+GetIndexPixelComponent(k_indexes+u));
+                  Minimize(result.index,   (*k)+GetPixelIndex(k_indexes+u));
               }
               k_pixels += virt_width;
               k_indexes += virt_width;
@@ -3437,7 +3437,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 Minimize(result.blue,    (*k)+k_pixels[u].blue);
                 Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Minimize(result.index,   (*k)+GetIndexPixelComponent(k_indexes+u));
+                  Minimize(result.index,   (*k)+GetPixelIndex(k_indexes+u));
               }
             break;
         case VoronoiMorphology:
@@ -3488,25 +3488,25 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
           break;
         default:
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(result.red));
+            SetPixelRed(q,ClampToQuantum(result.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(result.green));
+            SetPixelGreen(q,ClampToQuantum(result.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(result.blue));
+            SetPixelBlue(q,ClampToQuantum(result.blue));
           if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue )
-            SetAlphaPixelComponent(q,ClampToQuantum(result.opacity));
+            SetPixelAlpha(q,ClampToQuantum(result.opacity));
           if ((channel & IndexChannel) != 0
               && image->colorspace == CMYKColorspace)
-            SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+            SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
           break;
       }
       /* Count up changed pixels */
-      if (   ( p[r].red != GetRedPixelComponent(q) )
-          || ( p[r].green != GetGreenPixelComponent(q) )
-          || ( p[r].blue != GetBluePixelComponent(q) )
-          || ( p[r].opacity != GetOpacityPixelComponent(q) )
+      if (   ( p[r].red != GetPixelRed(q) )
+          || ( p[r].green != GetPixelGreen(q) )
+          || ( p[r].blue != GetPixelBlue(q) )
+          || ( p[r].opacity != GetPixelOpacity(q) )
           || ( image->colorspace == CMYKColorspace &&
-               GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+               GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
         changed++;  /* The pixel was changed in some way! */
 
       p++; /* increment pixel buffers */
@@ -3610,7 +3610,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 Minimize(result.blue,    (*k)+k_pixels[u].blue);
                 Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Minimize(result.index,(*k)+GetIndexPixelComponent(k_indexes+u));
+                  Minimize(result.index,(*k)+GetPixelIndex(k_indexes+u));
               }
               k_pixels += virt_width;
               k_indexes += virt_width;
@@ -3627,7 +3627,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 Minimize(result.blue,    (*k)+k_pixels[u].blue);
                 Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
                 if ( image->colorspace == CMYKColorspace)
-                  Minimize(result.index,   (*k)+GetIndexPixelComponent(k_indexes+u));
+                  Minimize(result.index,   (*k)+GetPixelIndex(k_indexes+u));
               }
             break;
         case VoronoiMorphology:
@@ -3678,25 +3678,25 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
           break;
         default:
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(result.red));
+            SetPixelRed(q,ClampToQuantum(result.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(result.green));
+            SetPixelGreen(q,ClampToQuantum(result.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(result.blue));
+            SetPixelBlue(q,ClampToQuantum(result.blue));
           if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue )
-            SetAlphaPixelComponent(q,ClampToQuantum(result.opacity));
+            SetPixelAlpha(q,ClampToQuantum(result.opacity));
           if ((channel & IndexChannel) != 0
               && image->colorspace == CMYKColorspace)
-            SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+            SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
           break;
       }
       /* Count up changed pixels */
-      if (   ( p[r].red != GetRedPixelComponent(q) )
-          || ( p[r].green != GetGreenPixelComponent(q) )
-          || ( p[r].blue != GetBluePixelComponent(q) )
-          || ( p[r].opacity != GetOpacityPixelComponent(q) )
+      if (   ( p[r].red != GetPixelRed(q) )
+          || ( p[r].green != GetPixelGreen(q) )
+          || ( p[r].blue != GetPixelBlue(q) )
+          || ( p[r].opacity != GetPixelOpacity(q) )
           || ( image->colorspace == CMYKColorspace &&
-               GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+               GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
         changed++;  /* The pixel was changed in some way! */
 
       p--; /* go backward through pixel buffers */
index 4499119b54366c62653753caa8e5edc8529fdfd4..da34633f5416ed2b044262d34a872f57a5fffd51 100644 (file)
@@ -200,9 +200,9 @@ MagickExport void *CropImageToHBITMAP(Image *image,
         /* Transfer pixels, scaling to Quantum */
         for( x=(ssize_t) page.width ; x> 0 ; x-- )
           {
-            q->rgbRed = ScaleQuantumToChar(GetRedPixelComponent(p));
-            q->rgbGreen = ScaleQuantumToChar(GetGreenPixelComponent(p));
-            q->rgbBlue = ScaleQuantumToChar(GetBluePixelComponent(p));
+            q->rgbRed = ScaleQuantumToChar(GetPixelRed(p));
+            q->rgbGreen = ScaleQuantumToChar(GetPixelGreen(p));
+            q->rgbBlue = ScaleQuantumToChar(GetPixelBlue(p));
             q->rgbReserved = 0;
             ++q;
             ++p;
@@ -644,9 +644,9 @@ MagickExport void *ImageToHBITMAP(Image *image)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      q->rgbRed=ScaleQuantumToChar(GetRedPixelComponent(p));
-      q->rgbGreen=ScaleQuantumToChar(GetGreenPixelComponent(p));
-      q->rgbBlue=ScaleQuantumToChar(GetBluePixelComponent(p));
+      q->rgbRed=ScaleQuantumToChar(GetPixelRed(p));
+      q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(p));
+      q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(p));
       q->rgbReserved=0;
       p++;
       q++;
index a9d020eb6a2a65e7d3500eeaf9837615c161918e..372812ad1e0ffde58e6a367e626bf8af59bd5d89 100644 (file)
@@ -341,23 +341,23 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+      if (GetPixelOpacity(p) != OpaqueOpacity)
         {
           (void) GetFillColor(draw_info,x,y,&fill_color);
           SetMagickPixelPacket(image,&fill_color,(IndexPacket *) NULL,&fill);
           if (image->colorspace == CMYKColorspace)
             ConvertRGBToCMYK(&fill);
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(fill.red));
+            SetPixelRed(q,ClampToQuantum(fill.red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(fill.green));
+            SetPixelGreen(q,ClampToQuantum(fill.green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(fill.blue));
+            SetPixelBlue(q,ClampToQuantum(fill.blue));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,ClampToQuantum(fill.opacity));
+            SetPixelOpacity(q,ClampToQuantum(fill.opacity));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(indexes+x,ClampToQuantum(fill.index));
+            SetPixelIndex(indexes+x,ClampToQuantum(fill.index));
         }
       p++;
       q++;
@@ -687,7 +687,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
       }
       *q=(*(p+j));
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(paint_indexes+x,GetIndexPixelComponent(
+        SetPixelIndex(paint_indexes+x,GetPixelIndex(
           indexes+x+j));
       p++;
       q++;
@@ -838,16 +838,16 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image,
       if (IsMagickColorSimilar(&pixel,target) != invert)
         {
           if ((channel & RedChannel) != 0)
-            SetRedPixelComponent(q,ClampToQuantum(fill->red));
+            SetPixelRed(q,ClampToQuantum(fill->red));
           if ((channel & GreenChannel) != 0)
-            SetGreenPixelComponent(q,ClampToQuantum(fill->green));
+            SetPixelGreen(q,ClampToQuantum(fill->green));
           if ((channel & BlueChannel) != 0)
-            SetBluePixelComponent(q,ClampToQuantum(fill->blue));
+            SetPixelBlue(q,ClampToQuantum(fill->blue));
           if ((channel & OpacityChannel) != 0)
-            SetOpacityPixelComponent(q,ClampToQuantum(fill->opacity));
+            SetPixelOpacity(q,ClampToQuantum(fill->opacity));
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace))
-            SetIndexPixelComponent(indexes+x,ClampToQuantum(fill->index));
+            SetPixelIndex(indexes+x,ClampToQuantum(fill->index));
         }
       q++;
     }
index a4ca5519fb8c135a4b458674152a1c5b4345ecf8..4dfd038e23974d405dfacc2ca6bd5b2f1ab1dcf6 100644 (file)
@@ -45,8 +45,8 @@ static inline MagickPixelPacket *CloneMagickPixelPacket(
 static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) && 
-      (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+  if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) && 
+      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
     return(MagickTrue);
 #else
   {
@@ -54,8 +54,8 @@ static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
       alpha,
       beta;
 
-    alpha=GetRedPixelComponent(pixel)-GetGreenPixelComponent(pixel);
-    beta=GetGreenPixelComponent(pixel)-GetBluePixelComponent(pixel);
+    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
+    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
     if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
       return(MagickTrue);
   }
@@ -66,10 +66,10 @@ static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
 static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if (((GetRedPixelComponent(pixel) == 0) ||
-       (GetRedPixelComponent(pixel) == (Quantum) QuantumRange)) &&
-      (GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
-      (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+  if (((GetPixelRed(pixel) == 0) ||
+       (GetPixelRed(pixel) == (Quantum) QuantumRange)) &&
+      (GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
     return(MagickTrue);
 #else
   {
@@ -77,10 +77,10 @@ static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
       alpha,
       beta;
 
-    alpha=GetRedPixelComponent(pixel)-GetGreenPixelComponent(pixel);
-    beta=GetGreenPixelComponent(pixel)-GetBluePixelComponent(pixel);
-    if (((fabs(GetRedPixelComponent(pixel)) <= MagickEpsilon) ||
-         (fabs(GetRedPixelComponent(pixel)-QuantumRange) <= MagickEpsilon)) &&
+    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
+    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
+    if (((fabs(GetPixelRed(pixel)) <= MagickEpsilon) ||
+         (fabs(GetPixelRed(pixel)-QuantumRange) <= MagickEpsilon)) &&
         (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
       return(MagickTrue);
     }
@@ -91,13 +91,13 @@ static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
 static inline void SetMagickPixelPacket(const Image *image,
   const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
 {
-  pixel->red=(MagickRealType) GetRedPixelComponent(color);
-  pixel->green=(MagickRealType) GetGreenPixelComponent(color);
-  pixel->blue=(MagickRealType) GetBluePixelComponent(color);
-  pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+  pixel->red=(MagickRealType) GetPixelRed(color);
+  pixel->green=(MagickRealType) GetPixelGreen(color);
+  pixel->blue=(MagickRealType) GetPixelBlue(color);
+  pixel->opacity=(MagickRealType) GetPixelOpacity(color);
   if ((image->colorspace == CMYKColorspace) &&
       (index != (const IndexPacket *) NULL))
-    pixel->index=(MagickRealType) GetIndexPixelComponent(index);
+    pixel->index=(MagickRealType) GetPixelIndex(index);
 }
 
 static inline void SetMagickPixelPacketBias(const Image *image,
@@ -116,13 +116,13 @@ static inline void SetMagickPixelPacketBias(const Image *image,
 static inline void SetPixelPacket(const Image *image,
   const MagickPixelPacket *pixel,PixelPacket *color,IndexPacket *index)
 {
-  SetRedPixelComponent(color,ClampToQuantum(pixel->red));
-  SetGreenPixelComponent(color,ClampToQuantum(pixel->green));
-  SetBluePixelComponent(color,ClampToQuantum(pixel->blue));
-  SetOpacityPixelComponent(color,ClampToQuantum(pixel->opacity));
+  SetPixelRed(color,ClampToQuantum(pixel->red));
+  SetPixelGreen(color,ClampToQuantum(pixel->green));
+  SetPixelBlue(color,ClampToQuantum(pixel->blue));
+  SetPixelOpacity(color,ClampToQuantum(pixel->opacity));
   if ((image->colorspace == CMYKColorspace) ||
       (image->storage_class == PseudoClass))
-    SetIndexPixelComponent(index,ClampToQuantum(pixel->index));
+    SetPixelIndex(index,ClampToQuantum(pixel->index));
 }
 
 #if defined(__cplusplus) || defined(c_plusplus)
index 999b42d6052964f8b5213924022f4f15fe77b7d1..c6c95d016d9409a0f0632cb688f6a11ee1165c6d 100644 (file)
@@ -271,9 +271,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+              *q++=ScaleQuantumToChar(GetPixelBlue(p));
+              *q++=ScaleQuantumToChar(GetPixelGreen(p));
+              *q++=ScaleQuantumToChar(GetPixelRed(p));
               p++;
             }
           }
@@ -288,10 +288,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+              *q++=ScaleQuantumToChar(GetPixelBlue(p));
+              *q++=ScaleQuantumToChar(GetPixelGreen(p));
+              *q++=ScaleQuantumToChar(GetPixelRed(p));
+              *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -306,9 +306,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+              *q++=ScaleQuantumToChar(GetPixelBlue(p));
+              *q++=ScaleQuantumToChar(GetPixelGreen(p));
+              *q++=ScaleQuantumToChar(GetPixelRed(p));
               *q++=ScaleQuantumToChar((Quantum) 0);
               p++;
             }
@@ -339,9 +339,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToChar(GetPixelRed(p));
+              *q++=ScaleQuantumToChar(GetPixelGreen(p));
+              *q++=ScaleQuantumToChar(GetPixelBlue(p));
               p++;
             }
           }
@@ -356,10 +356,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+              *q++=ScaleQuantumToChar(GetPixelRed(p));
+              *q++=ScaleQuantumToChar(GetPixelGreen(p));
+              *q++=ScaleQuantumToChar(GetPixelBlue(p));
+              *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -374,9 +374,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToChar(GetPixelRed(p));
+              *q++=ScaleQuantumToChar(GetPixelGreen(p));
+              *q++=ScaleQuantumToChar(GetPixelBlue(p));
               *q++=ScaleQuantumToChar((Quantum) 0);
               p++;
             }
@@ -399,35 +399,35 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=ScaleQuantumToChar(GetRedPixelComponent(p));
+                *q=ScaleQuantumToChar(GetPixelRed(p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=ScaleQuantumToChar(GetGreenPixelComponent(p));
+                *q=ScaleQuantumToChar(GetPixelGreen(p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=ScaleQuantumToChar(GetBluePixelComponent(p));
+                *q=ScaleQuantumToChar(GetPixelBlue(p));
                 break;
               }
               case AlphaQuantum:
               {
-                *q=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+                *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+                *q=ScaleQuantumToChar(GetPixelOpacity(p));
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+                  *q=ScaleQuantumToChar(GetPixelIndex(indexes+x));
                 break;
               }
               case IndexQuantum:
@@ -460,9 +460,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(double) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(double) (QuantumScale*GetRedPixelComponent(p));
+              *q++=(double) (QuantumScale*GetPixelBlue(p));
+              *q++=(double) (QuantumScale*GetPixelGreen(p));
+              *q++=(double) (QuantumScale*GetPixelRed(p));
               p++;
             }
           }
@@ -477,11 +477,11 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(double) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(double) (QuantumScale*GetRedPixelComponent(p));
+              *q++=(double) (QuantumScale*GetPixelBlue(p));
+              *q++=(double) (QuantumScale*GetPixelGreen(p));
+              *q++=(double) (QuantumScale*GetPixelRed(p));
               *q++=(double) (QuantumScale*((Quantum) (QuantumRange-
-                GetOpacityPixelComponent(p))));
+                GetPixelOpacity(p))));
               p++;
             }
           }
@@ -496,9 +496,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(double) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(double) (QuantumScale*GetRedPixelComponent(p));
+              *q++=(double) (QuantumScale*GetPixelBlue(p));
+              *q++=(double) (QuantumScale*GetPixelGreen(p));
+              *q++=(double) (QuantumScale*GetPixelRed(p));
               *q++=0.0;
               p++;
             }
@@ -529,9 +529,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(double) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(double) (QuantumScale*GetBluePixelComponent(p));
+              *q++=(double) (QuantumScale*GetPixelRed(p));
+              *q++=(double) (QuantumScale*GetPixelGreen(p));
+              *q++=(double) (QuantumScale*GetPixelBlue(p));
               p++;
             }
           }
@@ -546,11 +546,11 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(double) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(double) (QuantumScale*GetBluePixelComponent(p));
+              *q++=(double) (QuantumScale*GetPixelRed(p));
+              *q++=(double) (QuantumScale*GetPixelGreen(p));
+              *q++=(double) (QuantumScale*GetPixelBlue(p));
               *q++=(double) (QuantumScale*((Quantum) (QuantumRange-
-                GetOpacityPixelComponent(p))));
+                GetPixelOpacity(p))));
               p++;
             }
           }
@@ -565,9 +565,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(double) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(double) (QuantumScale*GetBluePixelComponent(p));
+              *q++=(double) (QuantumScale*GetPixelRed(p));
+              *q++=(double) (QuantumScale*GetPixelGreen(p));
+              *q++=(double) (QuantumScale*GetPixelBlue(p));
               *q++=0.0;
               p++;
             }
@@ -590,36 +590,36 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=(double) (QuantumScale*GetRedPixelComponent(p));
+                *q=(double) (QuantumScale*GetPixelRed(p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=(double) (QuantumScale*GetGreenPixelComponent(p));
+                *q=(double) (QuantumScale*GetPixelGreen(p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=(double) (QuantumScale*GetBluePixelComponent(p));
+                *q=(double) (QuantumScale*GetPixelBlue(p));
                 break;
               }
               case AlphaQuantum:
               {
                 *q=(double) (QuantumScale*((Quantum) (QuantumRange-
-                  GetOpacityPixelComponent(p))));
+                  GetPixelOpacity(p))));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=(double) (QuantumScale*GetOpacityPixelComponent(p));
+                *q=(double) (QuantumScale*GetPixelOpacity(p));
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=(double) (QuantumScale*GetIndexPixelComponent(indexes+x));
+                  *q=(double) (QuantumScale*GetPixelIndex(indexes+x));
                 break;
               }
               case IndexQuantum:
@@ -652,9 +652,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(float) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(float) (QuantumScale*GetRedPixelComponent(p));
+              *q++=(float) (QuantumScale*GetPixelBlue(p));
+              *q++=(float) (QuantumScale*GetPixelGreen(p));
+              *q++=(float) (QuantumScale*GetPixelRed(p));
               p++;
             }
           }
@@ -669,10 +669,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(float) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(float) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(float) (QuantumScale*(Quantum) (GetAlphaPixelComponent(p)));
+              *q++=(float) (QuantumScale*GetPixelBlue(p));
+              *q++=(float) (QuantumScale*GetPixelGreen(p));
+              *q++=(float) (QuantumScale*GetPixelRed(p));
+              *q++=(float) (QuantumScale*(Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -687,9 +687,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(float) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(float) (QuantumScale*GetRedPixelComponent(p));
+              *q++=(float) (QuantumScale*GetPixelBlue(p));
+              *q++=(float) (QuantumScale*GetPixelGreen(p));
+              *q++=(float) (QuantumScale*GetPixelRed(p));
               *q++=0.0;
               p++;
             }
@@ -720,9 +720,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(float) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(float) (QuantumScale*GetBluePixelComponent(p));
+              *q++=(float) (QuantumScale*GetPixelRed(p));
+              *q++=(float) (QuantumScale*GetPixelGreen(p));
+              *q++=(float) (QuantumScale*GetPixelBlue(p));
               p++;
             }
           }
@@ -737,10 +737,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(float) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(float) (QuantumScale*GetBluePixelComponent(p));
-              *q++=(float) (QuantumScale*((Quantum) (GetAlphaPixelComponent(p))));
+              *q++=(float) (QuantumScale*GetPixelRed(p));
+              *q++=(float) (QuantumScale*GetPixelGreen(p));
+              *q++=(float) (QuantumScale*GetPixelBlue(p));
+              *q++=(float) (QuantumScale*((Quantum) (GetPixelAlpha(p))));
               p++;
             }
           }
@@ -755,9 +755,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(float) (QuantumScale*GetRedPixelComponent(p));
-              *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
-              *q++=(float) (QuantumScale*GetBluePixelComponent(p));
+              *q++=(float) (QuantumScale*GetPixelRed(p));
+              *q++=(float) (QuantumScale*GetPixelGreen(p));
+              *q++=(float) (QuantumScale*GetPixelBlue(p));
               *q++=0.0;
               p++;
             }
@@ -780,35 +780,35 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=(float) (QuantumScale*GetRedPixelComponent(p));
+                *q=(float) (QuantumScale*GetPixelRed(p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=(float) (QuantumScale*GetGreenPixelComponent(p));
+                *q=(float) (QuantumScale*GetPixelGreen(p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=(float) (QuantumScale*GetBluePixelComponent(p));
+                *q=(float) (QuantumScale*GetPixelBlue(p));
                 break;
               }
               case AlphaQuantum:
               {
-                *q=(float) (QuantumScale*((Quantum) (GetAlphaPixelComponent(p))));
+                *q=(float) (QuantumScale*((Quantum) (GetPixelAlpha(p))));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=(float) (QuantumScale*GetOpacityPixelComponent(p));
+                *q=(float) (QuantumScale*GetPixelOpacity(p));
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=(float) (QuantumScale*GetIndexPixelComponent(indexes+x));
+                  *q=(float) (QuantumScale*GetPixelIndex(indexes+x));
                 break;
               }
               case IndexQuantum:
@@ -841,9 +841,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
               p++;
             }
           }
@@ -858,11 +858,11 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
               *q++=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
-                GetOpacityPixelComponent(p)));
+                GetPixelOpacity(p)));
               p++;
             }
           }
@@ -877,9 +877,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
               *q++=0U;
               p++;
             }
@@ -911,9 +911,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
               p++;
             }
           }
@@ -928,11 +928,11 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
               *q++=(unsigned int) ScaleQuantumToLong((Quantum)
-                (GetAlphaPixelComponent(p)));
+                (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -947,9 +947,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
               *q++=0U;
               p++;
             }
@@ -972,36 +972,36 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+                *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
+                *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+                *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
                 break;
               }
               case AlphaQuantum:
               {
                 *q=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
-                  GetOpacityPixelComponent(p)));
+                  GetPixelOpacity(p)));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=(unsigned int) ScaleQuantumToLong(GetOpacityPixelComponent(p));
+                *q=(unsigned int) ScaleQuantumToLong(GetPixelOpacity(p));
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=(unsigned int) ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+                  *q=(unsigned int) ScaleQuantumToLong(GetPixelIndex(indexes+x));
                 break;
               }
               case IndexQuantum:
@@ -1035,9 +1035,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q++=ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=ScaleQuantumToLong(GetPixelRed(p));
               p++;
             }
           }
@@ -1052,10 +1052,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+              *q++=ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=ScaleQuantumToLong(GetPixelRed(p));
+              *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -1070,9 +1070,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q++=ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=ScaleQuantumToLong(GetPixelRed(p));
               *q++=0;
               p++;
             }
@@ -1103,9 +1103,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToLong(GetPixelRed(p));
+              *q++=ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=ScaleQuantumToLong(GetPixelBlue(p));
               p++;
             }
           }
@@ -1120,10 +1120,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+              *q++=ScaleQuantumToLong(GetPixelRed(p));
+              *q++=ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=ScaleQuantumToLong(GetPixelBlue(p));
+              *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -1138,9 +1138,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToLong(GetPixelRed(p));
+              *q++=ScaleQuantumToLong(GetPixelGreen(p));
+              *q++=ScaleQuantumToLong(GetPixelBlue(p));
               *q++=0;
               p++;
             }
@@ -1163,35 +1163,35 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=ScaleQuantumToLong(GetRedPixelComponent(p));
+                *q=ScaleQuantumToLong(GetPixelRed(p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=ScaleQuantumToLong(GetGreenPixelComponent(p));
+                *q=ScaleQuantumToLong(GetPixelGreen(p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=ScaleQuantumToLong(GetBluePixelComponent(p));
+                *q=ScaleQuantumToLong(GetPixelBlue(p));
                 break;
               }
               case AlphaQuantum:
               {
-                *q=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+                *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=ScaleQuantumToLong(GetOpacityPixelComponent(p));
+                *q=ScaleQuantumToLong(GetPixelOpacity(p));
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+                  *q=ScaleQuantumToLong(GetPixelIndex(indexes+x));
                 break;
               }
               case IndexQuantum:
@@ -1224,9 +1224,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=GetBluePixelComponent(p);
-              *q++=GetGreenPixelComponent(p);
-              *q++=GetRedPixelComponent(p);
+              *q++=GetPixelBlue(p);
+              *q++=GetPixelGreen(p);
+              *q++=GetPixelRed(p);
               p++;
             }
           }
@@ -1241,10 +1241,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=GetBluePixelComponent(p);
-              *q++=GetGreenPixelComponent(p);
-              *q++=GetRedPixelComponent(p);
-              *q++=(Quantum) (GetAlphaPixelComponent(p));
+              *q++=GetPixelBlue(p);
+              *q++=GetPixelGreen(p);
+              *q++=GetPixelRed(p);
+              *q++=(Quantum) (GetPixelAlpha(p));
               p++;
             }
           }
@@ -1259,9 +1259,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=GetBluePixelComponent(p);
-              *q++=GetGreenPixelComponent(p);
-              *q++=GetRedPixelComponent(p);
+              *q++=GetPixelBlue(p);
+              *q++=GetPixelGreen(p);
+              *q++=GetPixelRed(p);
               *q++=(Quantum) 0;
               p++;
             }
@@ -1292,9 +1292,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=GetRedPixelComponent(p);
-              *q++=GetGreenPixelComponent(p);
-              *q++=GetBluePixelComponent(p);
+              *q++=GetPixelRed(p);
+              *q++=GetPixelGreen(p);
+              *q++=GetPixelBlue(p);
               p++;
             }
           }
@@ -1309,10 +1309,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=GetRedPixelComponent(p);
-              *q++=GetGreenPixelComponent(p);
-              *q++=GetBluePixelComponent(p);
-              *q++=(Quantum) (GetAlphaPixelComponent(p));
+              *q++=GetPixelRed(p);
+              *q++=GetPixelGreen(p);
+              *q++=GetPixelBlue(p);
+              *q++=(Quantum) (GetPixelAlpha(p));
               p++;
             }
           }
@@ -1327,9 +1327,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=GetRedPixelComponent(p);
-              *q++=GetGreenPixelComponent(p);
-              *q++=GetBluePixelComponent(p);
+              *q++=GetPixelRed(p);
+              *q++=GetPixelGreen(p);
+              *q++=GetPixelBlue(p);
               *q++=(Quantum) 0;
               p++;
             }
@@ -1352,35 +1352,35 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=GetRedPixelComponent(p);
+                *q=GetPixelRed(p);
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=GetGreenPixelComponent(p);
+                *q=GetPixelGreen(p);
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=GetBluePixelComponent(p);
+                *q=GetPixelBlue(p);
                 break;
               }
               case AlphaQuantum:
               {
-                *q=(Quantum) (GetAlphaPixelComponent(p));
+                *q=(Quantum) (GetPixelAlpha(p));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=GetOpacityPixelComponent(p);
+                *q=GetPixelOpacity(p);
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=GetIndexPixelComponent(indexes+x);
+                  *q=GetPixelIndex(indexes+x);
                 break;
               }
               case IndexQuantum:
@@ -1413,9 +1413,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+              *q++=ScaleQuantumToShort(GetPixelBlue(p));
+              *q++=ScaleQuantumToShort(GetPixelGreen(p));
+              *q++=ScaleQuantumToShort(GetPixelRed(p));
               p++;
             }
           }
@@ -1430,10 +1430,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+              *q++=ScaleQuantumToShort(GetPixelBlue(p));
+              *q++=ScaleQuantumToShort(GetPixelGreen(p));
+              *q++=ScaleQuantumToShort(GetPixelRed(p));
+              *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -1448,9 +1448,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+              *q++=ScaleQuantumToShort(GetPixelBlue(p));
+              *q++=ScaleQuantumToShort(GetPixelGreen(p));
+              *q++=ScaleQuantumToShort(GetPixelRed(p));
               *q++=0;
               p++;
             }
@@ -1481,9 +1481,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToShort(GetPixelRed(p));
+              *q++=ScaleQuantumToShort(GetPixelGreen(p));
+              *q++=ScaleQuantumToShort(GetPixelBlue(p));
               p++;
             }
           }
@@ -1498,10 +1498,10 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-              *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+              *q++=ScaleQuantumToShort(GetPixelRed(p));
+              *q++=ScaleQuantumToShort(GetPixelGreen(p));
+              *q++=ScaleQuantumToShort(GetPixelBlue(p));
+              *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
               p++;
             }
           }
@@ -1516,9 +1516,9 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-              *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+              *q++=ScaleQuantumToShort(GetPixelRed(p));
+              *q++=ScaleQuantumToShort(GetPixelGreen(p));
+              *q++=ScaleQuantumToShort(GetPixelBlue(p));
               *q++=0;
               p++;
             }
@@ -1541,35 +1541,35 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                *q=ScaleQuantumToShort(GetRedPixelComponent(p));
+                *q=ScaleQuantumToShort(GetPixelRed(p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                *q=ScaleQuantumToShort(GetGreenPixelComponent(p));
+                *q=ScaleQuantumToShort(GetPixelGreen(p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                *q=ScaleQuantumToShort(GetBluePixelComponent(p));
+                *q=ScaleQuantumToShort(GetPixelBlue(p));
                 break;
               }
               case AlphaQuantum:
               {
-                *q=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+                *q=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
                 break;
               }
               case OpacityQuantum:
               {
-                *q=ScaleQuantumToShort(GetOpacityPixelComponent(p));
+                *q=ScaleQuantumToShort(GetPixelOpacity(p));
                 break;
               }
               case BlackQuantum:
               {
                 if (image->colorspace == CMYKColorspace)
-                  *q=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+                  *q=ScaleQuantumToShort(GetPixelIndex(indexes+x));
                 break;
               }
               case IndexQuantum:
@@ -1843,9 +1843,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1862,10 +1862,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelAlpha(q,ScaleCharToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1882,10 +1882,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetOpacityPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelOpacity(q,ScaleCharToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1902,9 +1902,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
               p++;
               q++;
             }
@@ -1922,9 +1922,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1941,9 +1941,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1960,10 +1960,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
+              SetPixelAlpha(q,ScaleCharToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1980,10 +1980,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
-              SetOpacityPixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
+              SetPixelOpacity(q,ScaleCharToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2000,9 +2000,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+              SetPixelRed(q,ScaleCharToQuantum(*p++));
+              SetPixelGreen(q,ScaleCharToQuantum(*p++));
+              SetPixelBlue(q,ScaleCharToQuantum(*p++));
               p++;
               q++;
             }
@@ -2026,41 +2026,41 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,ScaleCharToQuantum(*p));
+                SetPixelRed(q,ScaleCharToQuantum(*p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,ScaleCharToQuantum(*p));
+                SetPixelGreen(q,ScaleCharToQuantum(*p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,ScaleCharToQuantum(*p));
+                SetPixelBlue(q,ScaleCharToQuantum(*p));
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,ScaleCharToQuantum(*p));
+                SetPixelAlpha(q,ScaleCharToQuantum(*p));
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,ScaleCharToQuantum(*p));
+                SetPixelOpacity(q,ScaleCharToQuantum(*p));
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(*p));
+                SetPixelIndex(indexes+x,ScaleCharToQuantum(*p));
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,ScaleCharToQuantum(*p));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ScaleCharToQuantum(*p));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -2090,13 +2090,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2115,13 +2115,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q->opacity=(Quantum) QuantumRange-ClampToQuantum((MagickRealType)
@@ -2143,13 +2143,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               p++;
@@ -2169,10 +2169,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               p++;
               q++;
             }
@@ -2190,12 +2190,12 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
+              SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
               p++;
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
+              SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
               p++;
               q++;
             }
@@ -2213,16 +2213,16 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2241,13 +2241,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2272,48 +2272,48 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelOpacity(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(
+                SetPixelIndex(indexes+x,ClampToQuantum(
                   (MagickRealType) QuantumRange*(*p)));
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -2343,13 +2343,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2368,16 +2368,16 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2396,13 +2396,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               p++;
@@ -2422,10 +2422,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               p++;
               q++;
             }
@@ -2443,13 +2443,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2468,16 +2468,16 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2496,13 +2496,13 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+              SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
               p++;
               q++;
@@ -2527,48 +2527,48 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                 QuantumRange*(*p)));
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelOpacity(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(
+                SetPixelIndex(indexes+x,ClampToQuantum(
                   (MagickRealType) QuantumRange*(*p)));
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*(*p)));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -2598,9 +2598,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2617,10 +2617,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelAlpha(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2637,9 +2637,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
               p++;
               q++;
             }
@@ -2657,9 +2657,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2676,9 +2676,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2695,10 +2695,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelAlpha(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2715,9 +2715,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
               p++;
               q++;
             }
@@ -2741,41 +2741,41 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelRed(q,ScaleLongToQuantum(*p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelGreen(q,ScaleLongToQuantum(*p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelBlue(q,ScaleLongToQuantum(*p));
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelAlpha(q,ScaleLongToQuantum(*p));
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelOpacity(q,ScaleLongToQuantum(*p));
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(*p));
+                SetPixelIndex(indexes+x,ScaleLongToQuantum(*p));
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,ScaleLongToQuantum(*p));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ScaleLongToQuantum(*p));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -2805,9 +2805,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2824,10 +2824,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelAlpha(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2844,9 +2844,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
               p++;
               q++;
             }
@@ -2864,9 +2864,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2883,9 +2883,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2902,10 +2902,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
+              SetPixelAlpha(q,ScaleLongToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2922,9 +2922,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+              SetPixelRed(q,ScaleLongToQuantum(*p++));
+              SetPixelGreen(q,ScaleLongToQuantum(*p++));
+              SetPixelBlue(q,ScaleLongToQuantum(*p++));
               p++;
               q++;
             }
@@ -2948,41 +2948,41 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelRed(q,ScaleLongToQuantum(*p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelGreen(q,ScaleLongToQuantum(*p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelBlue(q,ScaleLongToQuantum(*p));
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelAlpha(q,ScaleLongToQuantum(*p));
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,ScaleLongToQuantum(*p));
+                SetPixelOpacity(q,ScaleLongToQuantum(*p));
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(*p));
+                SetPixelIndex(indexes+x,ScaleLongToQuantum(*p));
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,ScaleLongToQuantum(*p));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ScaleLongToQuantum(*p));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -3012,9 +3012,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,*p++);
-              SetGreenPixelComponent(q,*p++);
-              SetRedPixelComponent(q,*p++);
+              SetPixelBlue(q,*p++);
+              SetPixelGreen(q,*p++);
+              SetPixelRed(q,*p++);
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3031,10 +3031,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,*p++);
-              SetGreenPixelComponent(q,*p++);
-              SetRedPixelComponent(q,*p++);
-              SetAlphaPixelComponent(q,*p++);
+              SetPixelBlue(q,*p++);
+              SetPixelGreen(q,*p++);
+              SetPixelRed(q,*p++);
+              SetPixelAlpha(q,*p++);
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3051,9 +3051,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,*p++);
-              SetGreenPixelComponent(q,*p++);
-              SetRedPixelComponent(q,*p++);
+              SetPixelBlue(q,*p++);
+              SetPixelGreen(q,*p++);
+              SetPixelRed(q,*p++);
               p++;
               q++;
             }
@@ -3071,9 +3071,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,*p++);
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelRed(q,*p++);
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3090,9 +3090,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,*p++);
-              SetGreenPixelComponent(q,*p++);
-              SetBluePixelComponent(q,*p++);
+              SetPixelRed(q,*p++);
+              SetPixelGreen(q,*p++);
+              SetPixelBlue(q,*p++);
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3109,10 +3109,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,*p++);
-              SetGreenPixelComponent(q,*p++);
-              SetBluePixelComponent(q,*p++);
-              SetAlphaPixelComponent(q,*p++);
+              SetPixelRed(q,*p++);
+              SetPixelGreen(q,*p++);
+              SetPixelBlue(q,*p++);
+              SetPixelAlpha(q,*p++);
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3129,9 +3129,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,*p++);
-              SetGreenPixelComponent(q,*p++);
-              SetBluePixelComponent(q,*p++);
+              SetPixelRed(q,*p++);
+              SetPixelGreen(q,*p++);
+              SetPixelBlue(q,*p++);
               p++;
               q++;
             }
@@ -3155,41 +3155,41 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,*p);
+                SetPixelRed(q,*p);
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,*p);
+                SetPixelGreen(q,*p);
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,*p);
+                SetPixelBlue(q,*p);
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,*p);
+                SetPixelAlpha(q,*p);
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,*p);
+                SetPixelOpacity(q,*p);
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,*p);
+                SetPixelIndex(indexes+x,*p);
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,*p);
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,*p);
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -3219,9 +3219,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
+              SetPixelBlue(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,ScaleShortToQuantum(*p++));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3238,10 +3238,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleShortToQuantum(*p++));
+              SetPixelBlue(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,ScaleShortToQuantum(*p++));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
+              SetPixelAlpha(q,ScaleShortToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3258,9 +3258,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
+              SetPixelBlue(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,ScaleShortToQuantum(*p++));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
               p++;
               q++;
             }
@@ -3278,9 +3278,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3297,9 +3297,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,ScaleShortToQuantum(*p++));
+              SetPixelBlue(q,ScaleShortToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3316,10 +3316,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
-              SetAlphaPixelComponent(q,ScaleShortToQuantum(*p++));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,ScaleShortToQuantum(*p++));
+              SetPixelBlue(q,ScaleShortToQuantum(*p++));
+              SetPixelAlpha(q,ScaleShortToQuantum(*p++));
               q++;
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3336,9 +3336,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               break;
             for (x=0; x < (ssize_t) columns; x++)
             {
-              SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
-              SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
+              SetPixelRed(q,ScaleShortToQuantum(*p++));
+              SetPixelGreen(q,ScaleShortToQuantum(*p++));
+              SetPixelBlue(q,ScaleShortToQuantum(*p++));
               p++;
               q++;
             }
@@ -3362,41 +3362,41 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               case RedQuantum:
               case CyanQuantum:
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum(*p));
+                SetPixelRed(q,ScaleShortToQuantum(*p));
                 break;
               }
               case GreenQuantum:
               case MagentaQuantum:
               {
-                SetGreenPixelComponent(q,ScaleShortToQuantum(*p));
+                SetPixelGreen(q,ScaleShortToQuantum(*p));
                 break;
               }
               case BlueQuantum:
               case YellowQuantum:
               {
-                SetBluePixelComponent(q,ScaleShortToQuantum(*p));
+                SetPixelBlue(q,ScaleShortToQuantum(*p));
                 break;
               }
               case AlphaQuantum:
               {
-                SetAlphaPixelComponent(q,ScaleShortToQuantum(*p));
+                SetPixelAlpha(q,ScaleShortToQuantum(*p));
                 break;
               }
               case OpacityQuantum:
               {
-                SetOpacityPixelComponent(q,ScaleShortToQuantum(*p));
+                SetPixelOpacity(q,ScaleShortToQuantum(*p));
                 break;
               }
               case BlackQuantum:
               {
-                SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(*p));
+                SetPixelIndex(indexes+x,ScaleShortToQuantum(*p));
                 break;
               }
               case IndexQuantum:
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum(*p));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ScaleShortToQuantum(*p));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 break;
               }
               default:
@@ -3469,27 +3469,27 @@ static inline void AlphaBlendMagickPixelPacket(const Image *image,
   if (image->matte == MagickFalse)
     {
       *alpha=1.0;
-      pixel->red=(MagickRealType) GetRedPixelComponent(color);
-      pixel->green=(MagickRealType) GetGreenPixelComponent(color);
-      pixel->blue=(MagickRealType) GetBluePixelComponent(color);
-      pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+      pixel->red=(MagickRealType) GetPixelRed(color);
+      pixel->green=(MagickRealType) GetPixelGreen(color);
+      pixel->blue=(MagickRealType) GetPixelBlue(color);
+      pixel->opacity=(MagickRealType) GetPixelOpacity(color);
       pixel->index=0.0;
       if (((image->colorspace == CMYKColorspace) ||
            (image->storage_class == PseudoClass)) &&
           (indexes != (const IndexPacket *) NULL))
-        pixel->index=(MagickRealType) GetIndexPixelComponent(indexes);
+        pixel->index=(MagickRealType) GetPixelIndex(indexes);
       return;
     }
-  *alpha=QuantumScale*GetAlphaPixelComponent(color);
-  pixel->red=(*alpha*GetRedPixelComponent(color));
-  pixel->green=(*alpha*GetGreenPixelComponent(color));
-  pixel->blue=(*alpha*GetBluePixelComponent(color));
-  pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+  *alpha=QuantumScale*GetPixelAlpha(color);
+  pixel->red=(*alpha*GetPixelRed(color));
+  pixel->green=(*alpha*GetPixelGreen(color));
+  pixel->blue=(*alpha*GetPixelBlue(color));
+  pixel->opacity=(MagickRealType) GetPixelOpacity(color);
   pixel->index=0.0;
   if (((image->colorspace == CMYKColorspace) ||
        (image->storage_class == PseudoClass)) &&
       (indexes != (const IndexPacket *) NULL))
-    pixel->index=(*alpha*GetIndexPixelComponent(indexes));
+    pixel->index=(*alpha*GetPixelIndex(indexes));
 }
 
 static void BicubicInterpolate(const MagickPixelPacket *pixels,const double dx,
index 80f4344287293cbe33db05373c2f527e63532c96..8ae1ab28e6ef06cec697490452dca45232f44e23 100644 (file)
@@ -25,76 +25,76 @@ extern "C" {
 #include <magick/colorspace.h>
 #include <magick/constitute.h>
 
-#define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
-#define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
-#define ClampBluePixelComponent(pixel) ClampToQuantum((pixel)->blue)
-#define ClampIndexPixelComponent(indexes) ClampToQuantum(*(indexes))
-#define ClampOpacityPixelComponent(pixel) ClampToQuantum((pixel)->opacity)
-#define GetAlphaPixelComponent(pixel) (QuantumRange-(pixel)->opacity)
-#define GetBlackPixelComponent(indexes) (*(indexes))
-#define GetBluePixelComponent(pixel) ((pixel)->blue)
-#define GetCbPixelComponent(pixel) ((pixel)->green)
-#define GetCrPixelComponent(pixel) ((pixel)->blue)
-#define GetCyanPixelComponent(pixel) ((pixel)->red)
-#define GetGrayPixelComponent(pixel) ((pixel)->red)
-#define GetGreenPixelComponent(pixel) ((pixel)->green)
-#define GetIndexPixelComponent(indexes) (*(indexes))
-#define GetMagentaPixelComponent(pixel) ((pixel)->green)
-#define GetNextPixel(pixel)  ((pixel)+1)
-#define GetOpacityPixelComponent(pixel) ((pixel)->opacity)
-#define GetRedPixelComponent(pixel) ((pixel)->red)
-#define GetRGBPixelComponents(pixel,packet) \
+#define ClampPixelRed(pixel) ClampToQuantum((pixel)->red)
+#define ClampPixelGreen(pixel) ClampToQuantum((pixel)->green)
+#define ClampPixelBlue(pixel) ClampToQuantum((pixel)->blue)
+#define ClampPixelIndex(indexes) ClampToQuantum(*(indexes))
+#define ClampPixelOpacity(pixel) ClampToQuantum((pixel)->opacity)
+#define GetPixelAlpha(pixel) (QuantumRange-(pixel)->opacity)
+#define GetPixelBlack(indexes) (*(indexes))
+#define GetPixelBlue(pixel) ((pixel)->blue)
+#define GetPixelCb(pixel) ((pixel)->green)
+#define GetPixelCr(pixel) ((pixel)->blue)
+#define GetPixelCyan(pixel) ((pixel)->red)
+#define GetPixelGray(pixel) ((pixel)->red)
+#define GetPixelGreen(pixel) ((pixel)->green)
+#define GetPixelIndex(indexes) (*(indexes))
+#define GetPixelMagenta(pixel) ((pixel)->green)
+#define GetPixelNext(pixel)  ((pixel)+1)
+#define GetPixelOpacity(pixel) ((pixel)->opacity)
+#define GetPixelRed(pixel) ((pixel)->red)
+#define GetPixelRGB(pixel,packet) \
 { \
-  (packet)->red=GetRedPixelComponent((pixel)); \
-  (packet)->green=GetGreenPixelComponent((pixel)); \
-  (packet)->blue=GetBluePixelComponent((pixel)); \
+  (packet)->red=GetPixelRed((pixel)); \
+  (packet)->green=GetPixelGreen((pixel)); \
+  (packet)->blue=GetPixelBlue((pixel)); \
 }
-#define GetRGBOPixelComponents(pixel,packet) \
+#define GetPixelRGBO(pixel,packet) \
 { \
-  (packet)->red=GetRedPixelComponent((pixel)); \
-  (packet)->green=GetGreenPixelComponent((pixel)); \
-  (packet)->blue=GetBluePixelComponent((pixel)); \
-  (packet)->opacity=GetOpacityPixelComponent((pixel)); \
+  (packet)->red=GetPixelRed((pixel)); \
+  (packet)->green=GetPixelGreen((pixel)); \
+  (packet)->blue=GetPixelBlue((pixel)); \
+  (packet)->opacity=GetPixelOpacity((pixel)); \
 }
-#define GetYPixelComponent(pixel) ((pixel)->red)
-#define GetYellowPixelComponent(pixel) ((pixel)->blue)
-#define SetAlphaPixelComponent(pixel,value) \
+#define GetPixelY(pixel) ((pixel)->red)
+#define GetPixelYellow(pixel) ((pixel)->blue)
+#define SetPixelAlpha(pixel,value) \
   ((pixel)->opacity=(Quantum) (QuantumRange-(value)))
-#define SetBlackPixelComponent(indexes,value) (*(indexes)=(Quantum) (value))
-#define SetBluePixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetCbPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetCrPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetCyanPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetGrayPixelComponent(pixel,value) \
+#define SetPixelBlack(indexes,value) (*(indexes)=(Quantum) (value))
+#define SetPixelBlue(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetPixelCb(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetPixelCr(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetPixelCyan(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetPixelGray(pixel,value) \
   ((pixel)->red=(pixel)->green=(pixel)->blue=(Quantum) (value))
-#define SetGreenPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetIndexPixelComponent(indexes,value) (*(indexes)=(IndexPacket) (value))
-#define SetMagentaPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetOpacityPixelComponent(pixel,value) \
+#define SetPixelGreen(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetPixelIndex(indexes,value) (*(indexes)=(IndexPacket) (value))
+#define SetPixelMagenta(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetPixelOpacity(pixel,value) \
   ((pixel)->opacity=(Quantum) (value))
-#define SetRedPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetRGBPixelComponents(pixel,packet) \
+#define SetPixelRed(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetPixelRGB(pixel,packet) \
 { \
-  SetRedPixelComponent(pixel,(packet)->red); \
-  SetGreenPixelComponent(pixel,(packet)->green); \
-  SetBluePixelComponent(pixel,(packet)->blue); \
+  SetPixelRed(pixel,(packet)->red); \
+  SetPixelGreen(pixel,(packet)->green); \
+  SetPixelBlue(pixel,(packet)->blue); \
 }
-#define SetRGBAPixelComponents(pixel,packet) \
+#define SetPixelRGBA(pixel,packet) \
 { \
-  SetRedPixelComponent(pixel,(packet)->red); \
-  SetGreenPixelComponent(pixel,(packet)->green); \
-  SetBluePixelComponent(pixel,(packet)->blue); \
-  SetAlphaPixelComponent(pixel,(QuantumRange-(packet)->opacity)); \
+  SetPixelRed(pixel,(packet)->red); \
+  SetPixelGreen(pixel,(packet)->green); \
+  SetPixelBlue(pixel,(packet)->blue); \
+  SetPixelAlpha(pixel,(QuantumRange-(packet)->opacity)); \
 }
-#define SetRGBOPixelComponents(pixel,packet) \
+#define SetPixelRGBO(pixel,packet) \
 { \
-  SetRedPixelComponent(pixel,(packet)->red); \
-  SetGreenPixelComponent(pixel,(packet)->green); \
-  SetBluePixelComponent(pixel,(packet)->blue); \
-  SetOpacityPixelComponent(pixel,(packet)->opacity); \
+  SetPixelRed(pixel,(packet)->red); \
+  SetPixelGreen(pixel,(packet)->green); \
+  SetPixelBlue(pixel,(packet)->blue); \
+  SetPixelOpacity(pixel,(packet)->opacity); \
 }
-#define SetYellowPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetYPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetPixelYellow(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetPixelY(pixel,value) ((pixel)->red=(Quantum) (value))
 
 typedef enum
 {
@@ -111,19 +111,19 @@ typedef enum
 
 typedef enum
 {
-  RedPixelComponent = 0,
-  CyanPixelComponent = 0,
-  GrayPixelComponent = 0,
-  YPixelComponent = 0,
-  GreenPixelComponent = 1,
-  MagentaPixelComponent = 1,
-  CbPixelComponent = 1,
-  BluePixelComponent = 2,
-  YellowPixelComponent = 2,
-  CrPixelComponent = 2,
-  AlphaPixelComponent = 3,
-  BlackPixelComponent = 4,
-  IndexPixelComponent = 4,
+  PixelRed = 0,
+  PixelCyan = 0,
+  PixelGray = 0,
+  PixelY = 0,
+  PixelGreen = 1,
+  PixelMagenta = 1,
+  PixelCb = 1,
+  PixelBlue = 2,
+  PixelYellow = 2,
+  PixelCr = 2,
+  PixelAlpha = 3,
+  PixelBlack = 4,
+  PixelIndex = 4,
   MaskPixelComponent = 5
 } PixelComponent;
 
index 21c0585d20785fbd0a693d3a9d36d8901998ec82..fbbcc8cb9becb2476bf9fdebb4e4ed6e5ea17d22 100644 (file)
@@ -134,8 +134,8 @@ MagickExport double GetImageTotalInkDensity(Image *image)
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      density=(double) GetRedPixelComponent(p)+GetGreenPixelComponent(p)+
-        GetBluePixelComponent(p)+GetIndexPixelComponent(indexes+x);
+      density=(double) GetPixelRed(p)+GetPixelGreen(p)+
+        GetPixelBlue(p)+GetPixelIndex(indexes+x);
       if (density > total_ink_density)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetImageTotalInkDensity)
index 669942a1d1a5c0a2d29e71e3780b1ce551d202a9..d3a793f46f133bcfb9ba82c11326315e5c1a5942 100644 (file)
@@ -1251,14 +1251,14 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               p=source_pixels[id];
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                *p++=ScaleQuantumToShort(GetRedPixelComponent(q));
+                *p++=ScaleQuantumToShort(GetPixelRed(q));
                 if (source_channels > 1)
                   {
-                    *p++=ScaleQuantumToShort(GetGreenPixelComponent(q));
-                    *p++=ScaleQuantumToShort(GetBluePixelComponent(q));
+                    *p++=ScaleQuantumToShort(GetPixelGreen(q));
+                    *p++=ScaleQuantumToShort(GetPixelBlue(q));
                   }
                 if (source_channels > 3)
-                  *p++=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+                  *p++=ScaleQuantumToShort(GetPixelIndex(indexes+x));
                 q++;
               }
               cmsDoTransform(transform[id],source_pixels[id],target_pixels[id],
@@ -1267,20 +1267,20 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               q-=image->columns;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                SetRedPixelComponent(q,ScaleShortToQuantum(*p));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ScaleShortToQuantum(*p));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p++;
                 if (target_channels > 1)
                   {
-                    SetGreenPixelComponent(q,ScaleShortToQuantum(*p));
+                    SetPixelGreen(q,ScaleShortToQuantum(*p));
                     p++;
-                    SetBluePixelComponent(q,ScaleShortToQuantum(*p));
+                    SetPixelBlue(q,ScaleShortToQuantum(*p));
                     p++;
                   }
                 if (target_channels > 3)
                   {
-                    SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(*p));
+                    SetPixelIndex(indexes+x,ScaleShortToQuantum(*p));
                     p++;
                   }
                 q++;
index 9c976e70aaaaaf4d165239ed31c7a2e4b9c25386..22b6b4644c7d89db75039e986c296b008eb3a6a8 100644 (file)
@@ -435,18 +435,18 @@ static inline void AssociateAlphaPixel(const CubeInfo *cube_info,
   if ((cube_info->associate_alpha == MagickFalse) ||
       (pixel->opacity == OpaqueOpacity))
     {
-      alpha_pixel->red=(MagickRealType) GetRedPixelComponent(pixel);
-      alpha_pixel->green=(MagickRealType) GetGreenPixelComponent(pixel);
-      alpha_pixel->blue=(MagickRealType) GetBluePixelComponent(pixel);
-      alpha_pixel->opacity=(MagickRealType) GetOpacityPixelComponent(pixel);
+      alpha_pixel->red=(MagickRealType) GetPixelRed(pixel);
+      alpha_pixel->green=(MagickRealType) GetPixelGreen(pixel);
+      alpha_pixel->blue=(MagickRealType) GetPixelBlue(pixel);
+      alpha_pixel->opacity=(MagickRealType) GetPixelOpacity(pixel);
       return;
     }
   alpha=(MagickRealType) (QuantumScale*(QuantumRange-
-    GetOpacityPixelComponent(pixel)));
-  alpha_pixel->red=alpha*GetRedPixelComponent(pixel);
-  alpha_pixel->green=alpha*GetGreenPixelComponent(pixel);
-  alpha_pixel->blue=alpha*GetBluePixelComponent(pixel);
-  alpha_pixel->opacity=(MagickRealType) GetOpacityPixelComponent(pixel);
+    GetPixelOpacity(pixel)));
+  alpha_pixel->red=alpha*GetPixelRed(pixel);
+  alpha_pixel->green=alpha*GetPixelGreen(pixel);
+  alpha_pixel->blue=alpha*GetPixelBlue(pixel);
+  alpha_pixel->opacity=(MagickRealType) GetPixelOpacity(pixel);
 }
 
 static inline Quantum ClampToUnsignedQuantum(const MagickRealType value)
@@ -465,26 +465,26 @@ static inline size_t ColorToNodeId(const CubeInfo *cube_info,
     id;
 
   id=(size_t) (((ScaleQuantumToChar(ClampToUnsignedQuantum(
-    GetRedPixelComponent(pixel))) >> index) & 0x01) |
+    GetPixelRed(pixel))) >> index) & 0x01) |
     ((ScaleQuantumToChar(ClampToUnsignedQuantum(
-    GetGreenPixelComponent(pixel))) >> index) & 0x01) << 1 |
+    GetPixelGreen(pixel))) >> index) & 0x01) << 1 |
     ((ScaleQuantumToChar(ClampToUnsignedQuantum(
-    GetBluePixelComponent(pixel))) >> index) & 0x01) << 2);
+    GetPixelBlue(pixel))) >> index) & 0x01) << 2);
   if (cube_info->associate_alpha != MagickFalse)
     id|=((ScaleQuantumToChar(ClampToUnsignedQuantum(
-      GetOpacityPixelComponent(pixel))) >> index) & 0x1) << 3;
+      GetPixelOpacity(pixel))) >> index) & 0x1) << 3;
   return(id);
 }
 
 static inline MagickBooleanType IsSameColor(const Image *image,
   const PixelPacket *p,const PixelPacket *q)
 {
-  if ((GetRedPixelComponent(p) != GetRedPixelComponent(q)) ||
-      (GetGreenPixelComponent(p) != GetGreenPixelComponent(q)) ||
-      (GetBluePixelComponent(p) != GetBluePixelComponent(q)))
+  if ((GetPixelRed(p) != GetPixelRed(q)) ||
+      (GetPixelGreen(p) != GetPixelGreen(q)) ||
+      (GetPixelBlue(p) != GetPixelBlue(q)))
     return(MagickFalse);
   if ((image->matte != MagickFalse) &&
-      (GetOpacityPixelComponent(p) != GetOpacityPixelComponent(q)))
+      (GetPixelOpacity(p) != GetPixelOpacity(q)))
     return(MagickFalse);
   return(MagickTrue);
 }
@@ -607,12 +607,12 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
           for (i=0; i < (ssize_t) count; i++)
           {
             if (image->storage_class == PseudoClass)
-              SetIndexPixelComponent(indexes+x+i,index);
+              SetPixelIndex(indexes+x+i,index);
             if (cube.quantize_info->measure_error == MagickFalse)
               {
-                SetRGBPixelComponents(q,image->colormap+index);
+                SetPixelRGB(q,image->colormap+index);
                 if (cube.associate_alpha != MagickFalse)
-                  SetOpacityPixelComponent(q,image->colormap[index].opacity);
+                  SetPixelOpacity(q,image->colormap[index].opacity);
               }
             q++;
           }
@@ -657,9 +657,9 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
       {
         intensity=(Quantum) (PixelIntensity(q) < ((MagickRealType)
           QuantumRange/2.0) ? 0 : QuantumRange);
-        SetRedPixelComponent(q,intensity);
-        SetGreenPixelComponent(q,intensity);
-        SetBluePixelComponent(q,intensity);
+        SetPixelRed(q,intensity);
+        SetPixelGreen(q,intensity);
+        SetPixelBlue(q,intensity);
         q++;
       }
     }
@@ -1092,19 +1092,19 @@ static void ClosestColor(const Image *image,CubeInfo *cube_info,
       beta=1.0;
       if (cube_info->associate_alpha != MagickFalse)
         {
-          alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(p));
-          beta=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(q));
+          alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
+          beta=(MagickRealType) (QuantumScale*GetPixelAlpha(q));
         }
-      pixel=alpha*GetRedPixelComponent(p)-beta*GetRedPixelComponent(q);
+      pixel=alpha*GetPixelRed(p)-beta*GetPixelRed(q);
       distance=pixel*pixel;
       if (distance <= cube_info->distance)
         {
-          pixel=alpha*GetGreenPixelComponent(p)-beta*GetGreenPixelComponent(q);
+          pixel=alpha*GetPixelGreen(p)-beta*GetPixelGreen(q);
           distance+=pixel*pixel;
           if (distance <= cube_info->distance)
             {
-              pixel=alpha*GetBluePixelComponent(p)-beta*
-                GetBluePixelComponent(q);
+              pixel=alpha*GetPixelBlue(p)-beta*
+                GetPixelBlue(q);
               distance+=pixel*pixel;
               if (distance <= cube_info->distance)
                 {
@@ -1224,13 +1224,13 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info,
       alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
       if (cube_info->associate_alpha == MagickFalse)
         {
-          SetRedPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+          SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
             QuantumRange*node_info->total_color.red)));
-          SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+          SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
             QuantumRange*node_info->total_color.green)));
-          SetBluePixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+          SetPixelBlue(q,ClampToQuantum((MagickRealType) (alpha*
             QuantumRange*node_info->total_color.blue)));
-          SetOpacityPixelComponent(q,OpaqueOpacity);
+          SetPixelOpacity(q,OpaqueOpacity);
         }
       else
         {
@@ -1239,14 +1239,14 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info,
 
           opacity=(MagickRealType) (alpha*QuantumRange*
             node_info->total_color.opacity);
-          SetOpacityPixelComponent(q,ClampToQuantum(opacity));
+          SetPixelOpacity(q,ClampToQuantum(opacity));
           if (q->opacity == OpaqueOpacity)
             {
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+              SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
                 QuantumRange*node_info->total_color.red)));
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+              SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
                 QuantumRange*node_info->total_color.green)));
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+              SetPixelBlue(q,ClampToQuantum((MagickRealType) (alpha*
                 QuantumRange*node_info->total_color.blue)));
             }
           else
@@ -1257,11 +1257,11 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info,
               gamma=(MagickRealType) (QuantumScale*(QuantumRange-
                 (MagickRealType) q->opacity));
               gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
-              SetRedPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+              SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
                 gamma*QuantumRange*node_info->total_color.red)));
-              SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+              SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
                 gamma*QuantumRange*node_info->total_color.green)));
-              SetBluePixelComponent(q,ClampToQuantum((MagickRealType) (
+              SetPixelBlue(q,ClampToQuantum((MagickRealType) (
                 alpha*gamma*QuantumRange*node_info->total_color.blue)));
               if (node_info->number_unique > cube_info->transparent_pixels)
                 {
@@ -1595,12 +1595,12 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
       */
       index=(size_t) cube.cache[i];
       if (image->storage_class == PseudoClass)
-        SetIndexPixelComponent(indexes+u,index);
+        SetPixelIndex(indexes+u,index);
       if (cube.quantize_info->measure_error == MagickFalse)
         {
-          SetRGBPixelComponents(q+u,image->colormap+index);
+          SetPixelRGB(q+u,image->colormap+index);
           if (cube.associate_alpha != MagickFalse)
-            SetOpacityPixelComponent(q+u,image->colormap[index].opacity);
+            SetPixelOpacity(q+u,image->colormap[index].opacity);
         }
       if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
         status=MagickFalse;
@@ -1819,9 +1819,9 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view,
         *indexes=(IndexPacket) index;
       if (cube_info->quantize_info->measure_error == MagickFalse)
         {
-          SetRGBPixelComponents(q,image->colormap+index);
+          SetPixelRGB(q,image->colormap+index);
           if (cube_info->associate_alpha != MagickFalse)
-            SetOpacityPixelComponent(q,image->colormap[index].opacity);
+            SetPixelOpacity(q,image->colormap[index].opacity);
         }
       if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
         return(MagickFalse);
@@ -2173,26 +2173,26 @@ MagickExport MagickBooleanType GetImageQuantizeError(Image *image)
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      index=1UL*GetIndexPixelComponent(indexes+x);
+      index=1UL*GetPixelIndex(indexes+x);
       if (image->matte != MagickFalse)
         {
-          alpha=(MagickRealType) (QuantumScale*(GetAlphaPixelComponent(p)));
+          alpha=(MagickRealType) (QuantumScale*(GetPixelAlpha(p)));
           beta=(MagickRealType) (QuantumScale*(QuantumRange-
             image->colormap[index].opacity));
         }
-      distance=fabs(alpha*GetRedPixelComponent(p)-beta*
+      distance=fabs(alpha*GetPixelRed(p)-beta*
         image->colormap[index].red);
       mean_error_per_pixel+=distance;
       mean_error+=distance*distance;
       if (distance > maximum_error)
         maximum_error=distance;
-      distance=fabs(alpha*GetGreenPixelComponent(p)-beta*
+      distance=fabs(alpha*GetPixelGreen(p)-beta*
         image->colormap[index].green);
       mean_error_per_pixel+=distance;
       mean_error+=distance*distance;
       if (distance > maximum_error)
         maximum_error=distance;
-      distance=fabs(alpha*GetBluePixelComponent(p)-beta*
+      distance=fabs(alpha*GetPixelBlue(p)-beta*
         image->colormap[index].blue);
       mean_error_per_pixel+=distance;
       mean_error+=distance*distance;
@@ -2381,18 +2381,18 @@ MagickExport MagickBooleanType PosterizeImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,PosterizePixel(GetRedPixelComponent(q)));
+        SetPixelRed(q,PosterizePixel(GetPixelRed(q)));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,PosterizePixel(GetGreenPixelComponent(q)));
+        SetPixelGreen(q,PosterizePixel(GetPixelGreen(q)));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,PosterizePixel(GetBluePixelComponent(q)));
+        SetPixelBlue(q,PosterizePixel(GetPixelBlue(q)));
       if (((channel & OpacityChannel) != 0) &&
           (image->matte == MagickTrue))
-        SetOpacityPixelComponent(q,PosterizePixel(GetOpacityPixelComponent(q)));
+        SetPixelOpacity(q,PosterizePixel(GetPixelOpacity(q)));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,PosterizePixel(
-          GetIndexPixelComponent(indexes+x)));
+        SetPixelIndex(indexes+x,PosterizePixel(
+          GetPixelIndex(indexes+x)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3216,7 +3216,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
           register size_t
             intensity;
 
-          intensity=ScaleQuantumToMap(GetRedPixelComponent(q));
+          intensity=ScaleQuantumToMap(GetPixelRed(q));
           if (colormap_index[intensity] < 0)
             {
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3225,14 +3225,14 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
               if (colormap_index[intensity] < 0)
                 {
                   colormap_index[intensity]=(ssize_t) image->colors;
-                  image->colormap[image->colors].red=GetRedPixelComponent(q);
+                  image->colormap[image->colors].red=GetPixelRed(q);
                   image->colormap[image->colors].green=
-                    GetGreenPixelComponent(q);
-                  image->colormap[image->colors].blue=GetBluePixelComponent(q);
+                    GetPixelGreen(q);
+                  image->colormap[image->colors].blue=GetPixelBlue(q);
                   image->colors++;
                }
             }
-          SetIndexPixelComponent(indexes+x,colormap_index[intensity]);
+          SetPixelIndex(indexes+x,colormap_index[intensity]);
           q++;
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3290,8 +3290,8 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
       }
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
-      SetIndexPixelComponent(indexes+x,colormap_index[ScaleQuantumToMap(
-        GetIndexPixelComponent(indexes+x))]);
+      SetPixelIndex(indexes+x,colormap_index[ScaleQuantumToMap(
+        GetPixelIndex(indexes+x))]);
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
   }
index 4de2d8a9bb71c3aec5f43fb0296114e7896bf765..b872529536fbb3bc164aa4bdf2aaa37de9748854 100644 (file)
@@ -303,11 +303,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        alpha=QuantumScale*GetAlphaPixelComponent(q);
-        SetRedPixelComponent(q,ClampToQuantum(alpha*GetRedPixelComponent(q)));
-        SetGreenPixelComponent(q,ClampToQuantum(alpha*
-          GetGreenPixelComponent(q)));
-        SetBluePixelComponent(q,ClampToQuantum(alpha*GetBluePixelComponent(q)));
+        alpha=QuantumScale*GetPixelAlpha(q);
+        SetPixelRed(q,ClampToQuantum(alpha*GetPixelRed(q)));
+        SetPixelGreen(q,ClampToQuantum(alpha*GetPixelGreen(q)));
+        SetPixelBlue(q,ClampToQuantum(alpha*GetPixelBlue(q)));
         q++;
       }
     }
@@ -322,7 +321,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        q->opacity=(Quantum) GetAlphaPixelComponent(q);
+        q->opacity=(Quantum) GetPixelAlpha(q);
         q++;
       }
     }
@@ -339,9 +338,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         q=GetAuthenticPixelQueue(image);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        quantum=GetRedPixelComponent(q);
-        SetRedPixelComponent(q,GetGreenPixelComponent(q));
-        SetGreenPixelComponent(q,quantum);
+        quantum=GetPixelRed(q);
+        SetPixelRed(q,GetPixelGreen(q));
+        SetPixelGreen(q,quantum);
         q++;
       }
     }
@@ -424,7 +423,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         {
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopCharPixel((unsigned char) GetIndexPixelComponent(indexes+x),q);
+            q=PopCharPixel((unsigned char) GetPixelIndex(indexes+x),q);
             q+=quantum_info->pad;
           }
           break;
@@ -436,14 +435,14 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 q=PopShortPixel(endian,SinglePrecisionToHalf(QuantumScale*
-                  GetIndexPixelComponent(indexes+x)),q);
+                  GetPixelIndex(indexes+x)),q);
                 q+=quantum_info->pad;
               }
               break;
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopShortPixel(endian,(unsigned short) GetIndexPixelComponent(
+            q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
               indexes+x),q);
             q+=quantum_info->pad;
           }
@@ -455,7 +454,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetIndexPixelComponent(
+                q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
                   indexes+x),q);
                 p++;
                 q+=quantum_info->pad;
@@ -464,7 +463,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopLongPixel(endian,(unsigned int) GetIndexPixelComponent(
+            q=PopLongPixel(endian,(unsigned int) GetPixelIndex(
               indexes+x),q);
             q+=quantum_info->pad;
           }
@@ -476,7 +475,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetIndexPixelComponent(
+                q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
                   indexes+x),q);
                 p++;
                 q+=quantum_info->pad;
@@ -489,7 +488,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              GetIndexPixelComponent(indexes+x),q);
+              GetPixelIndex(indexes+x),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -517,25 +516,25 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           {
             pixel=(unsigned char) *indexes++;
             *q=((pixel & 0x01) << 7);
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+            pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
               1 : 0);
             *q|=((pixel & 0x01) << 6);
             p++;
             pixel=(unsigned char) *indexes++;
             *q|=((pixel & 0x01) << 5);
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+            pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
               1 : 0);
             *q|=((pixel & 0x01) << 4);
             p++;
             pixel=(unsigned char) *indexes++;
             *q|=((pixel & 0x01) << 3);
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+            pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
               1 : 0);
             *q|=((pixel & 0x01) << 2);
             p++;
             pixel=(unsigned char) *indexes++;
             *q|=((pixel & 0x01) << 1);
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+            pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
               1 : 0);
             *q|=((pixel & 0x01) << 0);
             p++;
@@ -548,7 +547,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               {
                 pixel=(unsigned char) *indexes++;
                 *q|=((pixel & 0x01) << (unsigned char) (bit+4));
-                pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum)
+                pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum)
                   TransparentOpacity ? 1 : 0);
                 *q|=((pixel & 0x01) << (unsigned char) (bit+4-1));
                 p++;
@@ -567,7 +566,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             pixel=(unsigned char) *indexes++;
             *q=((pixel & 0xf) << 4);
             pixel=(unsigned char) (16*QuantumScale*((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)))+0.5);
+              GetPixelOpacity(p)))+0.5);
             *q|=((pixel & 0xf) << 0);
             p++;
             q++;
@@ -581,9 +580,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopCharPixel((unsigned char) GetIndexPixelComponent(indexes+x),q);
+            q=PopCharPixel((unsigned char) GetPixelIndex(indexes+x),q);
             pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -599,10 +598,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopShortPixel(endian,(unsigned short) GetIndexPixelComponent(
+                q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
                   indexes+x),q);
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetAlphaPixelComponent(p));
+                  GetPixelAlpha(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -611,10 +610,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopShortPixel(endian,(unsigned short) GetIndexPixelComponent(
+            q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
               indexes+x),q);
             pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -633,9 +632,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 float
                   pixel;
 
-                q=PopFloatPixel(&quantum_state,(float) GetIndexPixelComponent(
+                q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
                   indexes+x),q);
-                pixel=(float)  (GetAlphaPixelComponent(p));
+                pixel=(float)  (GetPixelAlpha(p));
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -644,10 +643,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopLongPixel(endian,(unsigned int) GetIndexPixelComponent(
+            q=PopLongPixel(endian,(unsigned int) GetPixelIndex(
               indexes+x),q);
             pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -663,9 +662,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 double
                   pixel;
 
-                q=PopDoublePixel(&quantum_state,(double) GetIndexPixelComponent(
+                q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
                   indexes+x),q);
-                pixel=(double) (GetAlphaPixelComponent(p));
+                pixel=(double) (GetPixelAlpha(p));
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -679,9 +678,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              GetIndexPixelComponent(indexes+x),q);
+              GetPixelIndex(indexes+x),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range),q);
+              ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -698,9 +697,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         {
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopCharPixel(ScaleQuantumToChar(GetBluePixelComponent(p)),q);
-            q=PopCharPixel(ScaleQuantumToChar(GetGreenPixelComponent(p)),q);
-            q=PopCharPixel(ScaleQuantumToChar(GetRedPixelComponent(p)),q);
+            q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(p)),q);
+            q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(p)),q);
+            q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(p)),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -716,9 +715,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) (ScaleQuantumToAny(GetRedPixelComponent(p),range) << 22 |
-                  ScaleQuantumToAny(GetGreenPixelComponent(p),range) << 12 |
-                  ScaleQuantumToAny(GetBluePixelComponent(p),range) << 2);
+                pixel=(unsigned int) (
+                  ScaleQuantumToAny(GetPixelRed(p),range) << 22 |
+                  ScaleQuantumToAny(GetPixelGreen(p),range) << 12 |
+                  ScaleQuantumToAny(GetPixelBlue(p),range) << 2);
                 q=PopLongPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -729,13 +729,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 p++;
@@ -745,11 +745,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -771,17 +771,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   default:
                   case 0:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                     break;
                   }
                   case 1:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                     break;
                   }
                   case 2:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                     p++;
                     break;
                   }
@@ -792,17 +792,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   default:
                   case 0:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                     break;
                   }
                   case 1:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                     break;
                   }
                   case 2:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                     p++;
                     break;
                   }
@@ -817,17 +817,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   default:
                   case 0:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                     break;
                   }
                   case 1:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                     break;
                   }
                   case 2:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                     p++;
                     break;
                   }
@@ -843,13 +843,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 p++;
@@ -859,11 +859,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -879,14 +879,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -895,11 +892,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -915,9 +912,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -925,11 +922,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -942,9 +939,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -957,11 +954,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -982,13 +979,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelBlue(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelGreen(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelRed(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar((Quantum) GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToChar((Quantum) GetPixelAlpha(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1021,10 +1018,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 {
                   switch (i)
                   {
-                    case 0: quantum=GetRedPixelComponent(p); break;
-                    case 1: quantum=GetGreenPixelComponent(p); break;
-                    case 2: quantum=GetBluePixelComponent(p); break;
-                    case 3: quantum=(Quantum) (QuantumRange-GetOpacityPixelComponent(p)); break;
+                    case 0: quantum=GetPixelRed(p); break;
+                    case 1: quantum=GetPixelGreen(p); break;
+                    case 2: quantum=GetPixelBlue(p); break;
+                    case 3: quantum=(Quantum) (QuantumRange-GetPixelOpacity(p)); break;
                   }
                   switch (n % 3)
                   {
@@ -1060,17 +1057,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
-                  GetOpacityPixelComponent(p)),range);
+                  GetPixelOpacity(p)),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 p++;
@@ -1080,14 +1077,14 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)),range);
+              GetPixelOpacity(p)),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1103,17 +1100,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetAlphaPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1122,13 +1115,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort((Quantum) GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToShort((Quantum) GetPixelAlpha(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1147,10 +1140,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 float
                   pixel;
 
-                q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
-                pixel=(float) GetAlphaPixelComponent(p);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
+                pixel=(float) GetPixelAlpha(p);
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1159,13 +1152,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong((Quantum) GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToLong((Quantum) GetPixelAlpha(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1181,10 +1174,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
-                pixel=(double) GetAlphaPixelComponent(p);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
+                pixel=(double) GetPixelAlpha(p);
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1198,13 +1191,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny((Quantum) GetAlphaPixelComponent(p),range),q);
+              ScaleQuantumToAny((Quantum) GetPixelAlpha(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -1481,19 +1474,19 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           {
             *q='\0';
             *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 7;
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+            pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
             *q|=(((int) pixel != 0 ? 0x00 : 0x01) << 6);
             p++;
             *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 5;
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+            pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
             *q|=(((int) pixel != 0 ? 0x00 : 0x01) << 4);
             p++;
             *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 3;
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+            pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
             *q|=(((int) pixel != 0 ? 0x00 : 0x01) << 2);
             p++;
             *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 1;
-            pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+            pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
             *q|=(((int) pixel != 0 ? 0x00 : 0x01) << 0);
             p++;
             q++;
@@ -1505,7 +1498,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               {
                 *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) <<
                   (7-bit);
-                pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 :
+                pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 :
                   0x01);
                 *q|=(((int) pixel != 0 ? 0x00 : 0x01) << (unsigned char)
                   (7-bit-1));
@@ -1525,7 +1518,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
             *q=(((pixel >> 4) & 0xf) << 4);
             pixel=(unsigned char) (16*QuantumScale*((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)))+0.5);
+              GetPixelOpacity(p)))+0.5);
             *q|=pixel & 0xf;
             p++;
             q++;
@@ -1542,7 +1535,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
             q=PopCharPixel(pixel,q);
             pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1562,7 +1555,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   PixelIntensityToQuantum(p));
                 q=PopShortPixel(endian,pixel,q);
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetAlphaPixelComponent(p));
+                  GetPixelAlpha(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1574,7 +1567,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             pixel=ScaleQuantumToShort(PixelIntensityToQuantum(p));
             q=PopShortPixel(endian,pixel,q);
             pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1595,7 +1588,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
                 pixel=(float) PixelIntensityToQuantum(p);
                 q=PopFloatPixel(&quantum_state,pixel,q);
-                pixel=(float) (GetAlphaPixelComponent(p));
+                pixel=(float) (GetPixelAlpha(p));
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1607,7 +1600,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             pixel=ScaleQuantumToLong(PixelIntensityToQuantum(p));
             q=PopLongPixel(endian,pixel,q);
             pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1625,7 +1618,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
                 pixel=(double) PixelIntensityToQuantum(p);
                 q=PopDoublePixel(&quantum_state,pixel,q);
-                pixel=(double) (GetAlphaPixelComponent(p));
+                pixel=(double) (GetPixelAlpha(p));
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1641,7 +1634,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
               ScaleQuantumToAny(PixelIntensityToQuantum(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range),q);
+              ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -1662,7 +1655,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelRed(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1678,8 +1671,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1688,7 +1680,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1704,7 +1696,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -1712,7 +1704,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1725,7 +1717,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -1738,7 +1730,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -1759,7 +1751,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelGreen(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1776,7 +1768,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                  GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1785,7 +1777,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1801,7 +1793,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -1809,7 +1801,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1822,7 +1814,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -1835,7 +1827,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -1856,7 +1848,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelBlue(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1873,7 +1865,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                  GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1882,7 +1874,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1898,7 +1890,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -1906,7 +1898,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1919,7 +1911,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -1932,7 +1924,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -1953,7 +1945,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1970,7 +1962,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetAlphaPixelComponent(p));
+                  GetPixelAlpha(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -1980,7 +1972,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -1999,7 +1991,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 float
                   pixel;
 
-                pixel=(float) (GetAlphaPixelComponent(p));
+                pixel=(float) (GetPixelAlpha(p));
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2009,7 +2001,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2025,7 +2017,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 double
                   pixel;
 
-                pixel=(double) (GetAlphaPixelComponent(p));
+                pixel=(double) (GetPixelAlpha(p));
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2039,7 +2031,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range),q);
+              ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -2059,7 +2051,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelOpacity(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2076,7 +2068,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetOpacityPixelComponent(p));
+                  GetPixelOpacity(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2085,7 +2077,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetOpacityPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelOpacity(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2101,7 +2093,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetOpacityPixelComponent(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelOpacity(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -2109,7 +2101,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetOpacityPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelOpacity(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2122,7 +2114,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetOpacityPixelComponent(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelOpacity(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -2135,7 +2127,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetOpacityPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelOpacity(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -2161,7 +2153,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2177,7 +2169,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*GetIndexPixelComponent(
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelIndex(
                   indexes+x));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
@@ -2187,7 +2179,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2203,7 +2195,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetIndexPixelComponent(
+                q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
                   indexes+x),q);
                 p++;
                 q+=quantum_info->pad;
@@ -2212,7 +2204,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2225,7 +2217,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetIndexPixelComponent(
+                q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
                   indexes+x),q);
                 p++;
                 q+=quantum_info->pad;
@@ -2239,7 +2231,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny((Quantum) GetIndexPixelComponent(indexes+x),
+              ScaleQuantumToAny((Quantum) GetPixelIndex(indexes+x),
               range),q);
             p++;
             q+=quantum_info->pad;
@@ -2258,9 +2250,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         {
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopCharPixel(ScaleQuantumToChar(GetRedPixelComponent(p)),q);
-            q=PopCharPixel(ScaleQuantumToChar(GetGreenPixelComponent(p)),q);
-            q=PopCharPixel(ScaleQuantumToChar(GetBluePixelComponent(p)),q);
+            q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(p)),q);
+            q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(p)),q);
+            q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(p)),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -2276,9 +2268,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) (ScaleQuantumToAny(GetRedPixelComponent(p),range) << 22 |
-                  ScaleQuantumToAny(GetGreenPixelComponent(p),range) << 12 |
-                  ScaleQuantumToAny(GetBluePixelComponent(p),range) << 2);
+                pixel=(unsigned int) (ScaleQuantumToAny(GetPixelRed(p),range) << 22 |
+                  ScaleQuantumToAny(GetPixelGreen(p),range) << 12 |
+                  ScaleQuantumToAny(GetPixelBlue(p),range) << 2);
                 q=PopLongPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2289,13 +2281,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 p++;
@@ -2305,11 +2297,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2331,17 +2323,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   default:
                   case 0:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                     break;
                   }
                   case 1:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                     break;
                   }
                   case 2:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                     p++;
                     break;
                   }
@@ -2352,17 +2344,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   default:
                   case 0:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                     break;
                   }
                   case 1:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                     break;
                   }
                   case 2:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                     p++;
                     break;
                   }
@@ -2377,17 +2369,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   default:
                   case 0:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                     break;
                   }
                   case 1:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                     break;
                   }
                   case 2:
                   {
-                    pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                    pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                     p++;
                     break;
                   }
@@ -2403,13 +2395,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 p++;
@@ -2419,11 +2411,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2439,14 +2431,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2455,11 +2444,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2475,9 +2464,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -2485,11 +2474,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2502,9 +2491,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -2517,11 +2506,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -2543,13 +2532,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelRed(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelGreen(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelBlue(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar((Quantum) GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToChar((Quantum) GetPixelAlpha(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2582,10 +2571,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 {
                   switch (i)
                   {
-                    case 0: quantum=GetRedPixelComponent(p); break;
-                    case 1: quantum=GetGreenPixelComponent(p); break;
-                    case 2: quantum=GetBluePixelComponent(p); break;
-                    case 3: quantum=(Quantum) (QuantumRange-GetOpacityPixelComponent(p)); break;
+                    case 0: quantum=GetPixelRed(p); break;
+                    case 1: quantum=GetPixelGreen(p); break;
+                    case 2: quantum=GetPixelBlue(p); break;
+                    case 3: quantum=(Quantum) (QuantumRange-GetPixelOpacity(p)); break;
                   }
                   switch (n % 3)
                   {
@@ -2621,17 +2610,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
-                pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+                pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
-                  GetOpacityPixelComponent(p)),range);
+                  GetPixelOpacity(p)),range);
                 q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
                   q);
                 p++;
@@ -2641,14 +2630,14 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
-            pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+            pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)),range);
+              GetPixelOpacity(p)),range);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2664,17 +2653,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetAlphaPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2683,13 +2668,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort((Quantum) GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToShort((Quantum) GetPixelAlpha(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2708,10 +2693,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 float
                   pixel;
 
-                q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
-                pixel=(float) GetAlphaPixelComponent(p);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
+                pixel=(float) GetPixelAlpha(p);
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2720,13 +2705,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong((Quantum) GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToLong((Quantum) GetPixelAlpha(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2742,10 +2727,10 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
-                pixel=(double) GetAlphaPixelComponent(p);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
+                pixel=(double) GetPixelAlpha(p);
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2759,13 +2744,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny((Quantum) GetAlphaPixelComponent(p),range),q);
+              ScaleQuantumToAny((Quantum) GetPixelAlpha(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -2791,13 +2776,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelRed(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelGreen(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelBlue(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2813,16 +2798,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*GetIndexPixelComponent(
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelIndex(
                   indexes+x));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
@@ -2832,13 +2814,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2854,14 +2836,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
                 q=PopFloatPixel(&quantum_state,(float)
-                  GetRedPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float)
-                  GetGreenPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float)
-                  GetBluePixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float)
-                  GetIndexPixelComponent(indexes+x),q);
+                  GetPixelIndex(indexes+x),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -2869,13 +2848,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2888,14 +2867,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
                 q=PopDoublePixel(&quantum_state,(double)
-                  GetRedPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double)
-                  GetGreenPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double)
-                  GetBluePixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double)
-                  GetIndexPixelComponent(indexes+x),q);
+                  GetPixelIndex(indexes+x),q);
                 p++;
                 q+=quantum_info->pad;
               }
@@ -2908,13 +2884,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetIndexPixelComponent(indexes+x),range),q);
+              ScaleQuantumToAny(GetPixelIndex(indexes+x),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -2941,16 +2917,16 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelRed(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelGreen(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToChar(GetPixelBlue(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
             q=PopCharPixel(pixel,q);
             pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2966,20 +2942,16 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             {
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetRedPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetGreenPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetBluePixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
                 q=PopShortPixel(endian,pixel,q);
                 pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetIndexPixelComponent(indexes+x));
+                  GetPixelIndex(indexes+x));
                 q=PopShortPixel(endian,pixel,q);
-                pixel=SinglePrecisionToHalf(QuantumScale*
-                  GetAlphaPixelComponent(p));
+                pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
                 q=PopShortPixel(endian,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2988,16 +2960,16 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelRed(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelGreen(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToShort(GetPixelBlue(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
             q=PopShortPixel(endian,pixel,q);
             pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -3016,15 +2988,12 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 float
                   pixel;
 
+                q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+                q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
                 q=PopFloatPixel(&quantum_state,(float)
-                  GetRedPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float)
-                  GetGreenPixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float)
-                  GetBluePixelComponent(p),q);
-                q=PopFloatPixel(&quantum_state,(float)
-                  GetIndexPixelComponent(indexes+x),q);
-                pixel=(float) (GetAlphaPixelComponent(p));
+                  GetPixelIndex(indexes+x),q);
+                pixel=(float) (GetPixelAlpha(p));
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -3033,16 +3002,16 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             }
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelRed(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelGreen(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+            pixel=ScaleQuantumToLong(GetPixelBlue(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+            pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
             q=PopLongPixel(endian,pixel,q);
             pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -3058,15 +3027,12 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
 
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
+                q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+                q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
                 q=PopDoublePixel(&quantum_state,(double)
-                  GetRedPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double)
-                  GetGreenPixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double)
-                  GetBluePixelComponent(p),q);
-                q=PopDoublePixel(&quantum_state,(double)
-                  GetIndexPixelComponent(indexes+x),q);
-                pixel=(double) (GetAlphaPixelComponent(p));
+                  GetPixelIndex(indexes+x),q);
+                pixel=(double) (GetPixelAlpha(p));
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -3080,15 +3046,15 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelRed(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelGreen(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelBlue(p),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetIndexPixelComponent(indexes+x),range),q);
+              ScaleQuantumToAny(GetPixelIndex(indexes+x),range),q);
             q=PopQuantumPixel(&quantum_state,quantum_info->depth,
-              ScaleQuantumToAny(GetOpacityPixelComponent(p),range),q);
+              ScaleQuantumToAny(GetPixelOpacity(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
@@ -3131,17 +3097,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                   {
                     case 0:
                     {
-                      quantum=GetRedPixelComponent(p);
+                      quantum=GetPixelRed(p);
                       break;
                     }
                     case 1:
                     {
-                      quantum=GetGreenPixelComponent(p);
+                      quantum=GetPixelGreen(p);
                       break;
                     }
                     case 2:
                     {
-                      quantum=GetBluePixelComponent(p);
+                      quantum=GetPixelBlue(p);
                       break;
                     }
                   }
@@ -3174,17 +3140,17 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
               {
                 case 0:
                 {
-                  quantum=GetRedPixelComponent(p);
+                  quantum=GetPixelRed(p);
                   break;
                 }
                 case 1:
                 {
-                  quantum=GetGreenPixelComponent(p);
+                  quantum=GetPixelGreen(p);
                   break;
                 }
                 case 2:
                 {
-                  quantum=GetBluePixelComponent(p);
+                  quantum=GetPixelBlue(p);
                   break;
                 }
               }
@@ -3228,9 +3194,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        quantum=GetRedPixelComponent(q);
-        SetRedPixelComponent(q,GetGreenPixelComponent(q));
-        SetGreenPixelComponent(q,quantum);
+        quantum=GetPixelRed(q);
+        SetPixelRed(q,GetPixelGreen(q));
+        SetPixelGreen(q,quantum);
         q++;
       }
     }
@@ -3245,7 +3211,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        q->opacity=(Quantum) GetAlphaPixelComponent(q);
+        SetPixelOpacity(q,(Quantum) GetPixelAlpha(q));
         q++;
       }
     }
index 80602b0047976bf28e311b284a3c10289ba71b2a..cd80cb33287a9fd0fd7779e64861dc02d8b116d3 100644 (file)
@@ -344,10 +344,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               else
                 pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
                   0x00 : 0x01);
-              SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,
+              SetPixelIndex(indexes+x+bit,PushColormapIndex(image,
                 pixel,&range_exception));
-              SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                GetIndexPixelComponent(indexes+x+bit));
+              SetPixelRGBO(q,image->colormap+(ssize_t)
+                GetPixelIndex(indexes+x+bit));
               q++;
             }
             p++;
@@ -360,10 +360,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             else
               pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
                 0x00 : 0x01);
-            SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x+bit,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x+bit));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x+bit));
             q++;
           }
           break;
@@ -376,26 +376,26 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
           {
             pixel=(unsigned char) ((*p >> 4) & 0xf);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             q++;
             pixel=(unsigned char) ((*p) & 0xf);
-            SetIndexPixelComponent(indexes+x+1,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x+1,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x+1));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x+1));
             p++;
             q++;
           }
           for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
           {
             pixel=(unsigned char) ((*p++ >> 4) & 0xf);
-            SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x+bit,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x+bit));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x+bit));
             q++;
           }
           break;
@@ -408,10 +408,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p+=quantum_info->pad;
             q++;
           }
@@ -427,11 +427,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+                SetPixelIndex(indexes+x,PushColormapIndex(image,
                   ClampToQuantum((MagickRealType) QuantumRange*
                   HalfToSinglePrecision(pixel)),&range_exception));
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                  GetIndexPixelComponent(indexes+x));
+                SetPixelRGBO(q,image->colormap+(ssize_t)
+                  GetPixelIndex(indexes+x));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -440,10 +440,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p+=quantum_info->pad;
             q++;
           }
@@ -462,10 +462,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+                SetPixelIndex(indexes+x,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception));
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                  GetIndexPixelComponent(indexes+x));
+                SetPixelRGBO(q,image->colormap+(ssize_t)
+                  GetPixelIndex(indexes+x));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -474,10 +474,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p+=quantum_info->pad;
             q++;
           }
@@ -493,10 +493,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+                SetPixelIndex(indexes+x,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception));
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                  GetIndexPixelComponent(indexes+x));
+                SetPixelRGBO(q,image->colormap+(ssize_t)
+                  GetPixelIndex(indexes+x));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -508,10 +508,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p+=quantum_info->pad;
             q++;
           }
@@ -552,11 +552,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               else
                 pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
                   0x00 : 0x01);
-              SetIndexPixelComponent(indexes+x+bit/2,pixel == 0 ? 0 : 1);
-              SetRedPixelComponent(q,pixel == 0 ? 0 : QuantumRange);
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
-              SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+              SetPixelIndex(indexes+x+bit/2,pixel == 0 ? 0 : 1);
+              SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
+              SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
                 (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
               q++;
             }
@@ -569,11 +569,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             else
               pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
                 0x00 : 0x01);
-            SetIndexPixelComponent(indexes+x+bit/2,pixel == 0 ? 0 : 1);
-            SetRedPixelComponent(q,pixel == 0 ? 0 : QuantumRange);
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
-            SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+            SetPixelIndex(indexes+x+bit/2,pixel == 0 ? 0 : 1);
+            SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
+            SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
               (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
             q++;
           }
@@ -588,12 +588,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             pixel=(unsigned char) ((*p >> 4) & 0xf);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             pixel=(unsigned char) ((*p) & 0xf);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             p++;
             q++;
           }
@@ -607,12 +607,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p=PushCharPixel(p,&pixel);
-            SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelAlpha(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -628,13 +628,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+                SetPixelIndex(indexes+x,PushColormapIndex(image,
                   ClampToQuantum((MagickRealType) QuantumRange*
                   HalfToSinglePrecision(pixel)),&range_exception));
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                  GetIndexPixelComponent(indexes+x));
+                SetPixelRGBO(q,image->colormap+(ssize_t)
+                  GetPixelIndex(indexes+x));
                 p=PushShortPixel(endian,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -644,12 +644,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p=PushShortPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelAlpha(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -668,12 +668,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+                SetPixelIndex(indexes+x,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception));
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                  GetIndexPixelComponent(indexes+x));
+                SetPixelRGBO(q,image->colormap+(ssize_t)
+                  GetPixelIndex(indexes+x));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -682,12 +682,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p=PushLongPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelAlpha(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -703,12 +703,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+                SetPixelIndex(indexes+x,PushColormapIndex(image,
                   ClampToQuantum(pixel),&range_exception));
-                SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-                  GetIndexPixelComponent(indexes+x));
+                SetPixelRGBO(q,image->colormap+(ssize_t)
+                  GetPixelIndex(indexes+x));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -721,12 +721,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+            SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
               &range_exception));
-            SetRGBOPixelComponents(q,image->colormap+(ssize_t)
-              GetIndexPixelComponent(indexes+x));
+            SetPixelRGBO(q,image->colormap+(ssize_t)
+              GetPixelIndex(indexes+x));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -750,12 +750,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
+            SetPixelOpacity(q,OpaqueOpacity);
             p+=quantum_info->pad;
             q++;
           }
@@ -769,11 +769,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushLongPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+                SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
                   range));
-                SetGreenPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+                SetPixelGreen(q,ScaleAnyToQuantum((pixel >> 12) &
                   0x3ff,range));
-                SetBluePixelComponent(q,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+                SetPixelBlue(q,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
                   range));
                 p+=quantum_info->pad;
                 q++;
@@ -785,11 +785,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                 q++;
               }
               break;
@@ -797,11 +797,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -822,19 +822,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   default:
                   case 0:
                   {
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 1:
                   {
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 2:
                   {
-                    SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     q++;
                     break;
@@ -846,19 +846,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   default:
                   case 0:
                   {
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 1:
                   {
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 2:
                   {
-                    SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     q++;
                     break;
@@ -874,19 +874,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   default:
                   case 0:
                   {
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 1:
                   {
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 2:
                   {
-                    SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     q++;
                     break;
@@ -903,11 +903,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                 q++;
               }
               break;
@@ -915,11 +915,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -934,13 +934,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -950,11 +950,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -973,11 +973,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -986,11 +986,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1006,11 +1006,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1023,11 +1023,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -1048,13 +1048,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelAlpha(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1104,10 +1104,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   }
                   switch (i)
                   {
-                    case 0: SetRedPixelComponent(q,quantum); break;
-                    case 1: SetGreenPixelComponent(q,quantum); break;
-                    case 2: SetBluePixelComponent(q,quantum); break;
-                    case 3: SetAlphaPixelComponent(q,quantum); break;
+                    case 0: SetPixelRed(q,quantum); break;
+                    case 1: SetPixelGreen(q,quantum); break;
+                    case 2: SetPixelBlue(q,quantum); break;
+                    case 3: SetPixelAlpha(q,quantum); break;
                   }
                   n++;
                 }
@@ -1119,16 +1119,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelRed(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             q++;
           }
@@ -1144,16 +1144,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -1163,13 +1163,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelAlpha(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1188,13 +1188,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1203,13 +1203,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelAlpha(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1225,13 +1225,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1244,13 +1244,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -1279,20 +1279,20 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           {
             for (bit=0; bit < 8; bit++)
             {
-              SetRedPixelComponent(q,((*p) & (1 << (7-bit))) == 0 ?
+              SetPixelRed(q,((*p) & (1 << (7-bit))) == 0 ?
                 black : white);
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
               q++;
             }
             p++;
           }
           for (bit=0; bit < (ssize_t) (number_pixels % 8); bit++)
           {
-            SetRedPixelComponent(q,((*p) & (0x01 << (7-bit))) == 0 ?
+            SetPixelRed(q,((*p) & (0x01 << (7-bit))) == 0 ?
               black : white);
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             q++;
           }
           if (bit != 0)
@@ -1308,23 +1308,23 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
           {
             pixel=(unsigned char) ((*p >> 4) & 0xf);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             q++;
             pixel=(unsigned char) ((*p) & 0xf);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p++;
             q++;
           }
           for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
           {
             pixel=(unsigned char) (*p++ >> 4);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             q++;
           }
           break;
@@ -1339,10 +1339,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushCharPixel(p,&pixel);
-                SetRedPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
-                SetOpacityPixelComponent(q,OpaqueOpacity);
+                SetPixelRed(q,QuantumRange-ScaleCharToQuantum(pixel));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
+                SetPixelOpacity(q,OpaqueOpacity);
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1351,10 +1351,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
+            SetPixelOpacity(q,OpaqueOpacity);
             p+=quantum_info->pad;
             q++;
           }
@@ -1370,38 +1370,38 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
                   {
                     p=PushLongPixel(endian,p,&pixel);
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+                    SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
                       0x3ff,range));
-                    SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                    SetBluePixelComponent(q,GetRedPixelComponent(q));
+                    SetPixelGreen(q,GetPixelRed(q));
+                    SetPixelBlue(q,GetPixelRed(q));
                     q++;
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+                    SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
                       0x3ff,range));
-                    SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                    SetBluePixelComponent(q,GetRedPixelComponent(q));
+                    SetPixelGreen(q,GetPixelRed(q));
+                    SetPixelBlue(q,GetPixelRed(q));
                     q++;
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+                    SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
                       0x3ff,range));
-                    SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                    SetBluePixelComponent(q,GetRedPixelComponent(q));
+                    SetPixelGreen(q,GetPixelRed(q));
+                    SetPixelBlue(q,GetPixelRed(q));
                     p+=quantum_info->pad;
                     q++;
                   }
                   p=PushLongPixel(endian,p,&pixel);
                   if (x++ < (ssize_t) (number_pixels-1))
                     {
-                      SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+                      SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
                         0x3ff,range));
-                      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                      SetBluePixelComponent(q,GetRedPixelComponent(q));
+                      SetPixelGreen(q,GetPixelRed(q));
+                      SetPixelBlue(q,GetPixelRed(q));
                       q++;
                     }
                   if (x++ < (ssize_t) number_pixels)
                     {
-                      SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+                      SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
                         0x3ff,range));
-                      SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                      SetBluePixelComponent(q,GetRedPixelComponent(q));
+                      SetPixelGreen(q,GetPixelRed(q));
+                      SetPixelBlue(q,GetPixelRed(q));
                       q++;
                     }
                   break;
@@ -1409,38 +1409,38 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
               {
                 p=PushLongPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+                SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
                   0x3ff,range));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 q++;
-                SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+                SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
                   0x3ff,range));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 q++;
-                SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+                SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
                   0x3ff,range));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
               p=PushLongPixel(endian,p,&pixel);
               if (x++ < (ssize_t) (number_pixels-1))
                 {
-                  SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+                  SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
                     0x3ff,range));
-                  SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                  SetBluePixelComponent(q,GetRedPixelComponent(q));
+                  SetPixelGreen(q,GetPixelRed(q));
+                  SetPixelBlue(q,GetPixelRed(q));
                   q++;
                 }
               if (x++ < (ssize_t) number_pixels)
                 {
-                  SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+                  SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
                     0x3ff,range));
-                  SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                  SetBluePixelComponent(q,GetRedPixelComponent(q));
+                  SetPixelGreen(q,GetPixelRed(q));
+                  SetPixelBlue(q,GetPixelRed(q));
                   q++;
                 }
               break;
@@ -1448,9 +1448,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p+=quantum_info->pad;
             q++;
           }
@@ -1467,26 +1467,26 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) (number_pixels-1); x+=2)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                   (pixel >> 4),range));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 q++;
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                   (pixel >> 4),range));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
               for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                   (pixel >> 4),range));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1497,9 +1497,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p+=quantum_info->pad;
             q++;
           }
@@ -1515,9 +1515,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,QuantumRange-ScaleShortToQuantum(pixel));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1528,10 +1528,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1540,9 +1540,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p+=quantum_info->pad;
             q++;
           }
@@ -1561,9 +1561,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1572,9 +1572,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p+=quantum_info->pad;
             q++;
           }
@@ -1590,9 +1590,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1605,9 +1605,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p+=quantum_info->pad;
             q++;
           }
@@ -1631,10 +1631,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
             {
               pixel=(unsigned char)
                 (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
-              SetRedPixelComponent(q,pixel == 0 ? 0 : QuantumRange);
-              SetGreenPixelComponent(q,GetRedPixelComponent(q));
-              SetBluePixelComponent(q,GetRedPixelComponent(q));
-              SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+              SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
+              SetPixelGreen(q,GetPixelRed(q));
+              SetPixelBlue(q,GetPixelRed(q));
+              SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
                 (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
               q++;
             }
@@ -1643,10 +1643,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (bit=0; bit <= (ssize_t) (number_pixels % 4); bit+=2)
           {
             pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
-            SetRedPixelComponent(q,pixel != 0 ? 0 : QuantumRange);
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
-            SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+            SetPixelRed(q,pixel != 0 ? 0 : QuantumRange);
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
+            SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
               (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
             q++;
           }
@@ -1663,11 +1663,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             pixel=(unsigned char) ((*p >> 4) & 0xf);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             pixel=(unsigned char) ((*p) & 0xf);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             p++;
             q++;
           }
@@ -1681,11 +1681,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p=PushCharPixel(p,&pixel);
-            SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelAlpha(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1697,11 +1697,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelOpacity(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -1713,11 +1713,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelOpacity(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -1733,12 +1733,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p=PushShortPixel(endian,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -1748,11 +1748,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p=PushShortPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelAlpha(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1771,11 +1771,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1784,11 +1784,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p=PushLongPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelAlpha(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1804,11 +1804,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
-                SetGreenPixelComponent(q,GetRedPixelComponent(q));
-                SetBluePixelComponent(q,GetRedPixelComponent(q));
+                SetPixelRed(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,GetPixelRed(q));
+                SetPixelBlue(q,GetPixelRed(q));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1821,11 +1821,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
-            SetGreenPixelComponent(q,GetRedPixelComponent(q));
-            SetBluePixelComponent(q,GetRedPixelComponent(q));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,GetPixelRed(q));
+            SetPixelBlue(q,GetPixelRed(q));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -1847,7 +1847,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1863,7 +1863,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -1873,7 +1873,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1892,7 +1892,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1901,7 +1901,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1917,7 +1917,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -1930,7 +1930,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -1952,7 +1952,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1968,7 +1968,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -1978,7 +1978,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -1997,7 +1997,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2006,7 +2006,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2022,7 +2022,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2035,7 +2035,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -2057,7 +2057,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2073,7 +2073,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -2083,7 +2083,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2102,7 +2102,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2111,7 +2111,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2127,7 +2127,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2140,7 +2140,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -2161,7 +2161,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelAlpha(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2177,7 +2177,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -2187,7 +2187,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelAlpha(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2206,7 +2206,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2215,7 +2215,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelAlpha(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2231,7 +2231,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2244,7 +2244,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -2271,7 +2271,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
           }
           break;
@@ -2286,7 +2286,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum((MagickRealType)
+                SetPixelIndex(indexes+x,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
               }
@@ -2295,7 +2295,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
           }
           break;
@@ -2313,7 +2313,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+                SetPixelIndex(indexes+x,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2322,7 +2322,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2338,7 +2338,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+                SetPixelIndex(indexes+x,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2351,7 +2351,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range));
+            SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
             p+=quantum_info->pad;
             q++;
           }
@@ -2373,12 +2373,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
-            SetOpacityPixelComponent(q,OpaqueOpacity);
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
+            SetPixelOpacity(q,OpaqueOpacity);
             p+=quantum_info->pad;
             q++;
           }
@@ -2392,11 +2392,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushLongPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+                SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
                   0x3ff,range));
-                SetGreenPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+                SetPixelGreen(q,ScaleAnyToQuantum((pixel >> 12) &
                   0x3ff,range));
-                SetBluePixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+                SetPixelBlue(q,ScaleAnyToQuantum((pixel >> 2) &
                   0x3ff,range));
                 p+=quantum_info->pad;
                 q++;
@@ -2408,11 +2408,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
                 q++;
               }
               break;
@@ -2420,11 +2420,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -2445,19 +2445,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   default:
                   case 0:
                   {
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 1:
                   {
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 2:
                   {
-                    SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     q++;
                     break;
@@ -2469,19 +2469,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   default:
                   case 0:
                   {
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 1:
                   {
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 2:
                   {
-                    SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     q++;
                     break;
@@ -2497,19 +2497,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   default:
                   case 0:
                   {
-                    SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 1:
                   {
-                    SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     break;
                   }
                   case 2:
                   {
-                    SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+                    SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
                       (pixel >> 4),range));
                     q++;
                     break;
@@ -2526,11 +2526,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
                 p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
-                SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+                SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
                 q++;
               }
               break;
@@ -2538,11 +2538,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -2557,13 +2557,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -2573,11 +2573,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2596,11 +2596,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2609,11 +2609,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2629,11 +2629,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2646,11 +2646,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -2672,13 +2672,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelAlpha(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2728,10 +2728,10 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   }
                   switch (i)
                   {
-                    case 0: SetRedPixelComponent(q,quantum); break;
-                    case 1: SetGreenPixelComponent(q,quantum); break;
-                    case 2: SetBluePixelComponent(q,quantum); break;
-                    case 3: SetAlphaPixelComponent(q,quantum); break;
+                    case 0: SetPixelRed(q,quantum); break;
+                    case 1: SetPixelGreen(q,quantum); break;
+                    case 2: SetPixelBlue(q,quantum); break;
+                    case 3: SetPixelAlpha(q,quantum); break;
                   }
                   n++;
                 }
@@ -2743,16 +2743,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelRed(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+            SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
               (pixel << 6)));
             q++;
           }
@@ -2768,16 +2768,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -2787,13 +2787,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelAlpha(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2812,13 +2812,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2827,13 +2827,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelAlpha(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2849,13 +2849,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2868,13 +2868,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -2900,13 +2900,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2922,16 +2922,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(
+                SetPixelIndex(indexes+x,ClampToQuantum(
                   (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -2941,13 +2941,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -2966,13 +2966,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+                SetPixelIndex(indexes+x,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -2981,13 +2981,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -3003,13 +3003,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+                SetPixelIndex(indexes+x,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -3022,13 +3022,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range));
+            SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -3055,15 +3055,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushCharPixel(p,&pixel);
-            SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelRed(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelGreen(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelBlue(q,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
             p=PushCharPixel(p,&pixel);
-            SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+            SetPixelAlpha(q,ScaleCharToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -3079,19 +3079,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushShortPixel(endian,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelRed(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelGreen(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelBlue(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(
+                SetPixelIndex(indexes+x,ClampToQuantum(
                   (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)));
                 p=PushShortPixel(endian,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+                SetPixelAlpha(q,ClampToQuantum((MagickRealType)
                   QuantumRange*HalfToSinglePrecision(pixel)));
                 p+=quantum_info->pad;
                 q++;
@@ -3101,15 +3101,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelRed(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelGreen(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelBlue(q,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
             p=PushShortPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+            SetPixelAlpha(q,ScaleShortToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -3128,15 +3128,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+                SetPixelIndex(indexes+x,ClampToQuantum(pixel));
                 p=PushFloatPixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p+=quantum_info->pad;
                 q++;
               }
@@ -3145,15 +3145,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(endian,p,&pixel);
-            SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelRed(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelGreen(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelBlue(q,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel));
+            SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
             p=PushLongPixel(endian,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+            SetPixelAlpha(q,ScaleLongToQuantum(pixel));
             p+=quantum_info->pad;
             q++;
           }
@@ -3169,15 +3169,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
               for (x=0; x < (ssize_t) number_pixels; x++)
               {
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetRedPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelRed(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetGreenPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelGreen(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetBluePixelComponent(q,ClampToQuantum(pixel));
+                SetPixelBlue(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+                SetPixelIndex(indexes+x,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
-                SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+                SetPixelAlpha(q,ClampToQuantum(pixel));
                 p=PushDoublePixel(&quantum_state,p,&pixel);
                 p+=quantum_info->pad;
                 q++;
@@ -3191,15 +3191,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range));
+            SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -3260,13 +3260,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
                   n++;
                 }
                 p+=quantum_info->pad;
-                SetRedPixelComponent(q,cbcr[1]);
-                SetGreenPixelComponent(q,cbcr[0]);
-                SetBluePixelComponent(q,cbcr[2]);
+                SetPixelRed(q,cbcr[1]);
+                SetPixelGreen(q,cbcr[0]);
+                SetPixelBlue(q,cbcr[2]);
                 q++;
-                SetRedPixelComponent(q,cbcr[3]);
-                SetGreenPixelComponent(q,cbcr[0]);
-                SetBluePixelComponent(q,cbcr[2]);
+                SetPixelRed(q,cbcr[3]);
+                SetPixelGreen(q,cbcr[0]);
+                SetPixelBlue(q,cbcr[2]);
                 q++;
               }
               break;
@@ -3278,9 +3278,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
             p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
-            SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+            SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
             q++;
           }
           break;
@@ -3304,9 +3304,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
         q=GetCacheViewAuthenticPixelQueue(image_view);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        quantum=GetRedPixelComponent(q);
-        SetRedPixelComponent(q,GetGreenPixelComponent(q));
-        SetGreenPixelComponent(q,quantum);
+        quantum=GetPixelRed(q);
+        SetPixelRed(q,GetPixelGreen(q));
+        SetPixelGreen(q,quantum);
         q++;
       }
     }
@@ -3320,7 +3320,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
         q=GetCacheViewAuthenticPixelQueue(image_view);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        SetOpacityPixelComponent(q,GetAlphaPixelComponent(q));
+        SetPixelOpacity(q,GetPixelAlpha(q));
         q++;
       }
     }
@@ -3340,14 +3340,14 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
         q=GetCacheViewAuthenticPixelQueue(image_view);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        alpha=QuantumScale*GetAlphaPixelComponent(q);
+        alpha=QuantumScale*GetPixelAlpha(q);
         alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
-        SetRedPixelComponent(q,ClampToQuantum(alpha*
-          GetRedPixelComponent(q)));
-        SetGreenPixelComponent(q,ClampToQuantum(alpha*
-          GetGreenPixelComponent(q)));
-        SetBluePixelComponent(q,ClampToQuantum(alpha*
-          GetBluePixelComponent(q)));
+        SetPixelRed(q,ClampToQuantum(alpha*
+          GetPixelRed(q)));
+        SetPixelGreen(q,ClampToQuantum(alpha*
+          GetPixelGreen(q)));
+        SetPixelBlue(q,ClampToQuantum(alpha*
+          GetPixelBlue(q)));
         q++;
       }
     }
index d969a169c4198dfc64f99c73198f4cc042f21f9a..0ca9fcb995fcf7797a8ac3a168e04978594e0e3c 100644 (file)
@@ -2178,15 +2178,15 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
             j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
               (contribution[i].pixel-contribution[0].pixel);
             alpha=contribution[i].weight;
-            pixel.red+=alpha*GetRedPixelComponent(p+j);
-            pixel.green+=alpha*GetGreenPixelComponent(p+j);
-            pixel.blue+=alpha*GetBluePixelComponent(p+j);
-            pixel.opacity+=alpha*GetOpacityPixelComponent(p+j);
+            pixel.red+=alpha*GetPixelRed(p+j);
+            pixel.green+=alpha*GetPixelGreen(p+j);
+            pixel.blue+=alpha*GetPixelBlue(p+j);
+            pixel.opacity+=alpha*GetPixelOpacity(p+j);
           }
-          SetRedPixelComponent(q,ClampToQuantum(pixel.red));
-          SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
-          SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
-          SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+          SetPixelRed(q,ClampToQuantum(pixel.red));
+          SetPixelGreen(q,ClampToQuantum(pixel.green));
+          SetPixelBlue(q,ClampToQuantum(pixel.blue));
+          SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
           if ((image->colorspace == CMYKColorspace) &&
               (resize_image->colorspace == CMYKColorspace))
             {
@@ -2195,9 +2195,9 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
                 j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
                   (contribution[i].pixel-contribution[0].pixel);
                 alpha=contribution[i].weight;
-                pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+                pixel.index+=alpha*GetPixelIndex(indexes+j);
               }
-              SetIndexPixelComponent(resize_indexes+y,ClampToQuantum(
+              SetPixelIndex(resize_indexes+y,ClampToQuantum(
                 pixel.index));
             }
         }
@@ -2212,18 +2212,18 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
             j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
               (contribution[i].pixel-contribution[0].pixel);
             alpha=contribution[i].weight*QuantumScale*
-              GetAlphaPixelComponent(p+j);
-            pixel.red+=alpha*GetRedPixelComponent(p+j);
-            pixel.green+=alpha*GetGreenPixelComponent(p+j);
-            pixel.blue+=alpha*GetBluePixelComponent(p+j);
-            pixel.opacity+=contribution[i].weight*GetOpacityPixelComponent(p+j);
+              GetPixelAlpha(p+j);
+            pixel.red+=alpha*GetPixelRed(p+j);
+            pixel.green+=alpha*GetPixelGreen(p+j);
+            pixel.blue+=alpha*GetPixelBlue(p+j);
+            pixel.opacity+=contribution[i].weight*GetPixelOpacity(p+j);
             gamma+=alpha;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
-          SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
-          SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
-          SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
-          SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+          SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+          SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+          SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
+          SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
           if ((image->colorspace == CMYKColorspace) &&
               (resize_image->colorspace == CMYKColorspace))
             {
@@ -2232,10 +2232,10 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
                 j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
                   (contribution[i].pixel-contribution[0].pixel);
                 alpha=contribution[i].weight*QuantumScale*
-                  GetAlphaPixelComponent(p+j);
-                pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+                  GetPixelAlpha(p+j);
+                pixel.index+=alpha*GetPixelIndex(indexes+j);
               }
-              SetIndexPixelComponent(resize_indexes+y,ClampToQuantum(gamma*
+              SetPixelIndex(resize_indexes+y,ClampToQuantum(gamma*
                 pixel.index));
             }
         }
@@ -2246,7 +2246,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
             1.0)+0.5);
           j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
             (contribution[i-start].pixel-contribution[0].pixel);
-          SetIndexPixelComponent(resize_indexes+y,GetIndexPixelComponent(
+          SetPixelIndex(resize_indexes+y,GetPixelIndex(
             indexes+j));
         }
       q++;
@@ -2423,15 +2423,15 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
             j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
               image->columns+x);
             alpha=contribution[i].weight;
-            pixel.red+=alpha*GetRedPixelComponent(p+j);
-            pixel.green+=alpha*GetGreenPixelComponent(p+j);
-            pixel.blue+=alpha*GetBluePixelComponent(p+j);
-            pixel.opacity+=alpha*GetOpacityPixelComponent(p+j);
+            pixel.red+=alpha*GetPixelRed(p+j);
+            pixel.green+=alpha*GetPixelGreen(p+j);
+            pixel.blue+=alpha*GetPixelBlue(p+j);
+            pixel.opacity+=alpha*GetPixelOpacity(p+j);
           }
-          SetRedPixelComponent(q,ClampToQuantum(pixel.red));
-          SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
-          SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
-          SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+          SetPixelRed(q,ClampToQuantum(pixel.red));
+          SetPixelGreen(q,ClampToQuantum(pixel.green));
+          SetPixelBlue(q,ClampToQuantum(pixel.blue));
+          SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
           if ((image->colorspace == CMYKColorspace) &&
               (resize_image->colorspace == CMYKColorspace))
             {
@@ -2440,9 +2440,9 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
                 j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
                   image->columns+x);
                 alpha=contribution[i].weight;
-                pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+                pixel.index+=alpha*GetPixelIndex(indexes+j);
               }
-              SetIndexPixelComponent(resize_indexes+x,ClampToQuantum(
+              SetPixelIndex(resize_indexes+x,ClampToQuantum(
                 pixel.index));
             }
         }
@@ -2457,18 +2457,18 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
             j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
               image->columns+x);
             alpha=contribution[i].weight*QuantumScale*
-              GetAlphaPixelComponent(p+j);
-            pixel.red+=alpha*GetRedPixelComponent(p+j);
-            pixel.green+=alpha*GetGreenPixelComponent(p+j);
-            pixel.blue+=alpha*GetBluePixelComponent(p+j);
-            pixel.opacity+=contribution[i].weight*GetOpacityPixelComponent(p+j);
+              GetPixelAlpha(p+j);
+            pixel.red+=alpha*GetPixelRed(p+j);
+            pixel.green+=alpha*GetPixelGreen(p+j);
+            pixel.blue+=alpha*GetPixelBlue(p+j);
+            pixel.opacity+=contribution[i].weight*GetPixelOpacity(p+j);
             gamma+=alpha;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
-          SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
-          SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
-          SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
-          SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+          SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+          SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+          SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
+          SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
           if ((image->colorspace == CMYKColorspace) &&
               (resize_image->colorspace == CMYKColorspace))
             {
@@ -2477,10 +2477,10 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
                 j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
                   image->columns+x);
                 alpha=contribution[i].weight*QuantumScale*
-                  GetAlphaPixelComponent(p+j);
-                pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+                  GetPixelAlpha(p+j);
+                pixel.index+=alpha*GetPixelIndex(indexes+j);
               }
-              SetIndexPixelComponent(resize_indexes+x,ClampToQuantum(gamma*
+              SetPixelIndex(resize_indexes+x,ClampToQuantum(gamma*
                 pixel.index));
             }
         }
@@ -2491,8 +2491,8 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
             1.0)+0.5);
           j=(ssize_t) ((contribution[i-start].pixel-contribution[0].pixel)*
             image->columns+x);
-          SetIndexPixelComponent(resize_indexes+x,
-            GetIndexPixelComponent(indexes+j));
+          SetPixelIndex(resize_indexes+x,
+            GetPixelIndex(indexes+j));
         }
       q++;
     }
@@ -2755,8 +2755,8 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
     if ((image->storage_class == PseudoClass) ||
         (image->colorspace == CMYKColorspace))
       for (x=0; x < (ssize_t) sample_image->columns; x++)
-        SetIndexPixelComponent(sample_indexes+x,
-          GetIndexPixelComponent(indexes+x_offset[x]));
+        SetPixelIndex(sample_indexes+x,
+          GetPixelIndex(indexes+x_offset[x]));
     if (SyncCacheViewAuthenticPixels(sample_view,exception) == MagickFalse)
       status=MagickFalse;
     if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2944,15 +2944,15 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           if (image->matte != MagickFalse)
-            alpha=QuantumScale*GetAlphaPixelComponent(p);
-          x_vector[x].red=(MagickRealType) (alpha*GetRedPixelComponent(p));
-          x_vector[x].green=(MagickRealType) (alpha*GetGreenPixelComponent(p));
-          x_vector[x].blue=(MagickRealType) (alpha*GetBluePixelComponent(p));
+            alpha=QuantumScale*GetPixelAlpha(p);
+          x_vector[x].red=(MagickRealType) (alpha*GetPixelRed(p));
+          x_vector[x].green=(MagickRealType) (alpha*GetPixelGreen(p));
+          x_vector[x].blue=(MagickRealType) (alpha*GetPixelBlue(p));
           if (image->matte != MagickFalse)
-            x_vector[x].opacity=(MagickRealType) GetOpacityPixelComponent(p);
+            x_vector[x].opacity=(MagickRealType) GetPixelOpacity(p);
           if (indexes != (IndexPacket *) NULL)
             x_vector[x].index=(MagickRealType) (alpha*
-              GetIndexPixelComponent(indexes+x));
+              GetPixelIndex(indexes+x));
           p++;
         }
       }
@@ -2977,19 +2977,19 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 if (image->matte != MagickFalse)
-                  alpha=QuantumScale*GetAlphaPixelComponent(p);
+                  alpha=QuantumScale*GetPixelAlpha(p);
                 x_vector[x].red=(MagickRealType) (alpha*
-                  GetRedPixelComponent(p));
+                  GetPixelRed(p));
                 x_vector[x].green=(MagickRealType) (alpha*
-                  GetGreenPixelComponent(p));
+                  GetPixelGreen(p));
                 x_vector[x].blue=(MagickRealType) (alpha*
-                  GetBluePixelComponent(p));
+                  GetPixelBlue(p));
                 if (image->matte != MagickFalse)
                   x_vector[x].opacity=(MagickRealType)
-                    GetOpacityPixelComponent(p);
+                    GetPixelOpacity(p);
                 if (indexes != (IndexPacket *) NULL)
                   x_vector[x].index=(MagickRealType) (alpha*
-                    GetIndexPixelComponent(indexes+x));
+                    GetPixelIndex(indexes+x));
                 p++;
               }
               number_rows++;
@@ -3021,19 +3021,19 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               if (image->matte != MagickFalse)
-                alpha=QuantumScale*GetAlphaPixelComponent(p);
+                alpha=QuantumScale*GetPixelAlpha(p);
               x_vector[x].red=(MagickRealType) (alpha*
-                GetRedPixelComponent(p));
+                GetPixelRed(p));
               x_vector[x].green=(MagickRealType) (alpha*
-                GetGreenPixelComponent(p));
+                GetPixelGreen(p));
               x_vector[x].blue=(MagickRealType) (alpha*
-                GetBluePixelComponent(p));
+                GetPixelBlue(p));
               if (image->matte != MagickFalse)
                 x_vector[x].opacity=(MagickRealType)
-                  GetOpacityPixelComponent(p);
+                  GetPixelOpacity(p);
               if (indexes != (IndexPacket *) NULL)
                 x_vector[x].index=(MagickRealType) (alpha*
-                  GetIndexPixelComponent(indexes+x));
+                  GetPixelIndex(indexes+x));
               p++;
             }
             number_rows++;
@@ -3078,13 +3078,13 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
           if (scale_image->matte != MagickFalse)
             alpha=QuantumScale*(QuantumRange-s->opacity);
           alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
-          SetRedPixelComponent(q,ClampToQuantum(alpha*s->red));
-          SetGreenPixelComponent(q,ClampToQuantum(alpha*s->green));
-          SetBluePixelComponent(q,ClampToQuantum(alpha*s->blue));
+          SetPixelRed(q,ClampToQuantum(alpha*s->red));
+          SetPixelGreen(q,ClampToQuantum(alpha*s->green));
+          SetPixelBlue(q,ClampToQuantum(alpha*s->blue));
           if (scale_image->matte != MagickFalse)
-            SetOpacityPixelComponent(q,ClampToQuantum(s->opacity));
+            SetPixelOpacity(q,ClampToQuantum(s->opacity));
           if (scale_indexes != (IndexPacket *) NULL)
-            SetIndexPixelComponent(scale_indexes+x,ClampToQuantum(alpha*
+            SetPixelIndex(scale_indexes+x,ClampToQuantum(alpha*
               s->index));
           q++;
           s++;
@@ -3178,13 +3178,13 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
         if (scale_image->matte != MagickFalse)
           alpha=QuantumScale*(QuantumRange-s->opacity);
         alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
-        SetRedPixelComponent(q,ClampToQuantum(alpha*t->red));
-        SetGreenPixelComponent(q,ClampToQuantum(alpha*t->green));
-        SetBluePixelComponent(q,ClampToQuantum(alpha*t->blue));
+        SetPixelRed(q,ClampToQuantum(alpha*t->red));
+        SetPixelGreen(q,ClampToQuantum(alpha*t->green));
+        SetPixelBlue(q,ClampToQuantum(alpha*t->blue));
         if (scale_image->matte != MagickFalse)
-          SetOpacityPixelComponent(q,ClampToQuantum(t->opacity));
+          SetPixelOpacity(q,ClampToQuantum(t->opacity));
         if (scale_indexes != (IndexPacket *) NULL)
-          SetIndexPixelComponent(scale_indexes+x,ClampToQuantum(alpha*
+          SetPixelIndex(scale_indexes+x,ClampToQuantum(alpha*
             t->index));
         t++;
         q++;
index f19300e71c413570a04252cdf92d416b26f8570e..922c5e658acd0dea14491d3cc2219713daf483d9 100644 (file)
@@ -366,27 +366,27 @@ static MagickBooleanType Classify(Image *image,short **extrema,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
-        if (((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) >=
+        if (((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) >=
              (cluster->red.left-SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) <=
+            ((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) <=
              (cluster->red.right+SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) >=
+            ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) >=
              (cluster->green.left-SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) <=
+            ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) <=
              (cluster->green.right+SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) >=
+            ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) >=
              (cluster->blue.left-SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) <=
+            ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) <=
              (cluster->blue.right+SafeMargin)))
           {
             /*
               Count this pixel.
             */
             count++;
-            cluster->red.center+=(MagickRealType) ScaleQuantumToChar(GetRedPixelComponent(p));
+            cluster->red.center+=(MagickRealType) ScaleQuantumToChar(GetPixelRed(p));
             cluster->green.center+=(MagickRealType)
-              ScaleQuantumToChar(GetGreenPixelComponent(p));
-            cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(GetBluePixelComponent(p));
+              ScaleQuantumToChar(GetPixelGreen(p));
+            cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(GetPixelBlue(p));
             cluster->count++;
             break;
           }
@@ -558,7 +558,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetIndexPixelComponent(indexes+x,0);
+      SetPixelIndex(indexes+x,0);
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
       {
         if (((ssize_t) ScaleQuantumToChar(q->red) >=
@@ -577,7 +577,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
             /*
               Classify this pixel.
             */
-            SetIndexPixelComponent(indexes+x,cluster->id);
+            SetPixelIndex(indexes+x,cluster->id);
             break;
           }
       }
@@ -603,21 +603,21 @@ static MagickBooleanType Classify(Image *image,short **extrema,
             sum=0.0;
             p=image->colormap+j;
             distance_squared=squares[(ssize_t) ScaleQuantumToChar(q->red)-
-              (ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p))]+
+              (ssize_t) ScaleQuantumToChar(GetPixelRed(p))]+
               squares[(ssize_t) ScaleQuantumToChar(q->green)-
-              (ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p))]+
+              (ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]+
               squares[(ssize_t) ScaleQuantumToChar(q->blue)-
-              (ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p))];
+              (ssize_t) ScaleQuantumToChar(GetPixelBlue(p))];
             numerator=distance_squared;
             for (k=0; k < (ssize_t) image->colors; k++)
             {
               p=image->colormap+k;
               distance_squared=squares[(ssize_t) ScaleQuantumToChar(q->red)-
-                (ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p))]+
+                (ssize_t) ScaleQuantumToChar(GetPixelRed(p))]+
                 squares[(ssize_t) ScaleQuantumToChar(q->green)-
-                (ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p))]+
+                (ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]+
                 squares[(ssize_t) ScaleQuantumToChar(q->blue)-
-                (ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p))];
+                (ssize_t) ScaleQuantumToChar(GetPixelBlue(p))];
               ratio=numerator/distance_squared;
               sum+=SegmentPower(ratio);
             }
@@ -627,7 +627,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
                   Classify this pixel.
                 */
                 local_minima=1.0/sum;
-                SetIndexPixelComponent(indexes+x,j);
+                SetPixelIndex(indexes+x,j);
               }
           }
         }
@@ -1098,17 +1098,17 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
-        if (((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) >=
+        if (((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) >=
              (cluster->red.left-SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) <=
+            ((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) <=
              (cluster->red.right+SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) >=
+            ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) >=
              (cluster->green.left-SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) <=
+            ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) <=
              (cluster->green.right+SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) >=
+            ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) >=
              (cluster->blue.left-SafeMargin)) &&
-            ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) <=
+            ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) <=
              (cluster->blue.right+SafeMargin)))
           {
             /*
@@ -1116,11 +1116,11 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image,
             */
             count++;
             cluster->red.center+=(MagickRealType)
-              ScaleQuantumToChar(GetRedPixelComponent(p));
+              ScaleQuantumToChar(GetPixelRed(p));
             cluster->green.center+=(MagickRealType)
-              ScaleQuantumToChar(GetGreenPixelComponent(p));
+              ScaleQuantumToChar(GetPixelGreen(p));
             cluster->blue.center+=(MagickRealType)
-              ScaleQuantumToChar(GetBluePixelComponent(p));
+              ScaleQuantumToChar(GetPixelBlue(p));
             cluster->count++;
             break;
           }
@@ -1262,9 +1262,9 @@ static void InitializeHistogram(const Image *image,ssize_t **histogram,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      histogram[Red][(ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p))]++;
-      histogram[Green][(ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p))]++;
-      histogram[Blue][(ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p))]++;
+      histogram[Red][(ssize_t) ScaleQuantumToChar(GetPixelRed(p))]++;
+      histogram[Green][(ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]++;
+      histogram[Blue][(ssize_t) ScaleQuantumToChar(GetPixelBlue(p))]++;
       p++;
     }
   }
index 6bbdd07d0cadd2289927cc7910713e0d5d5d32af..58c0eff35c32170bbf01e52e24263caedc7d7746 100644 (file)
@@ -739,9 +739,9 @@ static MagickBooleanType RadonTransform(const Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       byte<<=1;
-      if (((MagickRealType) GetRedPixelComponent(p) < threshold) ||
-          ((MagickRealType) GetGreenPixelComponent(p) < threshold) ||
-          ((MagickRealType) GetBluePixelComponent(p) < threshold))
+      if (((MagickRealType) GetPixelRed(p) < threshold) ||
+          ((MagickRealType) GetPixelGreen(p) < threshold) ||
+          ((MagickRealType) GetPixelBlue(p) < threshold))
         byte|=0x01;
       bit++;
       if (bit == 8)
@@ -790,9 +790,9 @@ static MagickBooleanType RadonTransform(const Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       byte<<=1;
-      if (((MagickRealType) GetRedPixelComponent(p) < threshold) ||
-          ((MagickRealType) GetGreenPixelComponent(p) < threshold) ||
-          ((MagickRealType) GetBluePixelComponent(p) < threshold))
+      if (((MagickRealType) GetPixelRed(p) < threshold) ||
+          ((MagickRealType) GetPixelGreen(p) < threshold) ||
+          ((MagickRealType) GetPixelBlue(p) < threshold))
         byte|=0x01;
       bit++;
       if (bit == 8)
@@ -856,10 +856,10 @@ static void GetImageBackgroundColor(Image *image,const ssize_t offset,
     {
       if ((x >= offset) && (x < ((ssize_t) image->columns-offset)))
         continue;
-      background.red+=QuantumScale*GetRedPixelComponent(p);
-      background.green+=QuantumScale*GetGreenPixelComponent(p);
-      background.blue+=QuantumScale*GetBluePixelComponent(p);
-      background.opacity+=QuantumScale*GetOpacityPixelComponent(p);
+      background.red+=QuantumScale*GetPixelRed(p);
+      background.green+=QuantumScale*GetPixelGreen(p);
+      background.blue+=QuantumScale*GetPixelBlue(p);
+      background.opacity+=QuantumScale*GetPixelOpacity(p);
       count++;
       p++;
     }
@@ -1238,8 +1238,8 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
         if ((indexes != (IndexPacket *) NULL) &&
             (rotate_indexes != (IndexPacket *) NULL))
           for (x=0; x < (ssize_t) image->columns; x++)
-            SetIndexPixelComponent(rotate_indexes+image->columns-x-1,
-              GetIndexPixelComponent(indexes+x));
+            SetPixelIndex(rotate_indexes+image->columns-x-1,
+              GetPixelIndex(indexes+x));
         sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
         if (sync == MagickFalse)
           status=MagickFalse;
@@ -1551,7 +1551,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
             }
           SetMagickPixelPacket(image,p,indexes,&source);
           MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
-            &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+            &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
           SetPixelPacket(image,&destination,q++,shear_indexes++);
           SetMagickPixelPacket(image,p++,indexes++,&pixel);
         }
@@ -1581,7 +1581,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
             continue;
           SetMagickPixelPacket(image,p,indexes,&source);
           MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
-            &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+            &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
           SetPixelPacket(image,&destination,q,shear_indexes);
           SetMagickPixelPacket(image,p,indexes,&pixel);
         }
@@ -1771,7 +1771,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
             }
           SetMagickPixelPacket(image,p,indexes,&source);
           MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
-            &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+            &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
           SetPixelPacket(image,&destination,q++,shear_indexes++);
           SetMagickPixelPacket(image,p++,indexes++,&pixel);
         }
@@ -1801,7 +1801,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
             continue;
           SetMagickPixelPacket(image,p,indexes,&source);
           MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
-            &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+            &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
           SetPixelPacket(image,&destination,q,shear_indexes);
           SetMagickPixelPacket(image,p,indexes,&pixel);
         }
index a46fcee4c68c03bb0a24b8c13335801e8c93ab2c..390e659c769385b9eb0f940c448c502f31cf01c6 100644 (file)
@@ -555,13 +555,13 @@ MagickExport Image *EvaluateImages(const Image *images,
             }
           indexes=GetCacheViewVirtualIndexQueue(image_view);
           evaluate_pixel[i].red=ApplyEvaluateOperator(random_info[id],
-            GetRedPixelComponent(p),op,evaluate_pixel[i].red);
+            GetPixelRed(p),op,evaluate_pixel[i].red);
           evaluate_pixel[i].green=ApplyEvaluateOperator(random_info[id],
-            GetGreenPixelComponent(p),op,evaluate_pixel[i].green);
+            GetPixelGreen(p),op,evaluate_pixel[i].green);
           evaluate_pixel[i].blue=ApplyEvaluateOperator(random_info[id],
-            GetBluePixelComponent(p),op,evaluate_pixel[i].blue);
+            GetPixelBlue(p),op,evaluate_pixel[i].blue);
           evaluate_pixel[i].opacity=ApplyEvaluateOperator(random_info[id],
-            GetOpacityPixelComponent(p),op,evaluate_pixel[i].opacity);
+            GetPixelOpacity(p),op,evaluate_pixel[i].opacity);
           if (evaluate_image->colorspace == CMYKColorspace)
             evaluate_pixel[i].index=ApplyEvaluateOperator(random_info[id],
               *indexes,op,evaluate_pixel[i].index);
@@ -570,16 +570,16 @@ MagickExport Image *EvaluateImages(const Image *images,
         }
         qsort((void *) evaluate_pixel,number_images,sizeof(*evaluate_pixel),
           IntensityCompare);
-        SetRedPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].red));
-        SetGreenPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].green));
-        SetBluePixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].blue));
+        SetPixelRed(q,ClampToQuantum(evaluate_pixel[i/2].red));
+        SetPixelGreen(q,ClampToQuantum(evaluate_pixel[i/2].green));
+        SetPixelBlue(q,ClampToQuantum(evaluate_pixel[i/2].blue));
         if (evaluate_image->matte == MagickFalse)
-          SetOpacityPixelComponent(q,ClampToQuantum(
+          SetPixelOpacity(q,ClampToQuantum(
             evaluate_pixel[i/2].opacity));
         else
-          SetAlphaPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].opacity));
+          SetPixelAlpha(q,ClampToQuantum(evaluate_pixel[i/2].opacity));
         if (evaluate_image->colorspace == CMYKColorspace)
-          SetIndexPixelComponent(evaluate_indexes+i,ClampToQuantum(
+          SetPixelIndex(evaluate_indexes+i,ClampToQuantum(
             evaluate_pixel[i/2].index));
         q++;
       }
@@ -660,19 +660,19 @@ MagickExport Image *EvaluateImages(const Image *images,
         for (x=0; x < (ssize_t) next->columns; x++)
         {
           evaluate_pixel[x].red=ApplyEvaluateOperator(random_info[id],
-            GetRedPixelComponent(p),i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].red);
+            GetPixelRed(p),i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].red);
           evaluate_pixel[x].green=ApplyEvaluateOperator(random_info[id],
-            GetGreenPixelComponent(p),i == 0 ? AddEvaluateOperator : op,
+            GetPixelGreen(p),i == 0 ? AddEvaluateOperator : op,
             evaluate_pixel[x].green);
           evaluate_pixel[x].blue=ApplyEvaluateOperator(random_info[id],
-            GetBluePixelComponent(p),i == 0 ? AddEvaluateOperator : op,
+            GetPixelBlue(p),i == 0 ? AddEvaluateOperator : op,
             evaluate_pixel[x].blue);
           evaluate_pixel[x].opacity=ApplyEvaluateOperator(random_info[id],
-            GetOpacityPixelComponent(p),i == 0 ? AddEvaluateOperator : op,
+            GetPixelOpacity(p),i == 0 ? AddEvaluateOperator : op,
             evaluate_pixel[x].opacity);
           if (evaluate_image->colorspace == CMYKColorspace)
             evaluate_pixel[x].index=ApplyEvaluateOperator(random_info[id],
-              GetIndexPixelComponent(indexes+x),i == 0 ? AddEvaluateOperator :
+              GetPixelIndex(indexes+x),i == 0 ? AddEvaluateOperator :
               op,evaluate_pixel[x].index);
           p++;
         }
@@ -690,15 +690,15 @@ MagickExport Image *EvaluateImages(const Image *images,
         }
       for (x=0; x < (ssize_t) evaluate_image->columns; x++)
       {
-        SetRedPixelComponent(q,ClampToQuantum(evaluate_pixel[x].red));
-        SetGreenPixelComponent(q,ClampToQuantum(evaluate_pixel[x].green));
-        SetBluePixelComponent(q,ClampToQuantum(evaluate_pixel[x].blue));
+        SetPixelRed(q,ClampToQuantum(evaluate_pixel[x].red));
+        SetPixelGreen(q,ClampToQuantum(evaluate_pixel[x].green));
+        SetPixelBlue(q,ClampToQuantum(evaluate_pixel[x].blue));
         if (evaluate_image->matte == MagickFalse)
-          SetOpacityPixelComponent(q,ClampToQuantum(evaluate_pixel[x].opacity));
+          SetPixelOpacity(q,ClampToQuantum(evaluate_pixel[x].opacity));
         else
-          SetAlphaPixelComponent(q,ClampToQuantum(evaluate_pixel[x].opacity));
+          SetPixelAlpha(q,ClampToQuantum(evaluate_pixel[x].opacity));
         if (evaluate_image->colorspace == CMYKColorspace)
-          SetIndexPixelComponent(evaluate_indexes+x,ClampToQuantum(
+          SetPixelIndex(evaluate_indexes+x,ClampToQuantum(
             evaluate_pixel[x].index));
         q++;
       }
@@ -789,26 +789,26 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
-          random_info[id],GetRedPixelComponent(q),op,value)));
+        SetPixelRed(q,ClampToQuantum(ApplyEvaluateOperator(
+          random_info[id],GetPixelRed(q),op,value)));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
-          random_info[id],GetGreenPixelComponent(q),op,value)));
+        SetPixelGreen(q,ClampToQuantum(ApplyEvaluateOperator(
+          random_info[id],GetPixelGreen(q),op,value)));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
-          random_info[id],GetBluePixelComponent(q),op,value)));
+        SetPixelBlue(q,ClampToQuantum(ApplyEvaluateOperator(
+          random_info[id],GetPixelBlue(q),op,value)));
       if ((channel & OpacityChannel) != 0)
         {
           if (image->matte == MagickFalse)
-            SetOpacityPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
-              random_info[id],GetOpacityPixelComponent(q),op,value)));
+            SetPixelOpacity(q,ClampToQuantum(ApplyEvaluateOperator(
+              random_info[id],GetPixelOpacity(q),op,value)));
           else
-            SetAlphaPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
-              random_info[id],(Quantum) GetAlphaPixelComponent(q),op,value)));
+            SetPixelAlpha(q,ClampToQuantum(ApplyEvaluateOperator(
+              random_info[id],(Quantum) GetPixelAlpha(q),op,value)));
         }
       if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL))
-        SetIndexPixelComponent(indexes+x,ClampToQuantum(ApplyEvaluateOperator(
-          random_info[id],GetIndexPixelComponent(indexes+x),op,value)));
+        SetPixelIndex(indexes+x,ClampToQuantum(ApplyEvaluateOperator(
+          random_info[id],GetPixelIndex(indexes+x),op,value)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1024,27 +1024,27 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ApplyFunction(GetRedPixelComponent(q),
+        SetPixelRed(q,ApplyFunction(GetPixelRed(q),
           function,number_parameters,parameters,exception));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ApplyFunction(GetGreenPixelComponent(q),
+        SetPixelGreen(q,ApplyFunction(GetPixelGreen(q),
           function,number_parameters,parameters,exception));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ApplyFunction(GetBluePixelComponent(q),
+        SetPixelBlue(q,ApplyFunction(GetPixelBlue(q),
           function,number_parameters,parameters,exception));
       if ((channel & OpacityChannel) != 0)
         {
           if (image->matte == MagickFalse)
-            SetOpacityPixelComponent(q,ApplyFunction(
-              GetOpacityPixelComponent(q),function,number_parameters,parameters,
+            SetPixelOpacity(q,ApplyFunction(
+              GetPixelOpacity(q),function,number_parameters,parameters,
               exception));
           else
-            SetAlphaPixelComponent(q,ApplyFunction((Quantum)
-              GetAlphaPixelComponent(q),function,number_parameters,parameters,
+            SetPixelAlpha(q,ApplyFunction((Quantum)
+              GetPixelAlpha(q),function,number_parameters,parameters,
               exception));
         }
       if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL))
-        SetIndexPixelComponent(indexes+x,ApplyFunction(GetIndexPixelComponent(
+        SetPixelIndex(indexes+x,ApplyFunction(GetPixelIndex(
           indexes+x),function,number_parameters,parameters,exception));
       q++;
     }
@@ -1345,62 +1345,62 @@ MagickExport MagickBooleanType GetImageChannelKurtosis(const Image *image,
     {
       if ((channel & RedChannel) != 0)
         {
-          mean+=GetRedPixelComponent(p);
-          sum_squares+=(double) GetRedPixelComponent(p)*GetRedPixelComponent(p);
-          sum_cubes+=(double) GetRedPixelComponent(p)*GetRedPixelComponent(p)*
-            GetRedPixelComponent(p);
-          sum_fourth_power+=(double) GetRedPixelComponent(p)*
-            GetRedPixelComponent(p)*GetRedPixelComponent(p)*
-            GetRedPixelComponent(p);
+          mean+=GetPixelRed(p);
+          sum_squares+=(double) GetPixelRed(p)*GetPixelRed(p);
+          sum_cubes+=(double) GetPixelRed(p)*GetPixelRed(p)*
+            GetPixelRed(p);
+          sum_fourth_power+=(double) GetPixelRed(p)*
+            GetPixelRed(p)*GetPixelRed(p)*
+            GetPixelRed(p);
           area++;
         }
       if ((channel & GreenChannel) != 0)
         {
-          mean+=GetGreenPixelComponent(p);
-          sum_squares+=(double) GetGreenPixelComponent(p)*
-            GetGreenPixelComponent(p);
-          sum_cubes+=(double) GetGreenPixelComponent(p)*
-            GetGreenPixelComponent(p)*GetGreenPixelComponent(p);
-          sum_fourth_power+=(double) GetGreenPixelComponent(p)*
-            GetGreenPixelComponent(p)*GetGreenPixelComponent(p)*
-            GetGreenPixelComponent(p);
+          mean+=GetPixelGreen(p);
+          sum_squares+=(double) GetPixelGreen(p)*
+            GetPixelGreen(p);
+          sum_cubes+=(double) GetPixelGreen(p)*
+            GetPixelGreen(p)*GetPixelGreen(p);
+          sum_fourth_power+=(double) GetPixelGreen(p)*
+            GetPixelGreen(p)*GetPixelGreen(p)*
+            GetPixelGreen(p);
           area++;
         }
       if ((channel & BlueChannel) != 0)
         {
-          mean+=GetBluePixelComponent(p);
-          sum_squares+=(double) GetBluePixelComponent(p)*
-            GetBluePixelComponent(p);
-          sum_cubes+=(double) GetBluePixelComponent(p)*GetBluePixelComponent(p)*
-            GetBluePixelComponent(p);
-          sum_fourth_power+=(double) GetBluePixelComponent(p)*
-            GetBluePixelComponent(p)*GetBluePixelComponent(p)*
-            GetBluePixelComponent(p);
+          mean+=GetPixelBlue(p);
+          sum_squares+=(double) GetPixelBlue(p)*
+            GetPixelBlue(p);
+          sum_cubes+=(double) GetPixelBlue(p)*GetPixelBlue(p)*
+            GetPixelBlue(p);
+          sum_fourth_power+=(double) GetPixelBlue(p)*
+            GetPixelBlue(p)*GetPixelBlue(p)*
+            GetPixelBlue(p);
           area++;
         }
       if ((channel & OpacityChannel) != 0)
         {
-          mean+=GetOpacityPixelComponent(p);
-          sum_squares+=(double) GetOpacityPixelComponent(p)*
-            GetOpacityPixelComponent(p);
-          sum_cubes+=(double) GetOpacityPixelComponent(p)*
-            GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p);
-          sum_fourth_power+=(double) GetOpacityPixelComponent(p)*
-            GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p)*
-            GetOpacityPixelComponent(p);
+          mean+=GetPixelOpacity(p);
+          sum_squares+=(double) GetPixelOpacity(p)*
+            GetPixelOpacity(p);
+          sum_cubes+=(double) GetPixelOpacity(p)*
+            GetPixelOpacity(p)*GetPixelOpacity(p);
+          sum_fourth_power+=(double) GetPixelOpacity(p)*
+            GetPixelOpacity(p)*GetPixelOpacity(p)*
+            GetPixelOpacity(p);
           area++;
         }
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
         {
-          mean+=GetIndexPixelComponent(indexes+x);
-          sum_squares+=(double) GetIndexPixelComponent(indexes+x)*
-            GetIndexPixelComponent(indexes+x);
-          sum_cubes+=(double) GetIndexPixelComponent(indexes+x)*
-            GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x);
-          sum_fourth_power+=(double) GetIndexPixelComponent(indexes+x)*
-            GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x)*
-            GetIndexPixelComponent(indexes+x);
+          mean+=GetPixelIndex(indexes+x);
+          sum_squares+=(double) GetPixelIndex(indexes+x)*
+            GetPixelIndex(indexes+x);
+          sum_cubes+=(double) GetPixelIndex(indexes+x)*
+            GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
+          sum_fourth_power+=(double) GetPixelIndex(indexes+x)*
+            GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
+            GetPixelIndex(indexes+x);
           area++;
         }
       p++;
@@ -1534,10 +1534,10 @@ MagickExport MagickBooleanType GetImageChannelRange(const Image *image,
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
         {
-          if ((double) GetIndexPixelComponent(indexes+x) < *minima)
-            *minima=(double) GetIndexPixelComponent(indexes+x);
-          if ((double) GetIndexPixelComponent(indexes+x) > *maxima)
-            *maxima=(double) GetIndexPixelComponent(indexes+x);
+          if ((double) GetPixelIndex(indexes+x) < *minima)
+            *minima=(double) GetPixelIndex(indexes+x);
+          if ((double) GetPixelIndex(indexes+x) > *maxima)
+            *maxima=(double) GetPixelIndex(indexes+x);
         }
       p++;
     }
@@ -1642,8 +1642,8 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
         {
           depth=channel_statistics[RedChannel].depth;
           range=GetQuantumRange(depth);
-          status=GetRedPixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetRedPixelComponent(p),range),range) ?
+          status=GetPixelRed(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelRed(p),range),range) ?
             MagickTrue : MagickFalse;
           if (status != MagickFalse)
             {
@@ -1655,8 +1655,8 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
         {
           depth=channel_statistics[GreenChannel].depth;
           range=GetQuantumRange(depth);
-          status=GetGreenPixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetGreenPixelComponent(p),range),range) ?
+          status=GetPixelGreen(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelGreen(p),range),range) ?
             MagickTrue : MagickFalse;
           if (status != MagickFalse)
             {
@@ -1668,8 +1668,8 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
         {
           depth=channel_statistics[BlueChannel].depth;
           range=GetQuantumRange(depth);
-          status=GetBluePixelComponent(p) != ScaleAnyToQuantum(
-            ScaleQuantumToAny(GetBluePixelComponent(p),range),range) ?
+          status=GetPixelBlue(p) != ScaleAnyToQuantum(
+            ScaleQuantumToAny(GetPixelBlue(p),range),range) ?
             MagickTrue : MagickFalse;
           if (status != MagickFalse)
             {
@@ -1683,8 +1683,8 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
             {
               depth=channel_statistics[OpacityChannel].depth;
               range=GetQuantumRange(depth);
-              status=GetOpacityPixelComponent(p) != ScaleAnyToQuantum(
-                ScaleQuantumToAny(GetOpacityPixelComponent(p),range),range) ?
+              status=GetPixelOpacity(p) != ScaleAnyToQuantum(
+                ScaleQuantumToAny(GetPixelOpacity(p),range),range) ?
                 MagickTrue : MagickFalse;
               if (status != MagickFalse)
                 {
@@ -1699,8 +1699,8 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
             {
               depth=channel_statistics[BlackChannel].depth;
               range=GetQuantumRange(depth);
-              status=GetIndexPixelComponent(indexes+x) !=
-                ScaleAnyToQuantum(ScaleQuantumToAny(GetIndexPixelComponent(
+              status=GetPixelIndex(indexes+x) !=
+                ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelIndex(
                 indexes+x),range),range) ? MagickTrue : MagickFalse;
               if (status != MagickFalse)
                 {
@@ -1709,85 +1709,85 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
                 }
             }
         }
-      if ((double) GetRedPixelComponent(p) < channel_statistics[RedChannel].minima)
-        channel_statistics[RedChannel].minima=(double) GetRedPixelComponent(p);
-      if ((double) GetRedPixelComponent(p) > channel_statistics[RedChannel].maxima)
-        channel_statistics[RedChannel].maxima=(double) GetRedPixelComponent(p);
-      channel_statistics[RedChannel].sum+=GetRedPixelComponent(p);
-      channel_statistics[RedChannel].sum_squared+=(double) GetRedPixelComponent(p)*
-        GetRedPixelComponent(p);
+      if ((double) GetPixelRed(p) < channel_statistics[RedChannel].minima)
+        channel_statistics[RedChannel].minima=(double) GetPixelRed(p);
+      if ((double) GetPixelRed(p) > channel_statistics[RedChannel].maxima)
+        channel_statistics[RedChannel].maxima=(double) GetPixelRed(p);
+      channel_statistics[RedChannel].sum+=GetPixelRed(p);
+      channel_statistics[RedChannel].sum_squared+=(double) GetPixelRed(p)*
+        GetPixelRed(p);
       channel_statistics[RedChannel].sum_cubed+=(double)
-        GetRedPixelComponent(p)*GetRedPixelComponent(p)*
-        GetRedPixelComponent(p);
+        GetPixelRed(p)*GetPixelRed(p)*
+        GetPixelRed(p);
       channel_statistics[RedChannel].sum_fourth_power+=(double)
-        GetRedPixelComponent(p)*GetRedPixelComponent(p)*
-        GetRedPixelComponent(p)*GetRedPixelComponent(p);
-      if ((double) GetGreenPixelComponent(p) < channel_statistics[GreenChannel].minima)
+        GetPixelRed(p)*GetPixelRed(p)*
+        GetPixelRed(p)*GetPixelRed(p);
+      if ((double) GetPixelGreen(p) < channel_statistics[GreenChannel].minima)
         channel_statistics[GreenChannel].minima=(double)
-          GetGreenPixelComponent(p);
-      if ((double) GetGreenPixelComponent(p) > channel_statistics[GreenChannel].maxima)
+          GetPixelGreen(p);
+      if ((double) GetPixelGreen(p) > channel_statistics[GreenChannel].maxima)
         channel_statistics[GreenChannel].maxima=(double)
-          GetGreenPixelComponent(p);
-      channel_statistics[GreenChannel].sum+=GetGreenPixelComponent(p);
+          GetPixelGreen(p);
+      channel_statistics[GreenChannel].sum+=GetPixelGreen(p);
       channel_statistics[GreenChannel].sum_squared+=(double)
-        GetGreenPixelComponent(p)*GetGreenPixelComponent(p);
+        GetPixelGreen(p)*GetPixelGreen(p);
       channel_statistics[GreenChannel].sum_cubed+=(double)
-        GetGreenPixelComponent(p)*GetGreenPixelComponent(p)*
-        GetGreenPixelComponent(p);
+        GetPixelGreen(p)*GetPixelGreen(p)*
+        GetPixelGreen(p);
       channel_statistics[GreenChannel].sum_fourth_power+=(double)
-        GetGreenPixelComponent(p)*GetGreenPixelComponent(p)*
-        GetGreenPixelComponent(p)*GetGreenPixelComponent(p);
-      if ((double) GetBluePixelComponent(p) < channel_statistics[BlueChannel].minima)
+        GetPixelGreen(p)*GetPixelGreen(p)*
+        GetPixelGreen(p)*GetPixelGreen(p);
+      if ((double) GetPixelBlue(p) < channel_statistics[BlueChannel].minima)
         channel_statistics[BlueChannel].minima=(double)
-          GetBluePixelComponent(p);
-      if ((double) GetBluePixelComponent(p) > channel_statistics[BlueChannel].maxima)
+          GetPixelBlue(p);
+      if ((double) GetPixelBlue(p) > channel_statistics[BlueChannel].maxima)
         channel_statistics[BlueChannel].maxima=(double)
-          GetBluePixelComponent(p);
-      channel_statistics[BlueChannel].sum+=GetBluePixelComponent(p);
+          GetPixelBlue(p);
+      channel_statistics[BlueChannel].sum+=GetPixelBlue(p);
       channel_statistics[BlueChannel].sum_squared+=(double)
-        GetBluePixelComponent(p)*GetBluePixelComponent(p);
+        GetPixelBlue(p)*GetPixelBlue(p);
       channel_statistics[BlueChannel].sum_cubed+=(double)
-        GetBluePixelComponent(p)*GetBluePixelComponent(p)*
-        GetBluePixelComponent(p);
+        GetPixelBlue(p)*GetPixelBlue(p)*
+        GetPixelBlue(p);
       channel_statistics[BlueChannel].sum_fourth_power+=(double)
-        GetBluePixelComponent(p)*GetBluePixelComponent(p)*
-        GetBluePixelComponent(p)*GetBluePixelComponent(p);
+        GetPixelBlue(p)*GetPixelBlue(p)*
+        GetPixelBlue(p)*GetPixelBlue(p);
       if (image->matte != MagickFalse)
         {
-          if ((double) GetOpacityPixelComponent(p) < channel_statistics[OpacityChannel].minima)
+          if ((double) GetPixelOpacity(p) < channel_statistics[OpacityChannel].minima)
             channel_statistics[OpacityChannel].minima=(double)
-              GetOpacityPixelComponent(p);
-          if ((double) GetOpacityPixelComponent(p) > channel_statistics[OpacityChannel].maxima)
+              GetPixelOpacity(p);
+          if ((double) GetPixelOpacity(p) > channel_statistics[OpacityChannel].maxima)
             channel_statistics[OpacityChannel].maxima=(double)
-              GetOpacityPixelComponent(p);
-          channel_statistics[OpacityChannel].sum+=GetOpacityPixelComponent(p);
+              GetPixelOpacity(p);
+          channel_statistics[OpacityChannel].sum+=GetPixelOpacity(p);
           channel_statistics[OpacityChannel].sum_squared+=(double)
-            GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p);
+            GetPixelOpacity(p)*GetPixelOpacity(p);
           channel_statistics[OpacityChannel].sum_cubed+=(double)
-            GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p)*
-            GetOpacityPixelComponent(p);
+            GetPixelOpacity(p)*GetPixelOpacity(p)*
+            GetPixelOpacity(p);
           channel_statistics[OpacityChannel].sum_fourth_power+=(double)
-            GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p)*
-            GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p);
+            GetPixelOpacity(p)*GetPixelOpacity(p)*
+            GetPixelOpacity(p)*GetPixelOpacity(p);
         }
       if (image->colorspace == CMYKColorspace)
         {
-          if ((double) GetIndexPixelComponent(indexes+x) < channel_statistics[BlackChannel].minima)
+          if ((double) GetPixelIndex(indexes+x) < channel_statistics[BlackChannel].minima)
             channel_statistics[BlackChannel].minima=(double)
-              GetIndexPixelComponent(indexes+x);
-          if ((double) GetIndexPixelComponent(indexes+x) > channel_statistics[BlackChannel].maxima)
+              GetPixelIndex(indexes+x);
+          if ((double) GetPixelIndex(indexes+x) > channel_statistics[BlackChannel].maxima)
             channel_statistics[BlackChannel].maxima=(double)
-              GetIndexPixelComponent(indexes+x);
+              GetPixelIndex(indexes+x);
           channel_statistics[BlackChannel].sum+=
-            GetIndexPixelComponent(indexes+x);
+            GetPixelIndex(indexes+x);
           channel_statistics[BlackChannel].sum_squared+=(double)
-            GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x);
+            GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
           channel_statistics[BlackChannel].sum_cubed+=(double)
-            GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x)*
-            GetIndexPixelComponent(indexes+x);
+            GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
+            GetPixelIndex(indexes+x);
           channel_statistics[BlackChannel].sum_fourth_power+=(double)
-            GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x)*
-            GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x);
+            GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
+            GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
         }
       x++;
       p++;
index e7a6f9b07d27eaacf66587818b44ac77290dd19e..28d4c8d5df2ee95069d138c405161b47e88016f3 100644 (file)
@@ -1390,9 +1390,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
             p++;
           }
           break;
@@ -1404,10 +1404,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -1419,9 +1419,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
               break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
             *q++=ScaleQuantumToChar((Quantum) 0);
             p++;
           }
@@ -1446,9 +1446,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
             p++;
           }
           break;
@@ -1460,10 +1460,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
+            *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -1475,9 +1475,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToChar(GetPixelRed(p));
+            *q++=ScaleQuantumToChar(GetPixelGreen(p));
+            *q++=ScaleQuantumToChar(GetPixelBlue(p));
             *q++=ScaleQuantumToChar((Quantum) 0);
             p++;
           }
@@ -1497,35 +1497,35 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=ScaleQuantumToChar(GetRedPixelComponent(p));
+              *q=ScaleQuantumToChar(GetPixelRed(p));
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=ScaleQuantumToChar(GetGreenPixelComponent(p));
+              *q=ScaleQuantumToChar(GetPixelGreen(p));
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=ScaleQuantumToChar(GetBluePixelComponent(p));
+              *q=ScaleQuantumToChar(GetPixelBlue(p));
               break;
             }
             case AlphaQuantum:
             {
-              *q=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+              *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
               break;
             }
             case OpacityQuantum:
             {
-              *q=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+              *q=ScaleQuantumToChar(GetPixelOpacity(p));
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+                *q=ScaleQuantumToChar(GetPixelIndex(indexes+x));
               break;
             }
             case IndexQuantum:
@@ -1555,11 +1555,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1572,13 +1572,13 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetAlphaPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelAlpha(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1591,11 +1591,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
             *q++=0.0;
             p++;
@@ -1622,11 +1622,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1639,13 +1639,13 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetAlphaPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelAlpha(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1658,11 +1658,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(double) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
             *q++=0.0;
             p++;
@@ -1683,40 +1683,40 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=(double) ((QuantumScale*GetRedPixelComponent(p))*
+              *q=(double) ((QuantumScale*GetPixelRed(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+              *q=(double) ((QuantumScale*GetPixelGreen(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=(double) ((QuantumScale*GetBluePixelComponent(p))*
+              *q=(double) ((QuantumScale*GetPixelBlue(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case AlphaQuantum:
             {
-              *q=(double) ((QuantumScale*GetAlphaPixelComponent(p))*
+              *q=(double) ((QuantumScale*GetPixelAlpha(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case OpacityQuantum:
             {
-              *q=(double) ((QuantumScale*GetOpacityPixelComponent(p))*
+              *q=(double) ((QuantumScale*GetPixelOpacity(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=(double) ((QuantumScale*GetIndexPixelComponent(indexes+x))*
+                *q=(double) ((QuantumScale*GetPixelIndex(indexes+x))*
                   quantum_info->scale+quantum_info->minimum);
               break;
             }
@@ -1748,11 +1748,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1765,13 +1765,13 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*(Quantum) (GetAlphaPixelComponent(p)))*
+            *q++=(float) ((QuantumScale*(Quantum) (GetPixelAlpha(p)))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1784,11 +1784,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
             *q++=0.0;
             p++;
@@ -1815,11 +1815,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1832,13 +1832,13 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetAlphaPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelAlpha(p))*
               quantum_info->scale+quantum_info->minimum);
             p++;
           }
@@ -1851,11 +1851,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelRed(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelGreen(p))*
               quantum_info->scale+quantum_info->minimum);
-            *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+            *q++=(float) ((QuantumScale*GetPixelBlue(p))*
               quantum_info->scale+quantum_info->minimum);
             *q++=0.0;
             p++;
@@ -1876,40 +1876,40 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=(float) ((QuantumScale*GetRedPixelComponent(p))*
+              *q=(float) ((QuantumScale*GetPixelRed(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+              *q=(float) ((QuantumScale*GetPixelGreen(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=(float) ((QuantumScale*GetBluePixelComponent(p))*
+              *q=(float) ((QuantumScale*GetPixelBlue(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case AlphaQuantum:
             {
-              *q=(float) ((QuantumScale*GetAlphaPixelComponent(p))*
+              *q=(float) ((QuantumScale*GetPixelAlpha(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case OpacityQuantum:
             {
-              *q=(float) ((QuantumScale*GetOpacityPixelComponent(p))*
+              *q=(float) ((QuantumScale*GetPixelOpacity(p))*
                 quantum_info->scale+quantum_info->minimum);
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=(float) ((QuantumScale*GetIndexPixelComponent(indexes+x))*
+                *q=(float) ((QuantumScale*GetPixelIndex(indexes+x))*
                   quantum_info->scale+quantum_info->minimum);
               break;
             }
@@ -1941,9 +1941,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
             p++;
           }
           break;
@@ -1955,11 +1955,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
             *q++=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+              GetPixelOpacity(p)));
             p++;
           }
           break;
@@ -1971,9 +1971,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
             *q++=0U;
             p++;
           }
@@ -1999,9 +1999,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
             p++;
           }
           break;
@@ -2013,11 +2013,11 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
             *q++=(unsigned int) ScaleQuantumToLong((Quantum)
-              (GetAlphaPixelComponent(p)));
+              (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -2029,9 +2029,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
             *q++=0U;
             p++;
           }
@@ -2051,36 +2051,36 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
+              *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
               break;
             }
             case AlphaQuantum:
             {
               *q=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
-                GetOpacityPixelComponent(p)));
+                GetPixelOpacity(p)));
               break;
             }
             case OpacityQuantum:
             {
-              *q=(unsigned int) ScaleQuantumToLong(GetOpacityPixelComponent(p));
+              *q=(unsigned int) ScaleQuantumToLong(GetPixelOpacity(p));
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=(unsigned int) ScaleQuantumToLong(GetIndexPixelComponent(
+                *q=(unsigned int) ScaleQuantumToLong(GetPixelIndex(
                   indexes+x));
               break;
             }
@@ -2112,9 +2112,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=ScaleQuantumToLong(GetPixelRed(p));
             p++;
           }
           break;
@@ -2126,10 +2126,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+            *q++=ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=ScaleQuantumToLong(GetPixelRed(p));
+            *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -2141,9 +2141,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=ScaleQuantumToLong(GetPixelRed(p));
             *q++=0;
             p++;
           }
@@ -2168,9 +2168,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToLong(GetPixelRed(p));
+            *q++=ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=ScaleQuantumToLong(GetPixelBlue(p));
             p++;
           }
           break;
@@ -2182,10 +2182,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+            *q++=ScaleQuantumToLong(GetPixelRed(p));
+            *q++=ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=ScaleQuantumToLong(GetPixelBlue(p));
+            *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -2197,9 +2197,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToLong(GetPixelRed(p));
+            *q++=ScaleQuantumToLong(GetPixelGreen(p));
+            *q++=ScaleQuantumToLong(GetPixelBlue(p));
             *q++=0;
             p++;
           }
@@ -2219,35 +2219,35 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=ScaleQuantumToLong(GetRedPixelComponent(p));
+              *q=ScaleQuantumToLong(GetPixelRed(p));
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=ScaleQuantumToLong(GetGreenPixelComponent(p));
+              *q=ScaleQuantumToLong(GetPixelGreen(p));
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=ScaleQuantumToLong(GetBluePixelComponent(p));
+              *q=ScaleQuantumToLong(GetPixelBlue(p));
               break;
             }
             case AlphaQuantum:
             {
-              *q=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+              *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
               break;
             }
             case OpacityQuantum:
             {
-              *q=ScaleQuantumToLong(GetOpacityPixelComponent(p));
+              *q=ScaleQuantumToLong(GetPixelOpacity(p));
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+                *q=ScaleQuantumToLong(GetPixelIndex(indexes+x));
               break;
             }
             case IndexQuantum:
@@ -2277,9 +2277,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=GetBluePixelComponent(p);
-            *q++=GetGreenPixelComponent(p);
-            *q++=GetRedPixelComponent(p);
+            *q++=GetPixelBlue(p);
+            *q++=GetPixelGreen(p);
+            *q++=GetPixelRed(p);
             p++;
           }
           break;
@@ -2291,10 +2291,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=GetBluePixelComponent(p);
-            *q++=GetGreenPixelComponent(p);
-            *q++=GetRedPixelComponent(p);
-            *q++=(Quantum) (GetAlphaPixelComponent(p));
+            *q++=GetPixelBlue(p);
+            *q++=GetPixelGreen(p);
+            *q++=GetPixelRed(p);
+            *q++=(Quantum) (GetPixelAlpha(p));
             p++;
           }
           break;
@@ -2306,9 +2306,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=GetBluePixelComponent(p);
-            *q++=GetGreenPixelComponent(p);
-            *q++=GetRedPixelComponent(p);
+            *q++=GetPixelBlue(p);
+            *q++=GetPixelGreen(p);
+            *q++=GetPixelRed(p);
             *q++=0;
             p++;
           }
@@ -2333,9 +2333,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=GetRedPixelComponent(p);
-            *q++=GetGreenPixelComponent(p);
-            *q++=GetBluePixelComponent(p);
+            *q++=GetPixelRed(p);
+            *q++=GetPixelGreen(p);
+            *q++=GetPixelBlue(p);
             p++;
           }
           break;
@@ -2347,10 +2347,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=GetRedPixelComponent(p);
-            *q++=GetGreenPixelComponent(p);
-            *q++=GetBluePixelComponent(p);
-            *q++=(Quantum) (GetAlphaPixelComponent(p));
+            *q++=GetPixelRed(p);
+            *q++=GetPixelGreen(p);
+            *q++=GetPixelBlue(p);
+            *q++=(Quantum) (GetPixelAlpha(p));
             p++;
           }
           break;
@@ -2362,9 +2362,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=GetRedPixelComponent(p);
-            *q++=GetGreenPixelComponent(p);
-            *q++=GetBluePixelComponent(p);
+            *q++=GetPixelRed(p);
+            *q++=GetPixelGreen(p);
+            *q++=GetPixelBlue(p);
             *q++=0U;
             p++;
           }
@@ -2384,35 +2384,35 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=GetRedPixelComponent(p);
+              *q=GetPixelRed(p);
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=GetGreenPixelComponent(p);
+              *q=GetPixelGreen(p);
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=GetBluePixelComponent(p);
+              *q=GetPixelBlue(p);
               break;
             }
             case AlphaQuantum:
             {
-              *q=(Quantum) (GetAlphaPixelComponent(p));
+              *q=(Quantum) (GetPixelAlpha(p));
               break;
             }
             case OpacityQuantum:
             {
-              *q=GetOpacityPixelComponent(p);
+              *q=GetPixelOpacity(p);
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=GetIndexPixelComponent(indexes+x);
+                *q=GetPixelIndex(indexes+x);
               break;
             }
             case IndexQuantum:
@@ -2442,9 +2442,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToShort(GetPixelBlue(p));
+            *q++=ScaleQuantumToShort(GetPixelGreen(p));
+            *q++=ScaleQuantumToShort(GetPixelRed(p));
             p++;
           }
           break;
@@ -2456,10 +2456,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+            *q++=ScaleQuantumToShort(GetPixelBlue(p));
+            *q++=ScaleQuantumToShort(GetPixelGreen(p));
+            *q++=ScaleQuantumToShort(GetPixelRed(p));
+            *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -2471,9 +2471,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+            *q++=ScaleQuantumToShort(GetPixelBlue(p));
+            *q++=ScaleQuantumToShort(GetPixelGreen(p));
+            *q++=ScaleQuantumToShort(GetPixelRed(p));
             *q++=0;
             p++;
           }
@@ -2498,9 +2498,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToShort(GetPixelRed(p));
+            *q++=ScaleQuantumToShort(GetPixelGreen(p));
+            *q++=ScaleQuantumToShort(GetPixelBlue(p));
             p++;
           }
           break;
@@ -2512,10 +2512,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
-            *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+            *q++=ScaleQuantumToShort(GetPixelRed(p));
+            *q++=ScaleQuantumToShort(GetPixelGreen(p));
+            *q++=ScaleQuantumToShort(GetPixelBlue(p));
+            *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
             p++;
           }
           break;
@@ -2527,9 +2527,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             break;
           for (x=0; x < (ssize_t) GetImageExtent(image); x++)
           {
-            *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
-            *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+            *q++=ScaleQuantumToShort(GetPixelRed(p));
+            *q++=ScaleQuantumToShort(GetPixelGreen(p));
+            *q++=ScaleQuantumToShort(GetPixelBlue(p));
             *q++=0;
             p++;
           }
@@ -2549,35 +2549,35 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
             case RedQuantum:
             case CyanQuantum:
             {
-              *q=ScaleQuantumToShort(GetRedPixelComponent(p));
+              *q=ScaleQuantumToShort(GetPixelRed(p));
               break;
             }
             case GreenQuantum:
             case MagentaQuantum:
             {
-              *q=ScaleQuantumToShort(GetGreenPixelComponent(p));
+              *q=ScaleQuantumToShort(GetPixelGreen(p));
               break;
             }
             case BlueQuantum:
             case YellowQuantum:
             {
-              *q=ScaleQuantumToShort(GetBluePixelComponent(p));
+              *q=ScaleQuantumToShort(GetPixelBlue(p));
               break;
             }
             case AlphaQuantum:
             {
-              *q=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+              *q=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
               break;
             }
             case OpacityQuantum:
             {
-              *q=ScaleQuantumToShort(GetOpacityPixelComponent(p));
+              *q=ScaleQuantumToShort(GetPixelOpacity(p));
               break;
             }
             case BlackQuantum:
             {
               if (image->colorspace == CMYKColorspace)
-                *q=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+                *q=ScaleQuantumToShort(GetPixelIndex(indexes+x));
               break;
             }
             case IndexQuantum:
index 532ed1d6bcf175de260c3aef8d79c1f8cf912620..c2bd371e1a55a90b8eee48f12f9f66730e8dc6f7 100644 (file)
@@ -257,7 +257,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
           pixel.blue+=r[u].blue;
           pixel.opacity+=r[u].opacity;
           if (image->colorspace == CMYKColorspace)
-            pixel.index=(MagickRealType) GetIndexPixelComponent(
+            pixel.index=(MagickRealType) GetPixelIndex(
               indexes+x+(r-p)+u);
         }
         r+=image->columns+width;
@@ -268,17 +268,17 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
       mean.opacity=(MagickRealType) (pixel.opacity/number_pixels+offset);
       if (image->colorspace == CMYKColorspace)
         mean.index=(MagickRealType) (pixel.index/number_pixels+offset);
-      SetRedPixelComponent(q,((MagickRealType) GetRedPixelComponent(q) <=
+      SetPixelRed(q,((MagickRealType) GetPixelRed(q) <=
         mean.red) ? 0 : QuantumRange);
-      SetGreenPixelComponent(q,((MagickRealType) GetGreenPixelComponent(q) <=
+      SetPixelGreen(q,((MagickRealType) GetPixelGreen(q) <=
         mean.green) ? 0 : QuantumRange);
-      SetBluePixelComponent(q,((MagickRealType) GetBluePixelComponent(q) <=
+      SetPixelBlue(q,((MagickRealType) GetPixelBlue(q) <=
         mean.blue) ? 0 : QuantumRange);
-      SetOpacityPixelComponent(q,((MagickRealType) GetOpacityPixelComponent(q)
+      SetPixelOpacity(q,((MagickRealType) GetPixelOpacity(q)
         <= mean.opacity) ? 0 : QuantumRange);
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(threshold_indexes+x,(((MagickRealType)
-          GetIndexPixelComponent(threshold_indexes+x) <= mean.index) ? 0 :
+        SetPixelIndex(threshold_indexes+x,(((MagickRealType)
+          GetPixelIndex(threshold_indexes+x) <= mean.index) ? 0 :
           QuantumRange));
       p++;
       q++;
@@ -419,10 +419,10 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRedPixelComponent(q,(MagickRealType) PixelIntensityToQuantum(q) <=
+          SetPixelRed(q,(MagickRealType) PixelIntensityToQuantum(q) <=
             threshold ? 0 : QuantumRange);
-          SetGreenPixelComponent(q,GetRedPixelComponent(q));
-          SetBluePixelComponent(q,GetRedPixelComponent(q));
+          SetPixelGreen(q,GetPixelRed(q));
+          SetPixelBlue(q,GetPixelRed(q));
           q++;
         }
       }
@@ -430,28 +430,28 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         if ((channel & RedChannel) != 0)
-          SetRedPixelComponent(q,(MagickRealType) GetRedPixelComponent(q) <=
+          SetPixelRed(q,(MagickRealType) GetPixelRed(q) <=
             threshold ? 0 : QuantumRange);
         if ((channel & GreenChannel) != 0)
-          SetGreenPixelComponent(q,(MagickRealType) GetGreenPixelComponent(q) <=
+          SetPixelGreen(q,(MagickRealType) GetPixelGreen(q) <=
             threshold ? 0 : QuantumRange);
         if ((channel & BlueChannel) != 0)
-          SetBluePixelComponent(q,(MagickRealType) GetBluePixelComponent(q) <=
+          SetPixelBlue(q,(MagickRealType) GetPixelBlue(q) <=
             threshold ? 0 : QuantumRange);
         if ((channel & OpacityChannel) != 0)
           {
             if (image->matte == MagickFalse)
-              SetOpacityPixelComponent(q,(MagickRealType)
-                GetOpacityPixelComponent(q) <= threshold ? 0 : QuantumRange);
+              SetPixelOpacity(q,(MagickRealType)
+                GetPixelOpacity(q) <= threshold ? 0 : QuantumRange);
             else
-              SetOpacityPixelComponent(q,(MagickRealType)
-                GetOpacityPixelComponent(q) <= threshold ? OpaqueOpacity :
+              SetPixelOpacity(q,(MagickRealType)
+                GetPixelOpacity(q) <= threshold ? OpaqueOpacity :
                 TransparentOpacity);
           }
         if (((channel & IndexChannel) != 0) &&
             (image->colorspace == CMYKColorspace))
-          SetIndexPixelComponent(indexes+x,(MagickRealType)
-            GetIndexPixelComponent(indexes+x) <= threshold ? 0 : QuantumRange);
+          SetPixelIndex(indexes+x,(MagickRealType)
+            GetPixelIndex(indexes+x) <= threshold ? 0 : QuantumRange);
         q++;
       }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -610,32 +610,32 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image,
         {
           if (PixelIntensity(q) < MagickPixelIntensity(&threshold))
             {
-              SetRedPixelComponent(q,0);
-              SetGreenPixelComponent(q,0);
-              SetBluePixelComponent(q,0);
+              SetPixelRed(q,0);
+              SetPixelGreen(q,0);
+              SetPixelBlue(q,0);
               if (image->colorspace == CMYKColorspace)
-                SetIndexPixelComponent(indexes+x,0);
+                SetPixelIndex(indexes+x,0);
             }
         }
       else
         {
           if (((channel & RedChannel) != 0) &&
-              ((MagickRealType) GetRedPixelComponent(q) < threshold.red))
-            SetRedPixelComponent(q,0);
+              ((MagickRealType) GetPixelRed(q) < threshold.red))
+            SetPixelRed(q,0);
           if (((channel & GreenChannel) != 0) &&
-              ((MagickRealType) GetGreenPixelComponent(q) < threshold.green))
-            SetGreenPixelComponent(q,0);
+              ((MagickRealType) GetPixelGreen(q) < threshold.green))
+            SetPixelGreen(q,0);
           if (((channel & BlueChannel) != 0) &&
-              ((MagickRealType) GetBluePixelComponent(q) < threshold.blue))
-            SetBluePixelComponent(q,0);
+              ((MagickRealType) GetPixelBlue(q) < threshold.blue))
+            SetPixelBlue(q,0);
           if (((channel & OpacityChannel) != 0) &&
-              ((MagickRealType) GetOpacityPixelComponent(q) < threshold.opacity))
-            SetOpacityPixelComponent(q,0);
+              ((MagickRealType) GetPixelOpacity(q) < threshold.opacity))
+            SetPixelOpacity(q,0);
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace) &&
-              ((MagickRealType) GetIndexPixelComponent(indexes+x) <
+              ((MagickRealType) GetPixelIndex(indexes+x) <
               threshold.index))
-            SetIndexPixelComponent(indexes+x,0);
+            SetPixelIndex(indexes+x,0);
         }
       q++;
     }
@@ -743,14 +743,14 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image,
       q=image->colormap;
       for (i=0; i < (ssize_t) image->colors; i++)
       {
-        SetRedPixelComponent(q,ClampToUnsignedQuantum(
-          GetRedPixelComponent(q)));
-        SetGreenPixelComponent(q,ClampToUnsignedQuantum(
-          GetGreenPixelComponent(q)));
-        SetBluePixelComponent(q,ClampToUnsignedQuantum(
-          GetBluePixelComponent(q)));
-        SetOpacityPixelComponent(q,ClampToUnsignedQuantum(
-          GetOpacityPixelComponent(q)));
+        SetPixelRed(q,ClampToUnsignedQuantum(
+          GetPixelRed(q)));
+        SetPixelGreen(q,ClampToUnsignedQuantum(
+          GetPixelGreen(q)));
+        SetPixelBlue(q,ClampToUnsignedQuantum(
+          GetPixelBlue(q)));
+        SetPixelOpacity(q,ClampToUnsignedQuantum(
+          GetPixelOpacity(q)));
         q++;
       }
       return(SyncImage(image));
@@ -788,21 +788,21 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,ClampToUnsignedQuantum(
-          GetRedPixelComponent(q)));
+        SetPixelRed(q,ClampToUnsignedQuantum(
+          GetPixelRed(q)));
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,ClampToUnsignedQuantum(
-          GetGreenPixelComponent(q)));
+        SetPixelGreen(q,ClampToUnsignedQuantum(
+          GetPixelGreen(q)));
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,ClampToUnsignedQuantum(
-          GetBluePixelComponent(q)));
+        SetPixelBlue(q,ClampToUnsignedQuantum(
+          GetPixelBlue(q)));
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,ClampToUnsignedQuantum(
-          GetOpacityPixelComponent(q)));
+        SetPixelOpacity(q,ClampToUnsignedQuantum(
+          GetPixelOpacity(q)));
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,ClampToUnsignedQuantum(
-          GetIndexPixelComponent(indexes+x)));
+        SetPixelIndex(indexes+x,ClampToUnsignedQuantum(
+          GetPixelIndex(indexes+x)));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1550,38 +1550,38 @@ printf("DEBUG levels  r=%u g=%u b=%u a=%u i=%u\n",
               Opacity is inverted so 'off' represents transparent.
         */
         if (levels.red) {
-          t = (ssize_t) (QuantumScale*GetRedPixelComponent(q)*(levels.red*d+1));
+          t = (ssize_t) (QuantumScale*GetPixelRed(q)*(levels.red*d+1));
           l = t/d;  t = t-l*d;
-          SetRedPixelComponent(q,RoundToQuantum((MagickRealType)
+          SetPixelRed(q,RoundToQuantum((MagickRealType)
             ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.red)));
         }
         if (levels.green) {
-          t = (ssize_t) (QuantumScale*GetGreenPixelComponent(q)*
+          t = (ssize_t) (QuantumScale*GetPixelGreen(q)*
             (levels.green*d+1));
           l = t/d;  t = t-l*d;
-          SetGreenPixelComponent(q,RoundToQuantum((MagickRealType)
+          SetPixelGreen(q,RoundToQuantum((MagickRealType)
             ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.green)));
         }
         if (levels.blue) {
-          t = (ssize_t) (QuantumScale*GetBluePixelComponent(q)*
+          t = (ssize_t) (QuantumScale*GetPixelBlue(q)*
             (levels.blue*d+1));
           l = t/d;  t = t-l*d;
-          SetBluePixelComponent(q,RoundToQuantum((MagickRealType)
+          SetPixelBlue(q,RoundToQuantum((MagickRealType)
             ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.blue)));
         }
         if (levels.opacity) {
-          t = (ssize_t) ((1.0-QuantumScale*GetOpacityPixelComponent(q))*
+          t = (ssize_t) ((1.0-QuantumScale*GetPixelOpacity(q))*
             (levels.opacity*d+1));
           l = t/d;  t = t-l*d;
-          SetOpacityPixelComponent(q,RoundToQuantum((MagickRealType)
+          SetPixelOpacity(q,RoundToQuantum((MagickRealType)
             ((1.0-l-(t >= threshold))*(MagickRealType) QuantumRange/
             levels.opacity)));
         }
         if (levels.index) {
-          t = (ssize_t) (QuantumScale*GetIndexPixelComponent(indexes+x)*
+          t = (ssize_t) (QuantumScale*GetPixelIndex(indexes+x)*
             (levels.index*d+1));
           l = t/d;  t = t-l*d;
-          SetIndexPixelComponent(indexes+x,RoundToQuantum((MagickRealType) ((l+
+          SetPixelIndex(indexes+x,RoundToQuantum((MagickRealType) ((l+
             (t>=threshold))*(MagickRealType) QuantumRange/levels.index)));
         }
         q++;
@@ -1778,8 +1778,8 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
             threshold.index=(MagickRealType)(QuantumRange*
               GetPseudoRandomValue(random_info[id]));
           index=(IndexPacket) (intensity <= threshold.index ? 0 : 1);
-          SetIndexPixelComponent(indexes+x,index);
-          SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+          SetPixelIndex(indexes+x,index);
+          SetPixelRGBO(q,image->colormap+(ssize_t) index);
           q++;
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1840,10 +1840,10 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
     {
       if ((channel & RedChannel) != 0)
         {
-          if ((MagickRealType) GetRedPixelComponent(q) < min_threshold)
+          if ((MagickRealType) GetPixelRed(q) < min_threshold)
             threshold.red=min_threshold;
           else
-            if ((MagickRealType) GetRedPixelComponent(q) > max_threshold)
+            if ((MagickRealType) GetPixelRed(q) > max_threshold)
               threshold.red=max_threshold;
             else
               threshold.red=(MagickRealType) (QuantumRange*
@@ -1851,10 +1851,10 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
         }
       if ((channel & GreenChannel) != 0)
         {
-          if ((MagickRealType) GetGreenPixelComponent(q) < min_threshold)
+          if ((MagickRealType) GetPixelGreen(q) < min_threshold)
             threshold.green=min_threshold;
           else
-            if ((MagickRealType) GetGreenPixelComponent(q) > max_threshold)
+            if ((MagickRealType) GetPixelGreen(q) > max_threshold)
               threshold.green=max_threshold;
             else
               threshold.green=(MagickRealType) (QuantumRange*
@@ -1862,10 +1862,10 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
         }
       if ((channel & BlueChannel) != 0)
         {
-          if ((MagickRealType) GetBluePixelComponent(q) < min_threshold)
+          if ((MagickRealType) GetPixelBlue(q) < min_threshold)
             threshold.blue=min_threshold;
           else
-            if ((MagickRealType) GetBluePixelComponent(q) > max_threshold)
+            if ((MagickRealType) GetPixelBlue(q) > max_threshold)
               threshold.blue=max_threshold;
             else
               threshold.blue=(MagickRealType) (QuantumRange*
@@ -1873,10 +1873,10 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
         }
       if ((channel & OpacityChannel) != 0)
         {
-          if ((MagickRealType) GetOpacityPixelComponent(q) < min_threshold)
+          if ((MagickRealType) GetPixelOpacity(q) < min_threshold)
             threshold.opacity=min_threshold;
           else
-            if ((MagickRealType) GetOpacityPixelComponent(q) > max_threshold)
+            if ((MagickRealType) GetPixelOpacity(q) > max_threshold)
               threshold.opacity=max_threshold;
             else
               threshold.opacity=(MagickRealType) (QuantumRange*
@@ -1885,31 +1885,31 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
         {
-          if ((MagickRealType) GetIndexPixelComponent(indexes+x) < min_threshold)
+          if ((MagickRealType) GetPixelIndex(indexes+x) < min_threshold)
             threshold.index=min_threshold;
           else
-            if ((MagickRealType) GetIndexPixelComponent(indexes+x) > max_threshold)
+            if ((MagickRealType) GetPixelIndex(indexes+x) > max_threshold)
               threshold.index=max_threshold;
             else
               threshold.index=(MagickRealType) (QuantumRange*
                 GetPseudoRandomValue(random_info[id]));
         }
       if ((channel & RedChannel) != 0)
-        SetRedPixelComponent(q,(MagickRealType) GetRedPixelComponent(q) <=
+        SetPixelRed(q,(MagickRealType) GetPixelRed(q) <=
           threshold.red ? 0 : QuantumRange);
       if ((channel & GreenChannel) != 0)
-        SetGreenPixelComponent(q,(MagickRealType) GetGreenPixelComponent(q) <=
+        SetPixelGreen(q,(MagickRealType) GetPixelGreen(q) <=
           threshold.green ? 0 : QuantumRange);
       if ((channel & BlueChannel) != 0)
-        SetBluePixelComponent(q,(MagickRealType) GetBluePixelComponent(q) <=
+        SetPixelBlue(q,(MagickRealType) GetPixelBlue(q) <=
           threshold.blue ? 0 : QuantumRange);
       if ((channel & OpacityChannel) != 0)
-        SetOpacityPixelComponent(q,(MagickRealType) GetOpacityPixelComponent(q)
+        SetPixelOpacity(q,(MagickRealType) GetPixelOpacity(q)
           <= threshold.opacity ? 0 : QuantumRange);
       if (((channel & IndexChannel) != 0) &&
           (image->colorspace == CMYKColorspace))
-        SetIndexPixelComponent(indexes+x,(MagickRealType)
-          GetIndexPixelComponent(indexes+x) <= threshold.index ? 0 :
+        SetPixelIndex(indexes+x,(MagickRealType)
+          GetPixelIndex(indexes+x) <= threshold.index ? 0 :
           QuantumRange);
       q++;
     }
@@ -2070,32 +2070,32 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image,
         {
           if (PixelIntensity(q) > MagickPixelIntensity(&threshold))
             {
-              SetRedPixelComponent(q,QuantumRange);
-              SetGreenPixelComponent(q,QuantumRange);
-              SetBluePixelComponent(q,QuantumRange);
+              SetPixelRed(q,QuantumRange);
+              SetPixelGreen(q,QuantumRange);
+              SetPixelBlue(q,QuantumRange);
               if (image->colorspace == CMYKColorspace)
-                SetIndexPixelComponent(indexes+x,QuantumRange);
+                SetPixelIndex(indexes+x,QuantumRange);
             }
         }
       else
         {
           if (((channel & RedChannel) != 0) &&
-              ((MagickRealType) GetRedPixelComponent(q) > threshold.red))
-            SetRedPixelComponent(q,QuantumRange);
+              ((MagickRealType) GetPixelRed(q) > threshold.red))
+            SetPixelRed(q,QuantumRange);
           if (((channel & GreenChannel) != 0) &&
-              ((MagickRealType) GetGreenPixelComponent(q) > threshold.green))
-            SetGreenPixelComponent(q,QuantumRange);
+              ((MagickRealType) GetPixelGreen(q) > threshold.green))
+            SetPixelGreen(q,QuantumRange);
           if (((channel & BlueChannel) != 0) &&
-              ((MagickRealType) GetBluePixelComponent(q) > threshold.blue))
-            SetBluePixelComponent(q,QuantumRange);
+              ((MagickRealType) GetPixelBlue(q) > threshold.blue))
+            SetPixelBlue(q,QuantumRange);
           if (((channel & OpacityChannel) != 0) &&
-              ((MagickRealType) GetOpacityPixelComponent(q) > threshold.opacity))
-            SetOpacityPixelComponent(q,QuantumRange);
+              ((MagickRealType) GetPixelOpacity(q) > threshold.opacity))
+            SetPixelOpacity(q,QuantumRange);
           if (((channel & IndexChannel) != 0) &&
               (image->colorspace == CMYKColorspace) &&
-              ((MagickRealType) GetIndexPixelComponent(indexes+x)) >
+              ((MagickRealType) GetPixelIndex(indexes+x)) >
               threshold.index)
-            SetIndexPixelComponent(indexes+x,QuantumRange);
+            SetPixelIndex(indexes+x,QuantumRange);
         }
       q++;
     }
index 70168ffffb07583448529bf08424e446df55b9bd..65f16d233bc949d0b55b4676a29942601b24637b 100644 (file)
@@ -197,7 +197,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
           if (indexes != (IndexPacket *) NULL)
             {
               if (chop_indexes != (IndexPacket *) NULL)
-                *chop_indexes++=GetIndexPixelComponent(indexes+x);
+                *chop_indexes++=GetPixelIndex(indexes+x);
             }
           q++;
         }
@@ -260,7 +260,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
           if (indexes != (IndexPacket *) NULL)
             {
               if (chop_indexes != (IndexPacket *) NULL)
-                *chop_indexes++=GetIndexPixelComponent(indexes+x);
+                *chop_indexes++=GetPixelIndex(indexes+x);
             }
           q++;
         }
@@ -368,7 +368,7 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
         break;
       for (x=0; x < (ssize_t) images->columns; x++)
       {
-        SetRedPixelComponent(q,QuantumRange-PixelIntensityToQuantum(p));
+        SetPixelRed(q,QuantumRange-PixelIntensityToQuantum(p));
         p++;
         q++;
       }
@@ -468,7 +468,7 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       indexes=GetCacheViewAuthenticIndexQueue(cmyk_view);
       for (x=0; x < (ssize_t) images->columns; x++)
       {
-        SetIndexPixelComponent(indexes+x,QuantumRange-
+        SetPixelIndex(indexes+x,QuantumRange-
           PixelIntensityToQuantum(p));
         p++;
       }
@@ -1402,8 +1402,8 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
       (*--q)=(*p++);
       if ((indexes != (const IndexPacket *) NULL) &&
           (flop_indexes != (IndexPacket *) NULL))
-        SetIndexPixelComponent(flop_indexes+flop_image->columns-x-1,
-         GetIndexPixelComponent( indexes+x));
+        SetPixelIndex(flop_indexes+flop_image->columns-x-1,
+         GetPixelIndex( indexes+x));
     }
     if (SyncCacheViewAuthenticPixels(flop_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1822,15 +1822,15 @@ MagickExport Image *SpliceImage(const Image *image,
     splice_indexes=GetCacheViewAuthenticIndexQueue(splice_view);
     for (x=0; x < splice_geometry.x; x++)
     {
-      SetRedPixelComponent(q,GetRedPixelComponent(p));
-      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-      SetBluePixelComponent(q,GetBluePixelComponent(p));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,GetPixelRed(p));
+      SetPixelGreen(q,GetPixelGreen(p));
+      SetPixelBlue(q,GetPixelBlue(p));
+      SetPixelOpacity(q,OpaqueOpacity);
       if (image->matte != MagickFalse)
-        SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+        SetPixelOpacity(q,GetPixelOpacity(p));
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(splice_indexes+x,
-          GetIndexPixelComponent(indexes));
+        SetPixelIndex(splice_indexes+x,
+          GetPixelIndex(indexes));
       indexes++;
       p++;
       q++;
@@ -1839,15 +1839,15 @@ MagickExport Image *SpliceImage(const Image *image,
       q++;
     for ( ; x < (ssize_t) splice_image->columns; x++)
     {
-      SetRedPixelComponent(q,GetRedPixelComponent(p));
-      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-      SetBluePixelComponent(q,GetBluePixelComponent(p));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,GetPixelRed(p));
+      SetPixelGreen(q,GetPixelGreen(p));
+      SetPixelBlue(q,GetPixelBlue(p));
+      SetPixelOpacity(q,OpaqueOpacity);
       if (image->matte != MagickFalse)
-        SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+        SetPixelOpacity(q,GetPixelOpacity(p));
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(splice_indexes+x,
-          GetIndexPixelComponent(indexes));
+        SetPixelIndex(splice_indexes+x,
+          GetPixelIndex(indexes));
       indexes++;
       p++;
       q++;
@@ -1904,15 +1904,15 @@ MagickExport Image *SpliceImage(const Image *image,
     splice_indexes=GetCacheViewAuthenticIndexQueue(splice_view);
     for (x=0; x < splice_geometry.x; x++)
     {
-      SetRedPixelComponent(q,GetRedPixelComponent(p));
-      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-      SetBluePixelComponent(q,GetBluePixelComponent(p));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,GetPixelRed(p));
+      SetPixelGreen(q,GetPixelGreen(p));
+      SetPixelBlue(q,GetPixelBlue(p));
+      SetPixelOpacity(q,OpaqueOpacity);
       if (image->matte != MagickFalse)
-        SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+        SetPixelOpacity(q,GetPixelOpacity(p));
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(splice_indexes+x,
-           GetIndexPixelComponent(indexes));
+        SetPixelIndex(splice_indexes+x,
+           GetPixelIndex(indexes));
       indexes++;
       p++;
       q++;
@@ -1921,15 +1921,15 @@ MagickExport Image *SpliceImage(const Image *image,
       q++;
     for ( ; x < (ssize_t) splice_image->columns; x++)
     {
-      SetRedPixelComponent(q,GetRedPixelComponent(p));
-      SetGreenPixelComponent(q,GetGreenPixelComponent(p));
-      SetBluePixelComponent(q,GetBluePixelComponent(p));
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelRed(q,GetPixelRed(p));
+      SetPixelGreen(q,GetPixelGreen(p));
+      SetPixelBlue(q,GetPixelBlue(p));
+      SetPixelOpacity(q,OpaqueOpacity);
       if (image->matte != MagickFalse)
-        SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+        SetPixelOpacity(q,GetPixelOpacity(p));
       if (image->colorspace == CMYKColorspace)
-        SetIndexPixelComponent(splice_indexes+x,
-          GetIndexPixelComponent(indexes));
+        SetPixelIndex(splice_indexes+x,
+          GetPixelIndex(indexes));
       indexes++;
       p++;
       q++;
@@ -2359,8 +2359,8 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception)
         transverse_indexes=GetCacheViewAuthenticIndexQueue(transverse_view);
         if (transverse_indexes != (IndexPacket *) NULL)
           for (x=0; x < (ssize_t) image->columns; x++)
-            SetIndexPixelComponent(transverse_indexes+image->columns-x-1,
-              GetIndexPixelComponent(indexes+x));
+            SetPixelIndex(transverse_indexes+image->columns-x-1,
+              GetPixelIndex(indexes+x));
       }
     sync=SyncCacheViewAuthenticPixels(transverse_view,exception);
     if (sync == MagickFalse)
index 4c33ed2c1b2341c6d9a9945ca2b330418435b67b..f9c9e15f3b8037c542160c8b915ad3cf95a8fd23 100644 (file)
@@ -34,8 +34,8 @@ extern "C" {
 #define MagickLibAddendum  "-9"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-06-15"
-#define MagickChangeDate   "20110615"
+#define MagickReleaseDate  "2011-06-25"
+#define MagickChangeDate   "20110618"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "
index 65edc695267cef65c0e3175e983466ddd3ec0317..dfedc336a891a3ae82f9c1db0b627332f14ff869 100644 (file)
@@ -561,29 +561,29 @@ MagickExport MagickBooleanType XAnnotateImage(Display *display,
       break;
     for (x=0; x < (int) annotate_image->columns; x++)
     {
-      SetOpacityPixelComponent(q,OpaqueOpacity);
+      SetPixelOpacity(q,OpaqueOpacity);
       if (XGetPixel(annotate_ximage,x,y) == 0)
         {
           /*
             Set this pixel to the background color.
           */
-          SetRedPixelComponent(q,ScaleShortToQuantum(pixel->box_color.red));
-          SetGreenPixelComponent(q,ScaleShortToQuantum(pixel->box_color.green));
-          SetBluePixelComponent(q,ScaleShortToQuantum(pixel->box_color.blue));
+          SetPixelRed(q,ScaleShortToQuantum(pixel->box_color.red));
+          SetPixelGreen(q,ScaleShortToQuantum(pixel->box_color.green));
+          SetPixelBlue(q,ScaleShortToQuantum(pixel->box_color.blue));
           if ((annotate_info->stencil == ForegroundStencil) ||
               (annotate_info->stencil == OpaqueStencil))
-            SetOpacityPixelComponent(q,TransparentOpacity);
+            SetPixelOpacity(q,TransparentOpacity);
         }
       else
         {
           /*
             Set this pixel to the pen color.
           */
-          SetRedPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.red));
-          SetGreenPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.green));
-          SetBluePixelComponent(q,ScaleShortToQuantum(pixel->pen_color.blue));
+          SetPixelRed(q,ScaleShortToQuantum(pixel->pen_color.red));
+          SetPixelGreen(q,ScaleShortToQuantum(pixel->pen_color.green));
+          SetPixelBlue(q,ScaleShortToQuantum(pixel->pen_color.blue));
           if (annotate_info->stencil == BackgroundStencil)
-            SetOpacityPixelComponent(q,TransparentOpacity);
+            SetPixelOpacity(q,TransparentOpacity);
         }
       q++;
     }
@@ -2207,11 +2207,11 @@ static void XDitherImage(Image *image,XImage *ximage)
     for (x=0; x < (int) image->columns; x++)
     {
       color.red=ClampToQuantum((MagickRealType) (red_map[i][j][(int)
-        ScaleQuantumToChar(GetRedPixelComponent(p))] << 8));
+        ScaleQuantumToChar(GetPixelRed(p))] << 8));
       color.green=ClampToQuantum((MagickRealType) (green_map[i][j][(int)
-        ScaleQuantumToChar(GetGreenPixelComponent(p))] << 8));
+        ScaleQuantumToChar(GetPixelGreen(p))] << 8));
       color.blue=ClampToQuantum((MagickRealType) (blue_map[i][j][(int)
-        ScaleQuantumToChar(GetBluePixelComponent(p))] << 8));
+        ScaleQuantumToChar(GetPixelBlue(p))] << 8));
       pixel=(size_t) (((size_t) color.red & 0xe0) |
         (((size_t) color.green & 0xe0) >> 3) |
         (((size_t) color.blue & 0xc0) >> 6));
@@ -2483,10 +2483,10 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
           /*
             Set this pixel to the pen color.
           */
-          SetRedPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.red));
-          SetGreenPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.green));
-          SetBluePixelComponent(q,ScaleShortToQuantum(pixel->pen_color.blue));
-          SetOpacityPixelComponent(q,(Quantum) (draw_info->stencil ==
+          SetPixelRed(q,ScaleShortToQuantum(pixel->pen_color.red));
+          SetPixelGreen(q,ScaleShortToQuantum(pixel->pen_color.green));
+          SetPixelBlue(q,ScaleShortToQuantum(pixel->pen_color.blue));
+          SetPixelOpacity(q,(Quantum) (draw_info->stencil ==
             OpaqueStencil ? OpaqueOpacity : TransparentOpacity));
         }
       q++;
@@ -2592,7 +2592,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
     for (x=0; x < (int) draw_image->columns; x++)
     {
       if (q->opacity != (Quantum) TransparentOpacity)
-        SetOpacityPixelComponent(q,OpaqueOpacity);
+        SetPixelOpacity(q,OpaqueOpacity);
       q++;
     }
     if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
@@ -4382,13 +4382,13 @@ static Image *XGetWindowImage(Display *display,const Window window,
                 {
                   pixel=XGetPixel(ximage,x,y);
                   index=(pixel >> red_shift) & red_mask;
-                  SetRedPixelComponent(q,ScaleShortToQuantum(
+                  SetPixelRed(q,ScaleShortToQuantum(
                     colors[index].red));
                   index=(pixel >> green_shift) & green_mask;
-                  SetGreenPixelComponent(q,ScaleShortToQuantum(
+                  SetPixelGreen(q,ScaleShortToQuantum(
                     colors[index].green));
                   index=(pixel >> blue_shift) & blue_mask;
-                  SetBluePixelComponent(q,ScaleShortToQuantum(
+                  SetPixelBlue(q,ScaleShortToQuantum(
                     colors[index].blue));
                   q++;
                 }
@@ -4407,15 +4407,15 @@ static Image *XGetWindowImage(Display *display,const Window window,
                   pixel=XGetPixel(ximage,x,y);
                   color=(pixel >> red_shift) & red_mask;
                   color=(65535UL*color)/red_mask;
-                  SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+                  SetPixelRed(q,ScaleShortToQuantum((unsigned short)
                     color));
                   color=(pixel >> green_shift) & green_mask;
                   color=(65535UL*color)/green_mask;
-                  SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+                  SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
                     color));
                   color=(pixel >> blue_shift) & blue_mask;
                   color=(65535UL*color)/blue_mask;
-                  SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+                  SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
                     color));
                   q++;
                 }
@@ -4457,8 +4457,8 @@ static Image *XGetWindowImage(Display *display,const Window window,
               for (x=0; x < (int) composite_image->columns; x++)
               {
                 index=(IndexPacket) XGetPixel(ximage,x,y);
-                SetIndexPixelComponent(indexes+x,index);
-                SetRGBOPixelComponents(q,composite_image->colormap+(ssize_t)
+                SetPixelIndex(indexes+x,index);
+                SetPixelRGBO(q,composite_image->colormap+(ssize_t)
                   index);
                 q++;
               }
@@ -5940,7 +5940,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
         for (x=0; x < (int) canvas->columns; x++)
         {
           byte>>=1;
-          if (GetIndexPixelComponent(indexes+x) == (IndexPacket) polarity)
+          if (GetPixelIndex(indexes+x) == (IndexPacket) polarity)
             byte|=foreground;
           else
             byte|=background;
@@ -5979,7 +5979,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
             nibble=0;
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0x0f;
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0x0f;
               switch (nibble)
               {
                 case 0:
@@ -6031,7 +6031,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
             nibble=0;
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0xf;
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
               switch (nibble)
               {
                 case 0:
@@ -6074,7 +6074,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
             indexes=GetCacheViewVirtualIndexQueue(canvas_view);
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
               *q++=(unsigned char) pixel;
             }
             q+=scanline_pad;
@@ -6105,7 +6105,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
             indexes=GetCacheViewVirtualIndexQueue(canvas_view);
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
               for (k=0; k < (int) bytes_per_pixel; k++)
               {
                 channel[k]=(unsigned char) pixel;
@@ -6269,11 +6269,11 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                     for (x=(int) canvas->columns-1; x >= 0; x--)
                     {
                       *q++=ScaleQuantumToChar(XBlueGamma(
-                        GetBluePixelComponent(p)));
+                        GetPixelBlue(p)));
                       *q++=ScaleQuantumToChar(XGreenGamma(
-                        GetGreenPixelComponent(p)));
+                        GetPixelGreen(p)));
                       *q++=ScaleQuantumToChar(XRedGamma(
-                        GetRedPixelComponent(p)));
+                        GetPixelRed(p)));
                       *q++=0;
                       p++;
                     }
@@ -6281,9 +6281,9 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   }
                 for (x=(int) canvas->columns-1; x >= 0; x--)
                 {
-                  *q++=ScaleQuantumToChar((Quantum) GetBluePixelComponent(p));
-                  *q++=ScaleQuantumToChar((Quantum) GetGreenPixelComponent(p));
-                  *q++=ScaleQuantumToChar((Quantum) GetRedPixelComponent(p));
+                  *q++=ScaleQuantumToChar((Quantum) GetPixelBlue(p));
+                  *q++=ScaleQuantumToChar((Quantum) GetPixelGreen(p));
+                  *q++=ScaleQuantumToChar((Quantum) GetPixelRed(p));
                   *q++=0;
                   p++;
                 }
@@ -6313,11 +6313,11 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                       for (x=(int) canvas->columns-1; x >= 0; x--)
                       {
                         *q++=ScaleQuantumToChar(XRedGamma(
-                          GetRedPixelComponent(p)));
+                          GetPixelRed(p)));
                         *q++=ScaleQuantumToChar(XGreenGamma(
-                          GetGreenPixelComponent(p)));
+                          GetPixelGreen(p)));
                         *q++=ScaleQuantumToChar(XBlueGamma(
-                          GetBluePixelComponent(p)));
+                          GetPixelBlue(p)));
                         *q++=0;
                         p++;
                       }
@@ -6326,11 +6326,11 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   for (x=(int) canvas->columns-1; x >= 0; x--)
                   {
                     *q++=ScaleQuantumToChar((Quantum)
-                      GetRedPixelComponent(p));
+                      GetPixelRed(p));
                     *q++=ScaleQuantumToChar((Quantum)
-                      GetGreenPixelComponent(p));
+                      GetPixelGreen(p));
                     *q++=ScaleQuantumToChar((Quantum)
-                      GetBluePixelComponent(p));
+                      GetPixelBlue(p));
                     *q++=0;
                     p++;
                   }
@@ -6394,7 +6394,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
         for (x=(int) canvas->columns-1; x >= 0; x--)
         {
           byte>>=1;
-          if (GetOpacityPixelComponent(p) > (QuantumRange/2))
+          if (GetPixelOpacity(p) > (QuantumRange/2))
             byte|=0x80;
           bit++;
           if (bit == 8)
@@ -6567,7 +6567,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
         for (x=(int) canvas->columns-1; x >= 0; x--)
         {
           byte<<=1;
-          if (GetIndexPixelComponent(indexes+x) == (IndexPacket) polarity)
+          if (GetPixelIndex(indexes+x) == (IndexPacket) polarity)
             byte|=foreground;
           else
             byte|=background;
@@ -6606,7 +6606,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
             nibble=0;
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0xf;
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
               switch (nibble)
               {
                 case 0:
@@ -6658,7 +6658,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
             nibble=0;
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0xf;
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
               switch (nibble)
               {
                 case 0:
@@ -6701,7 +6701,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
             indexes=GetCacheViewVirtualIndexQueue(canvas_view);
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
               *q++=(unsigned char) pixel;
             }
             q+=scanline_pad;
@@ -6732,7 +6732,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
             indexes=GetCacheViewVirtualIndexQueue(canvas_view);
             for (x=0; x < (int) canvas->columns; x++)
             {
-              pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+              pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
               for (k=(int) bytes_per_pixel-1; k >= 0; k--)
               {
                 channel[k]=(unsigned char) pixel;
@@ -6897,11 +6897,11 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                     {
                       *q++=0;
                       *q++=ScaleQuantumToChar(XRedGamma(
-                        GetRedPixelComponent(p)));
+                        GetPixelRed(p)));
                       *q++=ScaleQuantumToChar(XGreenGamma(
-                        GetGreenPixelComponent(p)));
+                        GetPixelGreen(p)));
                       *q++=ScaleQuantumToChar(XBlueGamma(
-                        GetBluePixelComponent(p)));
+                        GetPixelBlue(p)));
                       p++;
                     }
                     continue;
@@ -6909,9 +6909,9 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                 for (x=(int) canvas->columns-1; x >= 0; x--)
                 {
                   *q++=0;
-                  *q++=ScaleQuantumToChar((Quantum) GetRedPixelComponent(p));
-                  *q++=ScaleQuantumToChar((Quantum) GetGreenPixelComponent(p));
-                  *q++=ScaleQuantumToChar((Quantum) GetBluePixelComponent(p));
+                  *q++=ScaleQuantumToChar((Quantum) GetPixelRed(p));
+                  *q++=ScaleQuantumToChar((Quantum) GetPixelGreen(p));
+                  *q++=ScaleQuantumToChar((Quantum) GetPixelBlue(p));
                   p++;
                 }
               }
@@ -6941,11 +6941,11 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                       {
                         *q++=0;
                         *q++=ScaleQuantumToChar(XBlueGamma(
-                          GetBluePixelComponent(p)));
+                          GetPixelBlue(p)));
                         *q++=ScaleQuantumToChar(XGreenGamma(
-                          GetGreenPixelComponent(p)));
+                          GetPixelGreen(p)));
                         *q++=ScaleQuantumToChar(XRedGamma(
-                          GetRedPixelComponent(p)));
+                          GetPixelRed(p)));
                         p++;
                       }
                       continue;
@@ -6954,11 +6954,11 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                   {
                     *q++=0;
                     *q++=ScaleQuantumToChar((Quantum)
-                      GetBluePixelComponent(p));
+                      GetPixelBlue(p));
                     *q++=ScaleQuantumToChar((Quantum)
-                      GetGreenPixelComponent(p));
+                      GetPixelGreen(p));
                     *q++=ScaleQuantumToChar((Quantum)
-                      GetRedPixelComponent(p));
+                      GetPixelRed(p));
                     p++;
                   }
                 }
@@ -7021,7 +7021,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
         for (x=(int) canvas->columns-1; x >= 0; x--)
         {
           byte<<=1;
-          if (GetOpacityPixelComponent(p) > (QuantumRange/2))
+          if (GetPixelOpacity(p) > (QuantumRange/2))
             byte|=0x01;
           bit++;
           if (bit == 8)
@@ -7764,20 +7764,20 @@ MagickExport void XMakeStandardColormap(Display *display,
               {
                 for (i=0; i < (ssize_t) number_colors; i++)
                 {
-                  SetRedPixelComponent(q,0);
+                  SetPixelRed(q,0);
                   if (map_info->red_max != 0)
-                    SetRedPixelComponent(q,ScaleXToQuantum((size_t) (i/
+                    SetPixelRed(q,ScaleXToQuantum((size_t) (i/
                       map_info->red_mult),map_info->red_max));
-                  SetGreenPixelComponent(q,0);
+                  SetPixelGreen(q,0);
                   if (map_info->green_max != 0)
-                    SetGreenPixelComponent(q,ScaleXToQuantum((size_t) ((i/
+                    SetPixelGreen(q,ScaleXToQuantum((size_t) ((i/
                       map_info->green_mult) % (map_info->green_max+1)),
                       map_info->green_max));
-                  SetBluePixelComponent(q,0);
+                  SetPixelBlue(q,0);
                   if (map_info->blue_max != 0)
-                    SetBluePixelComponent(q,ScaleXToQuantum((size_t) (i %
+                    SetPixelBlue(q,ScaleXToQuantum((size_t) (i %
                       map_info->green_mult),map_info->blue_max));
-                  SetOpacityPixelComponent(q,TransparentOpacity);
+                  SetPixelOpacity(q,TransparentOpacity);
                   q++;
                 }
                 (void) SyncAuthenticPixels(affinity_image,exception);
@@ -7965,7 +7965,7 @@ MagickExport void XMakeStandardColormap(Display *display,
               break;
             indexes=GetCacheViewAuthenticIndexQueue(image_view);
             for (x=(int) image->columns-1; x >= 0; x--)
-              diversity[(ssize_t) GetIndexPixelComponent(indexes+x)].count++;
+              diversity[(ssize_t) GetPixelIndex(indexes+x)].count++;
           }
           image_view=DestroyCacheView(image_view);
           /*
index 09fc18d9fe16b9134d0c588ddbe1cb04eca1b8bd..a00ece2ac9c8a6547111a83de0e87a9e0bd23bdb 100644 (file)
@@ -403,11 +403,11 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (source_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetIndex(source->pixel_wands[id][x],
-         GetIndexPixelComponent(indexes+x));
+         GetPixelIndex(indexes+x));
     duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->region.x,y,
       duplex->region.width,1,duplex->exception);
     if (duplex_pixels == (const PixelPacket *) NULL)
@@ -421,11 +421,11 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
     if (duplex_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) duplex->region.width; x++)
         PixelSetBlackQuantum(duplex->pixel_wands[id][x],
-          GetIndexPixelComponent(duplex_indexes+x));
+          GetPixelIndex(duplex_indexes+x));
     if (duplex_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) duplex->region.width; x++)
         PixelSetIndex(duplex->pixel_wands[id][x],
-          GetIndexPixelComponent(duplex_indexes+x));
+          GetPixelIndex(duplex_indexes+x));
     destination_pixels=GetCacheViewAuthenticPixels(destination->view,
       destination->region.x,y,destination->region.width,1,exception);
     if (destination_pixels == (PixelPacket *) NULL)
@@ -440,11 +440,11 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->region.width; x++)
         PixelSetBlackQuantum(destination->pixel_wands[id][x],
-          GetIndexPixelComponent(destination_indexes+x));
+          GetPixelIndex(destination_indexes+x));
     if (destination_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) destination->region.width; x++)
         PixelSetIndex(destination->pixel_wands[id][x],
-          GetIndexPixelComponent(destination_indexes+x));
+          GetPixelIndex(destination_indexes+x));
     if (transfer(source,duplex,destination,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) destination->region.width; x++)
@@ -452,7 +452,7 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
         destination_pixels+x);
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->region.width; x++)
-        SetIndexPixelComponent(destination_indexes+x,PixelGetBlackQuantum(
+        SetPixelIndex(destination_indexes+x,PixelGetBlackQuantum(
           destination->pixel_wands[id][x]));
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -660,11 +660,11 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (source_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetIndex(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (get(source,context) == MagickFalse)
       status=MagickFalse;
     if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2757,7 +2757,7 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination,
       PixelGetQuantumColor(destination->pixel_wands[id][x],pixels+x);
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->region.width; x++)
-        SetIndexPixelComponent(indexes+x,PixelGetBlackQuantum(
+        SetPixelIndex(indexes+x,PixelGetBlackQuantum(
           destination->pixel_wands[id][x]));
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -2898,11 +2898,11 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (source_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetIndex(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     destination_pixels=GetCacheViewAuthenticPixels(destination->view,
       destination->region.x,y,destination->region.width,1,exception);
     if (destination_pixels == (PixelPacket *) NULL)
@@ -2916,11 +2916,11 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->region.width; x++)
         PixelSetBlackQuantum(destination->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (destination_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) destination->region.width; x++)
         PixelSetIndex(destination->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (transfer(source,destination,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) destination->region.width; x++)
@@ -2928,7 +2928,7 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
         destination_pixels+x);
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->region.width; x++)
-        SetIndexPixelComponent(destination_indexes+x,PixelGetBlackQuantum(
+        SetPixelIndex(destination_indexes+x,PixelGetBlackQuantum(
           destination->pixel_wands[id][x]));
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -3056,14 +3056,14 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->region.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (update(source,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) source->region.width; x++)
       PixelGetQuantumColor(source->pixel_wands[id][x],pixels+x);
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->region.width; x++)
-        SetIndexPixelComponent(indexes+x,PixelGetBlackQuantum(
+        SetPixelIndex(indexes+x,PixelGetBlackQuantum(
           source->pixel_wands[id][x]));
     if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
       {
index 1f18066b0a5eb4a8ddfb2ce238fa7718de2a8c66..53a828724d77e217f00eb24dbe5bb2dfabc28efd 100644 (file)
@@ -388,10 +388,10 @@ static int MvgAutoWrapPrintf(DrawingWand *wand,const char *format,...)
 
 static void MvgAppendColor(DrawingWand *wand,const PixelPacket *color)
 {
-  if ((GetRedPixelComponent(color) == 0) &&
-      (GetGreenPixelComponent(color) == 0) &&
-      (GetBluePixelComponent(color) == 0) &&
-      (GetOpacityPixelComponent(color) == (Quantum) TransparentOpacity))
+  if ((GetPixelRed(color) == 0) &&
+      (GetPixelGreen(color) == 0) &&
+      (GetPixelBlue(color) == 0) &&
+      (GetPixelOpacity(color) == (Quantum) TransparentOpacity))
     (void) MvgPrintf(wand,"none");
   else
     {
@@ -404,10 +404,10 @@ static void MvgAppendColor(DrawingWand *wand,const PixelPacket *color)
       GetMagickPixelPacket(wand->image,&pixel);
       pixel.colorspace=RGBColorspace;
       pixel.matte=color->opacity != OpaqueOpacity ? MagickTrue : MagickFalse;
-      pixel.red=(MagickRealType) GetRedPixelComponent(color);
-      pixel.green=(MagickRealType) GetGreenPixelComponent(color);
-      pixel.blue=(MagickRealType) GetBluePixelComponent(color);
-      pixel.opacity=(MagickRealType) GetOpacityPixelComponent(color);
+      pixel.red=(MagickRealType) GetPixelRed(color);
+      pixel.green=(MagickRealType) GetPixelGreen(color);
+      pixel.blue=(MagickRealType) GetPixelBlue(color);
+      pixel.opacity=(MagickRealType) GetPixelOpacity(color);
       GetColorTuple(&pixel,MagickTrue,tuple);
       (void) MvgPrintf(wand,"%s",tuple);
     }
@@ -2420,15 +2420,15 @@ WandExport double DrawGetTextInterwordSpacing(DrawingWand *wand)
 static inline void SetMagickPixelPacket(const Image *image,
   const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
 {
-  pixel->red=(MagickRealType) GetRedPixelComponent(color);
-  pixel->green=(MagickRealType) GetGreenPixelComponent(color);
-  pixel->blue=(MagickRealType) GetBluePixelComponent(color);
+  pixel->red=(MagickRealType) GetPixelRed(color);
+  pixel->green=(MagickRealType) GetPixelGreen(color);
+  pixel->blue=(MagickRealType) GetPixelBlue(color);
   if (image->matte != MagickFalse)
-    pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+    pixel->opacity=(MagickRealType) GetPixelOpacity(color);
   if (((image->colorspace == CMYKColorspace) ||
        (image->storage_class == PseudoClass)) &&
       (index != (const IndexPacket *) NULL))
-    pixel->index=(MagickRealType) GetIndexPixelComponent(index);
+    pixel->index=(MagickRealType) GetPixelIndex(index);
 }
 
 WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
@@ -4506,13 +4506,13 @@ WandExport void DrawScale(DrawingWand *wand,const double x,const double y)
 static inline MagickBooleanType IsColorEqual(const PixelPacket *p,
   const PixelPacket *q)
 {
-  if (GetRedPixelComponent(p) != GetRedPixelComponent(q))
+  if (GetPixelRed(p) != GetPixelRed(q))
     return(MagickFalse);
-  if (GetGreenPixelComponent(p) != GetGreenPixelComponent(q))
+  if (GetPixelGreen(p) != GetPixelGreen(q))
     return(MagickFalse);
-  if (GetBluePixelComponent(p) != GetBluePixelComponent(q))
+  if (GetPixelBlue(p) != GetPixelBlue(q))
     return(MagickFalse);
-  if (GetOpacityPixelComponent(p) != GetOpacityPixelComponent(q))
+  if (GetPixelOpacity(p) != GetPixelOpacity(q))
     return(MagickFalse);
   return(MagickTrue);
 }
index f294b0f7aba8a3d1a1cf887d7b6cc1824cc9cc2f..cb8f84489b2516b1fa1bb69c99c902327d4552ad 100644 (file)
@@ -1078,10 +1078,10 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               for (x=0; x < (ssize_t) mask_image->columns; x++)
               {
                 if (mask_image->matte == MagickFalse)
-                  SetOpacityPixelComponent(q,PixelIntensityToQuantum(q));
-                SetRedPixelComponent(q,GetOpacityPixelComponent(q));
-                SetGreenPixelComponent(q,GetOpacityPixelComponent(q));
-                SetBluePixelComponent(q,GetOpacityPixelComponent(q));
+                  SetPixelOpacity(q,PixelIntensityToQuantum(q));
+                SetPixelRed(q,GetPixelOpacity(q));
+                SetPixelGreen(q,GetPixelOpacity(q));
+                SetPixelBlue(q,GetPixelOpacity(q));
                 q++;
               }
               if (SyncCacheViewAuthenticPixels(mask_view,exception) == MagickFalse)
index 4fcbb6621c714fbd62aaaab0696939b2af3d027c..329e15ecd298db4b4c7d1cc5781157e81df5ebea 100644 (file)
@@ -511,11 +511,11 @@ WandExport PixelWand **PixelGetCurrentIteratorRow(PixelIterator *iterator,
   if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
       PixelSetBlackQuantum(iterator->pixel_wands[x],
-        GetBlackPixelComponent(indexes+x));
+        GetPixelBlack(indexes+x));
   if (GetCacheViewStorageClass(iterator->view) == PseudoClass)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
       PixelSetIndex(iterator->pixel_wands[x],
-        GetBlackPixelComponent(indexes+x));
+        GetPixelBlack(indexes+x));
   *number_wands=iterator->region.width;
   return(iterator->pixel_wands);
 }
@@ -704,11 +704,11 @@ WandExport PixelWand **PixelGetNextIteratorRow(PixelIterator *iterator,
   if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
       PixelSetBlackQuantum(iterator->pixel_wands[x],
-        GetBlackPixelComponent(indexes+x));
+        GetPixelBlack(indexes+x));
   if (GetCacheViewStorageClass(iterator->view) == PseudoClass)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
       PixelSetIndex(iterator->pixel_wands[x],
-        GetIndexPixelComponent(indexes+x));
+        GetPixelIndex(indexes+x));
   *number_wands=iterator->region.width;
   return(iterator->pixel_wands);
 }
@@ -784,11 +784,11 @@ WandExport PixelWand **PixelGetPreviousIteratorRow(PixelIterator *iterator,
   if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
       PixelSetBlackQuantum(iterator->pixel_wands[x],
-        GetBlackPixelComponent(indexes+x));
+        GetPixelBlack(indexes+x));
   if (GetCacheViewStorageClass(iterator->view) == PseudoClass)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
       PixelSetIndex(iterator->pixel_wands[x],
-        GetIndexPixelComponent(indexes+x));
+        GetPixelIndex(indexes+x));
   *number_wands=iterator->region.width;
   return(iterator->pixel_wands);
 }
@@ -984,7 +984,7 @@ WandExport MagickBooleanType PixelSyncIterator(PixelIterator *iterator)
     PixelGetQuantumColor(iterator->pixel_wands[x],pixels+x);
   if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
     for (x=0; x < (ssize_t) iterator->region.width; x++)
-      SetBlackPixelComponent(indexes+x,PixelGetBlackQuantum(
+      SetPixelBlack(indexes+x,PixelGetBlackQuantum(
         iterator->pixel_wands[x]));
   if (SyncCacheViewAuthenticPixels(iterator->view,exception) == MagickFalse)
     {
index b18bddf9e6a158335ab2d55a53a0b7c45b30c00b..d4c3caaab10a947f05720948ab8cc2236f7821e1 100644 (file)
@@ -329,11 +329,11 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetBlackPixelComponent(indexes+x));
+          GetPixelBlack(indexes+x));
     if (source_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetIndex(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->extent.x,y,
       duplex->extent.width,1,duplex->exception);
     if (duplex_pixels == (const PixelPacket *) NULL)
@@ -347,11 +347,11 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     if (duplex_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) duplex->extent.width; x++)
         PixelSetBlackQuantum(duplex->pixel_wands[id][x],
-          GetBlackPixelComponent(duplex_indexes+x));
+          GetPixelBlack(duplex_indexes+x));
     if (duplex_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) duplex->extent.width; x++)
         PixelSetIndex(duplex->pixel_wands[id][x],
-          GetIndexPixelComponent(duplex_indexes+x));
+          GetPixelIndex(duplex_indexes+x));
     destination_pixels=GetCacheViewAuthenticPixels(destination->view,
       destination->extent.x,y,destination->extent.width,1,exception);
     if (destination_pixels == (PixelPacket *) NULL)
@@ -366,11 +366,11 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
         PixelSetBlackQuantum(destination->pixel_wands[id][x],
-          GetBlackPixelComponent(destination_indexes+x));
+          GetPixelBlack(destination_indexes+x));
     if (destination_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
         PixelSetIndex(destination->pixel_wands[id][x],
-          GetIndexPixelComponent(destination_indexes+x));
+          GetPixelIndex(destination_indexes+x));
     if (transfer(source,duplex,destination,y,id,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) destination->extent.width; x++)
@@ -378,7 +378,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
         destination_pixels+x);
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
-        SetBlackPixelComponent(destination_indexes+x,PixelGetBlackQuantum(
+        SetPixelBlack(destination_indexes+x,PixelGetBlackQuantum(
           destination->pixel_wands[id][x]));
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -589,11 +589,11 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetBlackPixelComponent(indexes+x));
+          GetPixelBlack(indexes+x));
     if (source_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetIndex(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (get(source,y,id,context) == MagickFalse)
       status=MagickFalse;
     if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -995,7 +995,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination,
       PixelGetQuantumColor(destination->pixel_wands[id][x],pixels+x);
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
-        SetBlackPixelComponent(indexes+x,PixelGetBlackQuantum(
+        SetPixelBlack(indexes+x,PixelGetBlackQuantum(
           destination->pixel_wands[id][x]));
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -1175,11 +1175,11 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetBlackPixelComponent(indexes+x));
+          GetPixelBlack(indexes+x));
     if (source_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetIndex(source->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     destination_pixels=GetCacheViewAuthenticPixels(destination->view,
       destination->extent.x,y,destination->extent.width,1,exception);
     if (destination_pixels == (PixelPacket *) NULL)
@@ -1193,11 +1193,11 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
         PixelSetBlackQuantum(destination->pixel_wands[id][x],
-          GetBlackPixelComponent(indexes+x));
+          GetPixelBlack(indexes+x));
     if (destination_image->storage_class == PseudoClass)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
         PixelSetIndex(destination->pixel_wands[id][x],
-          GetIndexPixelComponent(indexes+x));
+          GetPixelIndex(indexes+x));
     if (transfer(source,destination,y,id,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) destination->extent.width; x++)
@@ -1205,7 +1205,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
         destination_pixels+x);
     if (destination_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) destination->extent.width; x++)
-        SetBlackPixelComponent(destination_indexes+x,PixelGetBlackQuantum(
+        SetPixelBlack(destination_indexes+x,PixelGetBlackQuantum(
           destination->pixel_wands[id][x]));
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -1336,14 +1336,14 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source,
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->extent.width; x++)
         PixelSetBlackQuantum(source->pixel_wands[id][x],
-          GetBlackPixelComponent(indexes+x));
+          GetPixelBlack(indexes+x));
     if (update(source,y,id,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) source->extent.width; x++)
       PixelGetQuantumColor(source->pixel_wands[id][x],pixels+x);
     if (source_image->colorspace == CMYKColorspace)
       for (x=0; x < (ssize_t) source->extent.width; x++)
-        SetBlackPixelComponent(indexes+x,PixelGetBlackQuantum(
+        SetPixelBlack(indexes+x,PixelGetBlackQuantum(
           source->pixel_wands[id][x]));
     if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
       {