]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 7 Jul 2011 16:25:41 +0000 (16:25 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 7 Jul 2011 16:25:41 +0000 (16:25 +0000)
125 files changed:
MagickCore/annotate.c
MagickCore/attribute.c
MagickCore/cache-private.h
MagickCore/cache.c
MagickCore/colormap.c
MagickCore/colorspace.c
MagickCore/compare.c
MagickCore/composite.c
MagickCore/compress.c
MagickCore/decorate.c
MagickCore/display.c
MagickCore/distort.c
MagickCore/draw.c
MagickCore/effect.c
MagickCore/enhance.c
MagickCore/feature.c
MagickCore/fourier.c
MagickCore/fx.c
MagickCore/histogram.c
MagickCore/identify.c
MagickCore/image.c
MagickCore/image.h
MagickCore/layer.c
MagickCore/mac.c
MagickCore/morphology.c
MagickCore/nt-feature.c
MagickCore/paint.c
MagickCore/pixel-accessor.h
MagickCore/pixel.c
MagickCore/prepress.c
MagickCore/profile.c
MagickCore/quantize.c
MagickCore/quantum-export.c
MagickCore/quantum-import.c
MagickCore/resample.c
MagickCore/resize.c
MagickCore/segment.c
MagickCore/shear.c
MagickCore/statistic.c
MagickCore/stream.c
MagickCore/threshold.c
MagickCore/transform.c
MagickCore/xwindow.c
MagickWand/mogrify.c
MagickWand/pixel-iterator.c
MagickWand/wand-view.c
PerlMagick/Magick.xs
coders/aai.c
coders/avs.c
coders/bgr.c
coders/bmp.c
coders/clipboard.c
coders/cmyk.c
coders/cut.c
coders/dcm.c
coders/dds.c
coders/debug.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/msl.c
coders/mtv.c
coders/null.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/rle.c
coders/sct.c
coders/sgi.c
coders/sun.c
coders/svg.c
coders/tga.c
coders/tiff.c
coders/tim.c
coders/ttf.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
filters/analyze.c

index ccdf2134f703be09f4138afbd849e79fbe481c00..a7a5b587281229f4b83ec94b8ee3e5b644e5cfa1 100644 (file)
@@ -1393,7 +1393,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
                 (x_offset >= (ssize_t) image->columns))
               {
                 p++;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
                 continue;
               }
             fill_opacity=(MagickRealType) (*p)/(bitmap->bitmap.num_grays-1);
@@ -1405,7 +1405,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
             if (q == (const Quantum *) NULL)
               {
                 p++;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
                 continue;
               }
             (void) GetFillColor(draw_info,x_offset,y_offset,&fill_color);
@@ -1419,7 +1419,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
                   status=MagickFalse;
               }
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           sync=SyncCacheViewAuthenticPixels(image_view,exception);
           if (sync == MagickFalse)
@@ -1798,7 +1798,7 @@ static MagickBooleanType RenderPostscript(Image *image,
           SetPixelRed(annotate_image,fill_color.red,q);
           SetPixelGreen(annotate_image,fill_color.green,q);
           SetPixelBlue(annotate_image,fill_color.blue,q);
-          q+=GetPixelChannels(annotate_image);
+          q+=GetPixelComponents(annotate_image);
         }
         sync=SyncCacheViewAuthenticPixels(annotate_view,exception);
         if (sync == MagickFalse)
index 62e63f7c15076e0615d82b3dc2ddc6c0ef2ef992..482c284b2c55fbc5e6666ed111f8d88b19448345 100644 (file)
@@ -211,7 +211,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
       if ((y > (ssize_t) bounding_box.height) &&
           (IsFuzzyEquivalencePixelInfo(&pixel,&target[2]) == MagickFalse))
         bounding_box.height=(size_t) y;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #  pragma omp critical (MagickCore_GetImageBoundingBox)
@@ -402,7 +402,7 @@ MagickExport size_t GetImageDepth(const Image *image,
           break;
         current_depth[id]++;
       }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (current_depth[id] == MAGICKCORE_QUANTUM_DEPTH)
       status=MagickFalse;
@@ -608,7 +608,7 @@ MagickExport MagickBooleanType IsImageGray(const Image *image,
       if ((type == BilevelType) &&
           (IsPixelMonochrome(image,p) == MagickFalse))
         type=GrayscaleType;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (type == UndefinedType)
       break;
@@ -689,7 +689,7 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image,
           type=UndefinedType;
           break;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (type == UndefinedType)
       break;
@@ -761,7 +761,7 @@ MagickExport MagickBooleanType IsImageOpaque(const Image *image,
     {
       if (GetPixelAlpha(image,p) != OpaqueAlpha)
         break;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (x < (ssize_t) image->columns)
      break;
@@ -872,7 +872,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image,
           (image->matte != MagickFalse))
         SetPixelAlpha(image,ScaleAnyToQuantum(ScaleQuantumToAny(
           GetPixelAlpha(image,q),range),range),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       {
index 5906035ef165da77e34de21bedef758d088ccab6..b61e9c21c48919c54324d8cc513699ff70e10ee6 100644 (file)
@@ -120,7 +120,7 @@ typedef struct _CacheInfo
 
   size_t
     metacontent_extent,
-    pixel_channels;
+    pixel_components;
 
   CacheType
     type;
index 39f7a402fe932db13e0c60b3ba32fd357891605a..8e8c2d5fa5cd5f32ff9c1aaafd65822f668bec46 100644 (file)
@@ -460,9 +460,9 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image,
           SetPixelBlack(image,GetPixelBlack(image,p),q);
         SetPixelAlpha(image,GetPixelAlpha(image,p),q);
       }
-    p+=GetPixelChannels(image);
-    q+=GetPixelChannels(image);
-    r+=GetPixelChannels(image->clip_mask);
+    p+=GetPixelComponents(image);
+    q+=GetPixelComponents(image);
+    r+=GetPixelComponents(image->clip_mask);
   }
   clip_nexus=DestroyPixelCacheNexus(clip_nexus,1);
   image_nexus=DestroyPixelCacheNexus(image_nexus,1);
@@ -945,8 +945,8 @@ static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info,
          else
            (void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => disk");
     }
-  length=(size_t) MagickMax(MagickMax(cache_info->pixel_channels,
-    clone_info->pixel_channels)*sizeof(Quantum),MagickMax(
+  length=(size_t) MagickMax(MagickMax(cache_info->pixel_components,
+    clone_info->pixel_components)*sizeof(Quantum),MagickMax(
     cache_info->metacontent_extent,clone_info->metacontent_extent));
   blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(*blob));
   if (blob == (unsigned char *) NULL)
@@ -1000,7 +1000,7 @@ static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info,
       /*
         Read a set of pixel channels.
       */
-      length=cache_info->pixel_channels*sizeof(Quantum);
+      length=cache_info->pixel_components*sizeof(Quantum);
       if (cache_info->type != DiskCache)
         (void) memcpy(blob,(unsigned char *) cache_info->pixels+cache_offset,
           length);
@@ -1020,7 +1020,7 @@ static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info,
           /*
             Write a set of pixel channels.
           */
-          length=clone_info->pixel_channels*sizeof(Quantum);
+          length=clone_info->pixel_components*sizeof(Quantum);
           if (clone_info->type != DiskCache)
             (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
               blob,length);
@@ -1037,7 +1037,7 @@ static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info,
           clone_offset+=length;
         }
     }
-    length=clone_info->pixel_channels*sizeof(Quantum);
+    length=clone_info->pixel_components*sizeof(Quantum);
     (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
     for ( ; x < (ssize_t) clone_info->columns; x++)
     {
@@ -1059,7 +1059,7 @@ static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info,
       clone_offset+=length;
     }
   }
-  length=clone_info->pixel_channels*sizeof(Quantum);
+  length=clone_info->pixel_components*sizeof(Quantum);
   (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
   for ( ; y < (ssize_t) clone_info->rows; y++)
   {
@@ -1196,7 +1196,7 @@ static MagickBooleanType ClonePixelCachePixels(CacheInfo *clone_info,
     return(MagickTrue);
   if ((cache_info->columns == clone_info->columns) &&
       (cache_info->rows == clone_info->rows) &&
-      (cache_info->pixel_channels == clone_info->pixel_channels) &&
+      (cache_info->pixel_components == clone_info->pixel_components) &&
       (cache_info->metacontent_extent == clone_info->metacontent_extent))
     return(OptimizedPixelCacheClone(clone_info,cache_info,exception));
   return(UnoptimizedPixelCacheClone(clone_info,cache_info,exception));
@@ -1638,7 +1638,7 @@ static inline MagickBooleanType IsPixelAuthentic(const CacheInfo *cache_info,
   offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
     nexus_info->region.x;
   status=nexus_info->pixels == (cache_info->pixels+offset*
-    cache_info->pixel_channels) ? MagickTrue : MagickFalse;
+    cache_info->pixel_components) ? MagickTrue : MagickFalse;
   return(status);
 }
 
@@ -1972,7 +1972,7 @@ static inline MagickBooleanType ValidatePixelCacheMorphology(const Image *image)
       (image->colorspace != cache_info->colorspace) ||
       (image->columns != cache_info->columns) ||
       (image->rows != cache_info->rows) ||
-      (image->pixel_channels != cache_info->pixel_channels) ||
+      (image->pixel_components != cache_info->pixel_components) ||
       (image->metacontent_extent != cache_info->metacontent_extent) ||
       (cache_info->nexus_info == (NexusInfo **) NULL) ||
       (cache_info->number_threads < GetOpenMPMaximumThreads()))
@@ -2785,9 +2785,9 @@ MagickExport void GetPixelCacheTileSize(const Image *image,size_t *width,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
-  *width=2048UL/(cache_info->pixel_channels*sizeof(Quantum));
+  *width=2048UL/(cache_info->pixel_components*sizeof(Quantum));
   if (GetPixelCacheType(image) == DiskCache)
-    *width=8192UL/(cache_info->pixel_channels*sizeof(Quantum));
+    *width=8192UL/(cache_info->pixel_components*sizeof(Quantum));
   *height=(*width);
 }
 \f
@@ -3247,7 +3247,7 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
         Acquire virtual pixel and associated channels.
       */
       virtual_pixel=(Quantum *) AcquireQuantumMemory(
-        cache_info->pixel_channels,sizeof(*virtual_pixel));
+        cache_info->pixel_components,sizeof(*virtual_pixel));
       if (virtual_pixel == (Quantum *) NULL)
         {
           virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1);
@@ -3255,7 +3255,7 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
             "UnableToGetCacheNexus","`%s'",image->filename);
           return((const Quantum *) NULL);
         }
-      (void) ResetMagickMemory(virtual_pixel,0,cache_info->pixel_channels*
+      (void) ResetMagickMemory(virtual_pixel,0,cache_info->pixel_components*
         sizeof(*virtual_pixel));
       if (cache_info->metacontent_extent != 0)
         {
@@ -3475,9 +3475,9 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
           }
           if (p == (const Quantum *) NULL)
             break;
-          (void) memcpy(q,p,(size_t) length*cache_info->pixel_channels*
+          (void) memcpy(q,p,(size_t) length*cache_info->pixel_components*
             sizeof(*p));
-          q+=cache_info->pixel_channels;
+          q+=cache_info->pixel_components;
           if ((s != (void *) NULL) &&
               (r != (const void *) NULL))
             {
@@ -3494,8 +3494,8 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
       if (p == (const Quantum *) NULL)
         break;
       r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
-      (void) memcpy(q,p,(size_t) length*cache_info->pixel_channels*sizeof(*p));
-      q+=length*cache_info->pixel_channels;
+      (void) memcpy(q,p,(size_t) length*cache_info->pixel_components*sizeof(*p));
+      q+=length*cache_info->pixel_components;
       if ((s != (void *) NULL) && (r != (const void *) NULL))
         {
           (void) memcpy(s,r,(size_t) length);
@@ -4021,7 +4021,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
   cache_info->mode=mode;
   cache_info->rows=image->rows;
   cache_info->columns=image->columns;
-  cache_info->pixel_channels=GetPixelChannels(image);
+  cache_info->pixel_components=GetPixelComponents(image);
   cache_info->metacontent_extent=image->metacontent_extent;
   if (image->ping != MagickFalse)
     {
@@ -4032,7 +4032,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
       return(MagickTrue);
     }
   number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows;
-  packet_size=cache_info->pixel_channels*sizeof(Quantum);
+  packet_size=cache_info->pixel_components*sizeof(Quantum);
   if (image->metacontent_extent != 0)
     packet_size+=cache_info->metacontent_extent;
   length=number_pixels*packet_size;
@@ -4044,7 +4044,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
   if ((cache_info->type != UndefinedCache) &&
       (cache_info->columns <= source_info.columns) &&
       (cache_info->rows <= source_info.rows) &&
-      (cache_info->pixel_channels <= source_info.pixel_channels) &&
+      (cache_info->pixel_components <= source_info.pixel_components) &&
       (cache_info->metacontent_extent <= source_info.metacontent_extent))
     {
       /*
@@ -4052,13 +4052,13 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
       */
       if ((cache_info->columns == source_info.columns) &&
           (cache_info->rows == source_info.rows) &&
-          (cache_info->pixel_channels == source_info.pixel_channels) &&
+          (cache_info->pixel_components == source_info.pixel_components) &&
           (cache_info->metacontent_extent == source_info.metacontent_extent))
         return(MagickTrue);
       return(ClonePixelCachePixels(cache_info,&source_info,exception));
     }
   status=AcquireMagickResource(AreaResource,cache_info->length);
-  length=number_pixels*(cache_info->pixel_channels*sizeof(Quantum)+
+  length=number_pixels*(cache_info->pixel_components*sizeof(Quantum)+
     cache_info->metacontent_extent);
   if ((status != MagickFalse) && (length == (MagickSizeType) ((size_t) length)))
     {
@@ -4083,7 +4083,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                     "open %s (%s memory, %.20gx%.20gx%.20g %s)",
                     cache_info->filename,cache_info->mapped != MagickFalse ?
                     "anonymous" : "heap",(double) cache_info->columns,(double)
-                    cache_info->rows,(double) cache_info->pixel_channels,
+                    cache_info->rows,(double) cache_info->pixel_components,
                     format);
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
@@ -4092,7 +4092,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
               cache_info->metacontent=(void *) NULL;
               if (cache_info->metacontent_extent != 0)
                 cache_info->metacontent=(void *) (cache_info->pixels+
-                  number_pixels*cache_info->pixel_channels);
+                  number_pixels*cache_info->pixel_components);
               if (source_info.storage_class != UndefinedClass)
                 {
                   status=ClonePixelCachePixels(cache_info,&source_info,
@@ -4129,7 +4129,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
         image->filename);
       return(MagickFalse);
     }
-  length=number_pixels*(cache_info->pixel_channels*sizeof(Quantum)+
+  length=number_pixels*(cache_info->pixel_components*sizeof(Quantum)+
     cache_info->metacontent_extent);
   status=AcquireMagickResource(AreaResource,cache_info->length);
   if ((status == MagickFalse) || (length != (MagickSizeType) ((size_t) length)))
@@ -4161,7 +4161,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
               cache_info->metacontent=(void *) NULL;
               if (cache_info->metacontent_extent != 0)
                 cache_info->metacontent=(void *) (cache_info->pixels+
-                  number_pixels*cache_info->pixel_channels);
+                  number_pixels*cache_info->pixel_components);
               if (source_info.storage_class != UndefinedClass)
                 {
                   status=ClonePixelCachePixels(cache_info,&source_info,
@@ -4176,7 +4176,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                     "open %s (%s[%d], memory-mapped, %.20gx%.20gx%.20g %s)",
                     cache_info->filename,cache_info->cache_filename,
                     cache_info->file,(double) cache_info->columns,(double)
-                    cache_info->rows,(double) cache_info->pixel_channels,
+                    cache_info->rows,(double) cache_info->pixel_components,
                     format);
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
@@ -4199,7 +4199,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
         "open %s (%s[%d], disk, %.20gx%.20gx%.20g %s)",cache_info->filename,
         cache_info->cache_filename,cache_info->file,(double)
         cache_info->columns,(double) cache_info->rows,(double)
-        cache_info->pixel_channels,format);
+        cache_info->pixel_components,format);
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
   return(status);
@@ -4678,7 +4678,7 @@ static MagickBooleanType ReadPixelCacheMetacontent(CacheInfo *cache_info,
       for (y=0; y < (ssize_t) rows; y++)
       {
         count=ReadPixelCacheRegion(cache_info,cache_info->offset+extent*
-          cache_info->pixel_channels*sizeof(Quantum)+offset*
+          cache_info->pixel_components*sizeof(Quantum)+offset*
           cache_info->metacontent_extent,length,(unsigned char *) q);
         if ((MagickSizeType) count != length)
           break;
@@ -4757,7 +4757,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
     return(MagickTrue);
   offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
     nexus_info->region.x;
-  length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_channels*
+  length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_components*
     sizeof(Quantum);
   rows=nexus_info->region.height;
   extent=length*rows;
@@ -4779,12 +4779,12 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
           length=extent;
           rows=1UL;
         }
-      p=cache_info->pixels+offset*cache_info->pixel_channels;
+      p=cache_info->pixels+offset*cache_info->pixel_components;
       for (y=0; y < (ssize_t) rows; y++)
       {
         (void) memcpy(q,p,(size_t) length);
-        p+=cache_info->pixel_channels*cache_info->columns;
-        q+=cache_info->pixel_channels*nexus_info->region.width;
+        p+=cache_info->pixel_components*cache_info->columns;
+        q+=cache_info->pixel_components*nexus_info->region.width;
       }
       break;
     }
@@ -4808,11 +4808,11 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
       for (y=0; y < (ssize_t) rows; y++)
       {
         count=ReadPixelCacheRegion(cache_info,cache_info->offset+offset*
-          cache_info->pixel_channels*sizeof(*q),length,(unsigned char *) q);
+          cache_info->pixel_components*sizeof(*q),length,(unsigned char *) q);
         if ((MagickSizeType) count != length)
           break;
         offset+=cache_info->columns;
-        q+=cache_info->pixel_channels*nexus_info->region.width;
+        q+=cache_info->pixel_components*nexus_info->region.width;
       }
       if (y < (ssize_t) rows)
         {
@@ -5058,7 +5058,7 @@ static Quantum *SetPixelCacheNexusPixels(const Image *image,
           */
           offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
             nexus_info->region.x;
-          nexus_info->pixels=cache_info->pixels+cache_info->pixel_channels*
+          nexus_info->pixels=cache_info->pixels+cache_info->pixel_components*
             offset;
           nexus_info->metacontent=(void *) NULL;
           if (cache_info->metacontent_extent != 0)
@@ -5072,7 +5072,7 @@ static Quantum *SetPixelCacheNexusPixels(const Image *image,
   */
   number_pixels=(MagickSizeType) nexus_info->region.width*
     nexus_info->region.height;
-  length=number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+  length=number_pixels*cache_info->pixel_components*sizeof(Quantum);
   if (cache_info->metacontent_extent != 0)
     length+=number_pixels*cache_info->metacontent_extent;
   if (nexus_info->cache == (Quantum *) NULL)
@@ -5101,7 +5101,7 @@ static Quantum *SetPixelCacheNexusPixels(const Image *image,
   nexus_info->metacontent=(void *) NULL;
   if (cache_info->metacontent_extent != 0)
     nexus_info->metacontent=(void *) (nexus_info->pixels+number_pixels*
-      cache_info->pixel_channels);
+      cache_info->pixel_components);
   return(nexus_info->pixels);
 }
 \f
@@ -5432,7 +5432,7 @@ static MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info,
       for (y=0; y < (ssize_t) rows; y++)
       {
         count=WritePixelCacheRegion(cache_info,cache_info->offset+extent*
-          cache_info->pixel_channels*sizeof(Quantum)+offset*
+          cache_info->pixel_components*sizeof(Quantum)+offset*
           cache_info->metacontent_extent,length,(const unsigned char *) p);
         if ((MagickSizeType) count != length)
           break;
@@ -5511,7 +5511,7 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
     return(MagickTrue);
   offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
     nexus_info->region.x;
-  length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_channels*
+  length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_components*
     sizeof(Quantum);
   rows=nexus_info->region.height;
   extent=length*rows;
@@ -5533,12 +5533,12 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
           length=extent;
           rows=1UL;
         }
-      q=cache_info->pixels+offset*cache_info->pixel_channels;
+      q=cache_info->pixels+offset*cache_info->pixel_components;
       for (y=0; y < (ssize_t) rows; y++)
       {
         (void) memcpy(q,p,(size_t) length);
-        p+=nexus_info->region.width*cache_info->pixel_channels;
-        q+=cache_info->columns*cache_info->pixel_channels;
+        p+=nexus_info->region.width*cache_info->pixel_components;
+        q+=cache_info->columns*cache_info->pixel_components;
       }
       break;
     }
@@ -5562,11 +5562,11 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
       for (y=0; y < (ssize_t) rows; y++)
       {
         count=WritePixelCacheRegion(cache_info,cache_info->offset+offset*
-          cache_info->pixel_channels*sizeof(*p),length,(const unsigned char *)
+          cache_info->pixel_components*sizeof(*p),length,(const unsigned char *)
           p);
         if ((MagickSizeType) count != length)
           break;
-        p+=nexus_info->region.width*cache_info->pixel_channels;
+        p+=nexus_info->region.width*cache_info->pixel_components;
         offset+=cache_info->columns;
       }
       if (y < (ssize_t) rows)
index 42be2fc9ed86e9a594910649a4d480cb3703bd51..b89f1ed9e71704604c929ab41e8412fa8895fcb2 100644 (file)
@@ -233,7 +233,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
         index+=(ssize_t) image->colors;
       SetPixelIndex(image,(Quantum) index,q);
       SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -370,7 +370,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
       index=(Quantum) pixels[(ssize_t) GetPixelIndex(image,q)];
       SetPixelIndex(image,index,q);
       SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index ce0d66c5999b761ed19e3ae1cb246a7124706349..e70513adb97e0bebb906da1041bf17c8a3cb5d17 100644 (file)
@@ -276,7 +276,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             GetPixelGreen(image,q))),q);
           SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
             GetPixelBlue(image,q))),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -333,7 +333,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           SetPixelInfo(image,q,&pixel);
           ConvertRGBToCMYK(&pixel);
           SetPixelPixelInfo(image,&pixel,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -395,7 +395,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             saturation),q);
           SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
             brightness),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -455,7 +455,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             saturation),q);
           SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
             lightness),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -515,7 +515,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             whiteness),q);
           SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
             blackness),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -582,7 +582,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             a),q);
           SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
             b),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -676,7 +676,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             GetPixelGreen(image,q))],q);
           SetPixelBlue(image,logmap[ScaleQuantumToMap(
             GetPixelBlue(image,q))],q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1098,7 +1098,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           SetPixelRed(image,ScaleMapToQuantum(pixel.red),q);
           SetPixelGreen(image,ScaleMapToQuantum(pixel.green),q);
           SetPixelBlue(image,ScaleMapToQuantum(pixel.blue),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1700,7 +1700,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             GetPixelGreen(image,q))),q);
           SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
             GetPixelBlue(image,q))),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1760,7 +1760,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           SetPixelInfo(image,q,&pixel);
           ConvertCMYKToRGB(&pixel);
           SetPixelPixelInfo(image,&pixel,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1826,7 +1826,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           SetPixelRed(image,red,q);
           SetPixelGreen(image,green,q);
           SetPixelBlue(image,blue,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1892,7 +1892,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           SetPixelRed(image,red,q);
           SetPixelGreen(image,green,q);
           SetPixelBlue(image,blue,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1958,7 +1958,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           SetPixelRed(image,red,q);
           SetPixelGreen(image,green,q);
           SetPixelBlue(image,blue,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -2031,7 +2031,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           SetPixelRed(image,red,q);
           SetPixelGreen(image,green,q);
           SetPixelBlue(image,blue,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -2128,7 +2128,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             GetPixelGreen(image,q))],q);
           SetPixelBlue(image,logmap[ScaleQuantumToMap(
             GetPixelBlue(image,q))],q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -2548,7 +2548,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             QuantumScale*pixel.green),q);
           SetPixelBlue(image,ScaleMapToQuantum((MagickRealType) MaxMap*
             QuantumScale*pixel.blue),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
index 1575b065e67d84400ed12b79fccb58f96f8df355..5f29d5e6cd599c64aaf0b37845d8e908a6599b45 100644 (file)
@@ -258,9 +258,9 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
         SetPixelPixelInfo(highlight_image,&highlight,r);
       else
         SetPixelPixelInfo(highlight_image,&lowlight,r);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
-      r+=GetPixelChannels(highlight_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
+      r+=GetPixelComponents(highlight_image);
     }
     sync=SyncCacheViewAuthenticPixels(highlight_view,exception);
     if (sync == MagickFalse)
@@ -386,8 +386,8 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image,
             channel_distortion[BlackChannel]++;
           channel_distortion[CompositeChannels]++;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetAbsoluteError)
@@ -511,8 +511,8 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
           channel_distortion[BlackChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetMeanSquaredError)
@@ -622,8 +622,8 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image,
           channel_distortion[OpacityChannel]+=distance;
           channel_distortion[CompositeChannels]+=distance;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetMeanAbsoluteError)
@@ -756,8 +756,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
             maximum_error=distance;
           area++;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -857,8 +857,8 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
           channel_distortion[OpacityChannel]+=distance*distance;
           channel_distortion[CompositeChannels]+=distance*distance;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetMeanSquaredError)
@@ -964,8 +964,8 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion(
           image_statistics[OpacityChannel].mean)*
           (GetPixelAlpha(reconstruct_image,q)-
           reconstruct_statistics[OpacityChannel].mean);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(image);
     }
     if (image->progress_monitor != (MagickProgressMonitor) NULL)
       {
@@ -1118,8 +1118,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
           if (distance > channel_distortion[CompositeChannels])
             channel_distortion[CompositeChannels]=distance;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(image);
     }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_GetPeakAbsoluteError)
@@ -1565,8 +1565,8 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
             maximum_error=distance;
           area++;
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -1696,8 +1696,8 @@ static double GetNCCDistortion(const Image *image,
           image_statistics[OpacityChannel].mean)*(
           GetPixelAlpha(reconstruct_image,q)-
           reconstruct_statistics[OpacityChannel].mean);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(reconstruct_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(reconstruct_image);
     }
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -1839,7 +1839,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
         QuantumRange*similarity),q);
       SetPixelGreen(similarity_image,GetPixelRed(image,q),q);
       SetPixelBlue(similarity_image,GetPixelRed(image,q),q);
-      q+=GetPixelChannels(similarity_image);
+      q+=GetPixelComponents(similarity_image);
     }
     if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse)
       status=MagickFalse;
index b1f4791b88d8df668284ffe618192ba4983fc785..04cb8965b5e00965bdb021f9e67693d2db5baf82 100644 (file)
@@ -1698,8 +1698,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           SetPixelAlpha(image,GetPixelAlpha(composite_image,p),q);
           if (image->colorspace == CMYKColorspace)
             SetPixelBlack(image,GetPixelBlack(composite_image,p),q);
-          p+=GetPixelChannels(composite_image);
-          q+=GetPixelChannels(image);
+          p+=GetPixelComponents(composite_image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1837,7 +1837,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
         {
           if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
             {
-              p+=GetPixelChannels(composite_image);
+              p+=GetPixelComponents(composite_image);
               continue;
             }
           if (fabs(angle_range) > MagickEpsilon)
@@ -1860,8 +1860,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           (void) ResamplePixelColor(resample_filter,(double) x_offset+x,
             (double) y_offset+y,&pixel);
           SetPixelPixelInfo(destination_image,&pixel,q);
-          p+=GetPixelChannels(composite_image);
-          q+=GetPixelChannels(destination_image);
+          p+=GetPixelComponents(composite_image);
+          q+=GetPixelComponents(destination_image);
         }
         sync=SyncCacheViewAuthenticPixels(destination_view,exception);
         if (sync == MagickFalse)
@@ -2009,7 +2009,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
         {
           if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
             {
-              p+=GetPixelChannels(composite_image);
+              p+=GetPixelComponents(composite_image);
               continue;
             }
           /*
@@ -2033,8 +2033,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
             pixel.alpha)*(1.0-QuantumScale*
             GetPixelAlpha(composite_image,p)));
           SetPixelPixelInfo(destination_image,&pixel,q);
-          p+=GetPixelChannels(composite_image);
-          q+=GetPixelChannels(destination_image);
+          p+=GetPixelComponents(composite_image);
+          q+=GetPixelComponents(destination_image);
         }
         sync=SyncCacheViewAuthenticPixels(destination_view,exception);
         if (sync == MagickFalse)
@@ -2209,7 +2209,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           }
         pixels=p;
         if (x_offset < 0)
-          p-=x_offset*GetPixelChannels(composite_image);
+          p-=x_offset*GetPixelComponents(composite_image);
       }
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (const Quantum *) NULL)
@@ -2228,7 +2228,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
         {
           if (x < x_offset)
             {
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
               continue;
             }
           if ((x-x_offset) >= (ssize_t) composite_image->columns)
@@ -2302,7 +2302,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
             SetPixelAlpha(image,ClampToQuantum(composite.alpha),q);
           if (image->colorspace == CMYKColorspace)
             SetPixelBlack(image,ClampToQuantum(composite.black),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           continue;
         }
       /*
@@ -2717,10 +2717,10 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(image,ClampToQuantum(composite.black),q);
       SetPixelAlpha(image,ClampToQuantum(composite.alpha),q);
-      p+=GetPixelChannels(composite_image);
-      if (p >= (pixels+composite_image->columns*GetPixelChannels(composite_image)))
+      p+=GetPixelComponents(composite_image);
+      if (p >= (pixels+composite_image->columns*GetPixelComponents(composite_image)))
         p=pixels;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2902,8 +2902,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
         if ((image->colorspace == CMYKColorspace)  &&
             (texture->colorspace == CMYKColorspace))
           SetPixelBlack(image,GetPixelBlack(texture,p),q);
-        p+=GetPixelChannels(texture);
-        q+=GetPixelChannels(image);
+        p+=GetPixelComponents(texture);
+        q+=GetPixelComponents(image);
       }
     }
     sync=SyncCacheViewAuthenticPixels(image_view,exception);
index 6e735ed98254c65367982f4544734e15827a34dc..fb08647e1ce9c531852f19d634f6fe6e83beb792 100644 (file)
@@ -636,7 +636,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image)
       index=(Quantum) (*p++);
       SetPixelIndex(image,index,q);
       SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       break;
@@ -808,7 +808,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info,
     {
       *q++=(unsigned char) (GetPixelIntensity(huffman_image,p) >=
         ((MagickRealType) QuantumRange/2.0) ? 0 : 1);
-      p+=GetPixelChannels(huffman_image);
+      p+=GetPixelComponents(huffman_image);
     }
     /*
       Huffman encode scanline.
index 2ca33697de81d651c2d5e89e8d59ae47bf587dcc..e6751059c631a63cab60c92ab3d22b41640ce690 100644 (file)
@@ -313,12 +313,12 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
                 SetPixelPixelInfo(frame_image,&highlight,q);
               else
                 SetPixelPixelInfo(frame_image,&accentuate,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for ( ; x < (ssize_t) frame_image->columns; x++)
             {
               SetPixelPixelInfo(frame_image,&shadow,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
           }
           for (y=0; y < (ssize_t) (frame_info->y-bevel_width); y++)
@@ -326,18 +326,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&highlight,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             width=frame_image->columns-2*frame_info->outer_bevel;
             for (x=0; x < (ssize_t) width; x++)
             {
               SetPixelPixelInfo(frame_image,&matte,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&shadow,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
           }
           for (y=0; y < (ssize_t) frame_info->inner_bevel; y++)
@@ -345,12 +345,12 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&highlight,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
             {
               SetPixelPixelInfo(frame_image,&matte,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             width=image->columns+((size_t) frame_info->inner_bevel << 1)-
               y;
@@ -360,23 +360,23 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
                 SetPixelPixelInfo(frame_image,&shadow,q);
               else
                 SetPixelPixelInfo(frame_image,&trough,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
             {
               SetPixelPixelInfo(frame_image,&highlight,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             width=frame_info->width-frame_info->x-image->columns-bevel_width;
             for (x=0; x < (ssize_t) width; x++)
             {
               SetPixelPixelInfo(frame_image,&matte,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&shadow,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
           }
           (void) SyncCacheViewAuthenticPixels(frame_view,exception);
@@ -411,17 +411,17 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
     for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
     {
       SetPixelPixelInfo(frame_image,&highlight,q);
-      q+=GetPixelChannels(frame_image);
+      q+=GetPixelComponents(frame_image);
     }
     for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
     {
       SetPixelPixelInfo(frame_image,&matte,q);
-      q+=GetPixelChannels(frame_image);
+      q+=GetPixelComponents(frame_image);
     }
     for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
     {
       SetPixelPixelInfo(frame_image,&shadow,q);
-      q+=GetPixelChannels(frame_image);
+      q+=GetPixelComponents(frame_image);
     }
     /*
       Set frame interior to interior color.
@@ -431,7 +431,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         SetPixelPixelInfo(frame_image,&interior,q);
-        q+=GetPixelChannels(frame_image);
+        q+=GetPixelComponents(frame_image);
       }
     else
       {
@@ -452,25 +452,25 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           if (image->colorspace == CMYKColorspace)
             SetPixelBlack(frame_image,GetPixelBlack(image,p),q);
           SetPixelAlpha(frame_image,GetPixelAlpha(image,p),q);
-          p+=GetPixelChannels(image);
-          q+=GetPixelChannels(frame_image);
+          p+=GetPixelComponents(image);
+          q+=GetPixelComponents(frame_image);
         }
       }
     for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
     {
       SetPixelPixelInfo(frame_image,&highlight,q);
-      q+=GetPixelChannels(frame_image);
+      q+=GetPixelComponents(frame_image);
     }
     width=frame_info->width-frame_info->x-image->columns-bevel_width;
     for (x=0; x < (ssize_t) width; x++)
     {
       SetPixelPixelInfo(frame_image,&matte,q);
-      q+=GetPixelChannels(frame_image);
+      q+=GetPixelComponents(frame_image);
     }
     for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
     {
       SetPixelPixelInfo(frame_image,&shadow,q);
-      q+=GetPixelChannels(frame_image);
+      q+=GetPixelComponents(frame_image);
     }
     if (SyncCacheViewAuthenticPixels(frame_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -512,17 +512,17 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&highlight,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
             {
               SetPixelPixelInfo(frame_image,&matte,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < y; x++)
             {
               SetPixelPixelInfo(frame_image,&shadow,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
             {
@@ -530,18 +530,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
                 SetPixelPixelInfo(frame_image,&highlight,q);
               else
                 SetPixelPixelInfo(frame_image,&accentuate,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             width=frame_info->width-frame_info->x-image->columns-bevel_width;
             for (x=0; x < (ssize_t) width; x++)
             {
               SetPixelPixelInfo(frame_image,&matte,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&shadow,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
           }
           height=frame_info->height-frame_info->y-image->rows-bevel_width;
@@ -550,18 +550,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&highlight,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             width=frame_image->columns-2*frame_info->outer_bevel;
             for (x=0; x < (ssize_t) width; x++)
             {
               SetPixelPixelInfo(frame_image,&matte,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
             {
               SetPixelPixelInfo(frame_image,&shadow,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
           }
           for (y=frame_info->outer_bevel-1; y >= 0; y--)
@@ -569,7 +569,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
             for (x=0; x < y; x++)
             {
               SetPixelPixelInfo(frame_image,&highlight,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
             for ( ; x < (ssize_t) frame_image->columns; x++)
             {
@@ -577,7 +577,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
                 SetPixelPixelInfo(frame_image,&shadow,q);
               else
                 SetPixelPixelInfo(frame_image,&trough,q);
-              q+=GetPixelChannels(frame_image);
+              q+=GetPixelComponents(frame_image);
             }
           }
           (void) SyncCacheViewAuthenticPixels(frame_view,exception);
@@ -711,7 +711,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     for ( ; x < (ssize_t) (image->columns-y); x++)
     {
@@ -724,7 +724,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*AccentuateFactor+(MagickRealType) foreground*
         (QuantumRange-AccentuateFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     for ( ; x < (ssize_t) image->columns; x++)
     {
@@ -737,7 +737,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -781,10 +781,10 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     for ( ; x < (ssize_t) (image->columns-raise_info->width); x++)
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     for ( ; x < (ssize_t) image->columns; x++)
     {
       SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
@@ -796,7 +796,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -840,7 +840,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
         (QuantumRange-HighlightFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     for ( ; x < (ssize_t) (image->columns-(image->rows-y)); x++)
     {
@@ -853,7 +853,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*TroughFactor+(MagickRealType) background*
         (QuantumRange-TroughFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     for ( ; x < (ssize_t) image->columns; x++)
     {
@@ -866,7 +866,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
         GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
         (QuantumRange-ShadowFactor))),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index 00f7623007f6e5baa7efae8c2d514911cb7cf239..fb195450d898c72152b866f68df60cf328aa3bb2 100644 (file)
@@ -3752,7 +3752,7 @@ static MagickBooleanType XColorEditImage(Display *display,
                         SetPixelBlue(*image,ScaleShortToQuantum(
                           color.blue),q);
                       }
-                    q+=GetPixelChannels(*image);
+                    q+=GetPixelComponents(*image);
                   }
                   if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
                     break;
@@ -3825,7 +3825,7 @@ static MagickBooleanType XColorEditImage(Display *display,
                 SetPixelRed(*image,ScaleShortToQuantum(color.red),q);
                 SetPixelGreen(*image,ScaleShortToQuantum(color.green),q);
                 SetPixelBlue(*image,ScaleShortToQuantum(color.blue),q);
-                q+=GetPixelChannels(*image);
+                q+=GetPixelComponents(*image);
               }
               if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
                 break;
@@ -4312,7 +4312,7 @@ static MagickBooleanType XCompositeImage(Display *display,
         for (x=0; x < (int) image->columns; x++)
         {
           SetPixelAlpha(image,opacity,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
           break;
@@ -5330,7 +5330,7 @@ static MagickBooleanType XCropImage(Display *display,
     for (x=0; x < (int) crop_info.width; x++)
     {
       SetPixelAlpha(image,TransparentAlpha,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       break;
@@ -10043,7 +10043,7 @@ static MagickBooleanType XMatteEditImage(Display *display,
                 GetPixelPacket(*image,q,&pixel);
                 if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target))
                   SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
-                q+=GetPixelChannels(*image);
+                q+=GetPixelComponents(*image);
               }
               if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
                 break;
@@ -10099,7 +10099,7 @@ static MagickBooleanType XMatteEditImage(Display *display,
               for (x=0; x < (int) (*image)->columns; x++)
               {
                 SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
-                q+=GetPixelChannels(*image);
+                q+=GetPixelComponents(*image);
               }
               if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
                 break;
@@ -13147,7 +13147,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info,
           for (j=0; j < (int) width; j++)
           {
             SetPixelPacket(image,&pixel,s);
-            s+=GetPixelChannels(image);
+            s+=GetPixelComponents(image);
           }
           if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
             break;
index e2e170cbf74c772c9eb140b1cad2fc323f62ded2..71f6c1b413c7f17a621ba7f46922db0de658cba1 100644 (file)
@@ -2659,7 +2659,7 @@ if ( d.x == 0.5 && d.y == 0.5 ) {
           }
           SetPixelPixelInfo(distort_image,&pixel,q);
         }
-        q+=GetPixelChannels(distort_image);
+        q+=GetPixelComponents(distort_image);
       }
       sync=SyncCacheViewAuthenticPixels(distort_view,exception);
       if (sync == MagickFalse)
@@ -3028,7 +3028,7 @@ MagickExport Image *SparseColorImage(const Image *image,
         if ( channel & BlackChannel   ) pixel.black   *= QuantumRange;
         if ( channel & AlphaChannel ) pixel.alpha *= QuantumRange;
         SetPixelPixelInfo(sparse_image,&pixel,q);
-        q+=GetPixelChannels(sparse_image);
+        q+=GetPixelComponents(sparse_image);
       }
       sync=SyncCacheViewAuthenticPixels(sparse_view,exception);
       if (sync == MagickFalse)
index 81b2e73ded3ca2be67e195bf7097fecc843f52d2..fe1c2b9a83cde982343958d48c8d6a3806a1d5b6 100644 (file)
@@ -1208,7 +1208,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
         &composite);
       SetPixelPixelInfo(image,&composite,q);
       x_offset++;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3439,7 +3439,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image,
       CompositePixelInfoOver(&composite,composite.alpha,&pixel,pixel.alpha,
         &pixel);
       SetPixelPixelInfo(image,&pixel,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3905,7 +3905,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
               (void) GetStrokeColor(draw_info,x,y,&pixel);
               SetPixelPacket(image,&pixel,q);
             }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -3974,7 +3974,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
       stroke_opacity=stroke_opacity*stroke_color.alpha;
       CompositePixelOver(image,&stroke_color,stroke_opacity,q,(MagickRealType)
         GetPixelAlpha(image,q),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4217,12 +4217,12 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               GetPixelPacket(image,q,&pixel);
               if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
                 {
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                   continue;
                 }
               (void) GetFillColor(draw_info,x,y,&pixel);
               SetPixelPacket(image,&pixel,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
             if (sync == MagickFalse)
@@ -4272,7 +4272,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             {
               (void) GetFillColor(draw_info,x,y,&pixel);
               SetPixelPacket(image,&pixel,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
             if (sync == MagickFalse)
@@ -4333,12 +4333,12 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               GetPixelPacket(image,q,&pixel);
               if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
                 {
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                   continue;
                 }
               (void) GetFillColor(draw_info,x,y,&pixel);
               SetPixelAlpha(image,pixel.alpha,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
             if (sync == MagickFalse)
@@ -4388,7 +4388,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             {
               (void) GetFillColor(draw_info,x,y,&pixel);
               SetPixelAlpha(image,pixel.alpha,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
             if (sync == MagickFalse)
index 977a4f46523803b5ccd7461fb42f203d48dac569..c4c45df36588c1242dffbe1d9c359e735ba2f912 100644 (file)
@@ -392,7 +392,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
             pixel.alpha+=(*k)*GetPixelAlpha(image,p);
           gamma+=(*k)*alpha;
           k++;
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -407,8 +407,8 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
         SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
-      q+=GetPixelChannels(blur_image);
-      r+=GetPixelChannels(edge_image);
+      q+=GetPixelComponents(blur_image);
+      r+=GetPixelComponents(edge_image);
     }
     if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -702,7 +702,7 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
             pixel.alpha+=(*k)*GetPixelAlpha(image,p);
           gamma+=(*k)*alpha;
           k++;
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -717,8 +717,8 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
         SetPixelBlack(sharp_image,ClampToQuantum(gamma*pixel.black),q);
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(sharp_image,ClampToQuantum(pixel.alpha),q);
-      q+=GetPixelChannels(sharp_image);
-      r+=GetPixelChannels(edge_image);
+      q+=GetPixelComponents(sharp_image);
+      r+=GetPixelComponents(edge_image);
     }
     if (SyncCacheViewAuthenticPixels(sharp_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -983,7 +983,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
             if (image->colorspace == CMYKColorspace)
               pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels);
             k++;
-            kernel_pixels+=GetPixelChannels(image);
+            kernel_pixels+=GetPixelComponents(image);
           }
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
             SetPixelRed(blur_image,ClampToQuantum(pixel.red),q);
@@ -1002,7 +1002,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               {
                 pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels);
                 k++;
-                kernel_pixels+=GetPixelChannels(image);
+                kernel_pixels+=GetPixelComponents(image);
               }
               SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
             }
@@ -1025,7 +1025,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels);
             gamma+=(*k)*alpha;
             k++;
-            kernel_pixels+=GetPixelChannels(image);
+            kernel_pixels+=GetPixelComponents(image);
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
@@ -1045,13 +1045,13 @@ MagickExport Image *BlurImageChannel(const Image *image,
               {
                 pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels);
                 k++;
-                kernel_pixels+=GetPixelChannels(image);
+                kernel_pixels+=GetPixelComponents(image);
               }
               SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
             }
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(blur_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(blur_image);
     }
     if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1127,7 +1127,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
             if (blur_image->colorspace == CMYKColorspace)
               pixel.black+=(*k)*GetPixelBlack(blur_image,kernel_pixels);
             k++;
-            kernel_pixels+=GetPixelChannels(blur_image);
+            kernel_pixels+=GetPixelComponents(blur_image);
           }
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
             SetPixelRed(blur_image,ClampToQuantum(pixel.red),q);
@@ -1146,7 +1146,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               {
                 pixel.alpha+=(*k)*GetPixelAlpha(blur_image,kernel_pixels);
                 k++;
-                kernel_pixels+=GetPixelChannels(blur_image);
+                kernel_pixels+=GetPixelComponents(blur_image);
               }
               SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
             }
@@ -1169,7 +1169,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               pixel.black+=(*k)*alpha*GetPixelBlack(blur_image,kernel_pixels);
             gamma+=(*k)*alpha;
             k++;
-            kernel_pixels+=GetPixelChannels(blur_image);
+            kernel_pixels+=GetPixelComponents(blur_image);
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
@@ -1189,13 +1189,13 @@ MagickExport Image *BlurImageChannel(const Image *image,
               {
                 pixel.alpha+=(*k)*GetPixelAlpha(blur_image,kernel_pixels);
                 k++;
-                kernel_pixels+=GetPixelChannels(blur_image);
+                kernel_pixels+=GetPixelComponents(blur_image);
               }
               SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
             }
         }
-      p+=GetPixelChannels(blur_image);
-      q+=GetPixelChannels(blur_image);
+      p+=GetPixelComponents(blur_image);
+      q+=GetPixelComponents(blur_image);
     }
     if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1437,17 +1437,17 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
             for (u=0; u < (ssize_t) width; u++)
             {
               pixel.red+=(*k)*GetPixelRed(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               if (image->colorspace == CMYKColorspace)
                 pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels+u*
-                  GetPixelChannels(image));
+                  GetPixelComponents(image));
               k++;
             }
-            kernel_pixels+=(image->columns+width)*GetPixelChannels(image);
+            kernel_pixels+=(image->columns+width)*GetPixelComponents(image);
           }
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
             SetPixelRed(convolve_image,ClampToQuantum(pixel.red),q);
@@ -1467,11 +1467,11 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
                 for (u=0; u < (ssize_t) width; u++)
                 {
                   pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
-                    GetPixelChannels(image));
+                    GetPixelComponents(image));
                   k++;
                 }
                 kernel_pixels+=(image->columns+width)*
-                  GetPixelChannels(image);
+                  GetPixelComponents(image);
               }
               SetPixelAlpha(convolve_image,ClampToQuantum(pixel.alpha),q);
             }
@@ -1488,20 +1488,20 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
             for (u=0; u < (ssize_t) width; u++)
             {
               alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
-                kernel_pixels+u*GetPixelChannels(image)));
+                kernel_pixels+u*GetPixelComponents(image)));
               pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               if (image->colorspace == CMYKColorspace)
                 pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels+u*
-                  GetPixelChannels(image));
+                  GetPixelComponents(image));
               gamma+=(*k)*alpha;
               k++;
             }
-            kernel_pixels+=(image->columns+width)*GetPixelChannels(image);
+            kernel_pixels+=(image->columns+width)*GetPixelComponents(image);
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
@@ -1525,13 +1525,13 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
                   k++;
                 }
                 kernel_pixels+=(image->columns+width)*
-                  GetPixelChannels(image);
+                  GetPixelComponents(image);
               }
               SetPixelAlpha(convolve_image,ClampToQuantum(pixel.alpha),q);
             }
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(convolve_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(convolve_image);
     }
     sync=SyncCacheViewAuthenticPixels(convolve_view,exception);
     if (sync == MagickFalse)
@@ -1794,7 +1794,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
           case 4: pixel[j]=GetPixelBlack(image,p); break;
           default: break;
         }
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
         j++;
       }
       j++;
@@ -1832,7 +1832,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
           case 4: SetPixelBlack(despeckle_image,pixel[j],q); break;
           default: break;
         }
-        q+=GetPixelChannels(despeckle_image);
+        q+=GetPixelComponents(despeckle_image);
         j++;
       }
       sync=SyncCacheViewAuthenticPixels(despeckle_view,exception);
@@ -2200,18 +2200,18 @@ MagickExport Image *FilterImageChannel(const Image *image,
             for (u=0; u < (ssize_t) kernel->height; u++)
             {
               pixel.red+=(*k)*GetPixelRed(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               if (image->colorspace == CMYKColorspace)
                 pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels+u*
-                  GetPixelChannels(image));
+                  GetPixelComponents(image));
               k++;
             }
             kernel_pixels+=(image->columns+kernel->width)*
-              GetPixelChannels(image);
+              GetPixelComponents(image);
           }
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
             SetPixelRed(filter_image,ClampToQuantum(pixel.red),q);
@@ -2231,11 +2231,11 @@ MagickExport Image *FilterImageChannel(const Image *image,
                 for (u=0; u < (ssize_t) kernel->height; u++)
                 {
                   pixel.alpha+=(*k)*GetPixelRed(image,kernel_pixels+u*
-                    GetPixelChannels(image));
+                    GetPixelComponents(image));
                   k++;
                 }
                 kernel_pixels+=(image->columns+kernel->width)*
-                  GetPixelChannels(image);
+                  GetPixelComponents(image);
               }
               SetPixelAlpha(filter_image,ClampToQuantum(pixel.alpha),q);
             }
@@ -2252,21 +2252,21 @@ MagickExport Image *FilterImageChannel(const Image *image,
             for (u=0; u < (ssize_t) kernel->height; u++)
             {
               alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
-                kernel_pixels+u*GetPixelChannels(image)));
+                kernel_pixels+u*GetPixelComponents(image)));
               pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels+u*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
               if (image->colorspace == CMYKColorspace)
                 pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels+u*
-                  GetPixelChannels(image));
+                  GetPixelComponents(image));
               gamma+=(*k)*alpha;
               k++;
             }
             kernel_pixels+=(image->columns+kernel->width)*
-              GetPixelChannels(image);
+              GetPixelComponents(image);
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
@@ -2287,17 +2287,17 @@ MagickExport Image *FilterImageChannel(const Image *image,
                 for (u=0; u < (ssize_t) kernel->height; u++)
                 {
                   pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
-                    GetPixelChannels(image));
+                    GetPixelComponents(image));
                   k++;
                 }
                 kernel_pixels+=(image->columns+kernel->width)*
-                  GetPixelChannels(image);
+                  GetPixelComponents(image);
               }
               SetPixelAlpha(filter_image,ClampToQuantum(pixel.alpha),q);
             }
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(filter_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(filter_image);
     }
     sync=SyncCacheViewAuthenticPixels(filter_view,exception);
     if (sync == MagickFalse)
@@ -2691,7 +2691,7 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
             SetPixelAlpha(blur_image,
               ClampToQuantum(qixel.alpha),q);
         }
-      q+=GetPixelChannels(blur_image);
+      q+=GetPixelComponents(blur_image);
     }
     if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3504,7 +3504,7 @@ MagickExport Image *RadialBlurImageChannel(const Image *image,
             SetPixelAlpha(blur_image,
               ClampToQuantum(normalize*qixel.alpha),q);
         }
-      q+=GetPixelChannels(blur_image);
+      q+=GetPixelComponents(blur_image);
     }
     if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3749,19 +3749,19 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
           {
             for (u=0; u < (ssize_t) width; u++)
             {
-              contrast=GetPixelIntensity(image,p+(u+j)*GetPixelChannels(image))-
+              contrast=GetPixelIntensity(image,p+(u+j)*GetPixelComponents(image))-
                 (double) GetPixelIntensity(blur_image,q);
               if (fabs(contrast) < threshold)
                 {
                   pixel.red+=(*k)*
-                    GetPixelRed(image,p+(u+j)*GetPixelChannels(image));
+                    GetPixelRed(image,p+(u+j)*GetPixelComponents(image));
                   pixel.green+=(*k)*
-                    GetPixelGreen(image,p+(u+j)*GetPixelChannels(image));
+                    GetPixelGreen(image,p+(u+j)*GetPixelComponents(image));
                   pixel.blue+=(*k)*
-                    GetPixelBlue(image,p+(u+j)*GetPixelChannels(image));
+                    GetPixelBlue(image,p+(u+j)*GetPixelComponents(image));
                   if (image->colorspace == CMYKColorspace)
                     pixel.black+=(*k)*
-                      GetPixelBlack(image,p+(u+j)*GetPixelChannels(image));
+                      GetPixelBlack(image,p+(u+j)*GetPixelComponents(image));
                   gamma+=(*k);
                   k++;
                 }
@@ -3790,12 +3790,12 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 for (u=0; u < (ssize_t) width; u++)
                 {
                   contrast=GetPixelIntensity(image,p+(u+j)*
-                    GetPixelChannels(image))-(double)
+                    GetPixelComponents(image))-(double)
                     GetPixelIntensity(blur_image,q);
                   if (fabs(contrast) < threshold)
                     {
                       pixel.alpha+=(*k)*
-                        GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image));
+                        GetPixelAlpha(image,p+(u+j)*GetPixelComponents(image));
                       gamma+=(*k);
                       k++;
                     }
@@ -3820,23 +3820,23 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
             for (u=0; u < (ssize_t) width; u++)
             {
               contrast=GetPixelIntensity(image,p+(u+j)*
-                GetPixelChannels(image))-(double)
+                GetPixelComponents(image))-(double)
                 GetPixelIntensity(blur_image,q);
               if (fabs(contrast) < threshold)
                 {
                   alpha=(MagickRealType) (QuantumScale*
-                    GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image)));
+                    GetPixelAlpha(image,p+(u+j)*GetPixelComponents(image)));
                   pixel.red+=(*k)*alpha*
-                    GetPixelRed(image,p+(u+j)*GetPixelChannels(image));
+                    GetPixelRed(image,p+(u+j)*GetPixelComponents(image));
                   pixel.green+=(*k)*alpha*GetPixelGreen(image,p+(u+j)*
-                    GetPixelChannels(image));
+                    GetPixelComponents(image));
                   pixel.blue+=(*k)*alpha*GetPixelBlue(image,p+(u+j)*
-                    GetPixelChannels(image));
+                    GetPixelComponents(image));
                   pixel.alpha+=(*k)*GetPixelAlpha(image,p+(u+j)*
-                    GetPixelChannels(image));
+                    GetPixelComponents(image));
                   if (image->colorspace == CMYKColorspace)
                     pixel.black+=(*k)*GetPixelBlack(image,p+(u+j)*
-                      GetPixelChannels(image));
+                      GetPixelComponents(image));
                   gamma+=(*k)*alpha;
                   k++;
                 }
@@ -3865,12 +3865,12 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 for (u=0; u < (ssize_t) width; u++)
                 {
                   contrast=GetPixelIntensity(image,p+(u+j)*
-                    GetPixelChannels(image))-(double)
+                    GetPixelComponents(image))-(double)
                     GetPixelIntensity(blur_image,q);
                   if (fabs(contrast) < threshold)
                     {
                       pixel.alpha+=(*k)*
-                        GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image));
+                        GetPixelAlpha(image,p+(u+j)*GetPixelComponents(image));
                       gamma+=(*k);
                       k++;
                     }
@@ -3885,8 +3885,8 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
                 }
             }
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(blur_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(blur_image);
     }
     sync=SyncCacheViewAuthenticPixels(blur_view,exception);
     if (sync == MagickFalse)
@@ -4042,26 +4042,26 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
       Shade this row of pixels.
     */
     normal.z=2.0*(double) QuantumRange;  /* constant Z of surface normal */
-    s0=p+GetPixelChannels(image);
-    s1=s0+(image->columns+2)*GetPixelChannels(image);
-    s2=s1+(image->columns+2)*GetPixelChannels(image);
+    s0=p+GetPixelComponents(image);
+    s1=s0+(image->columns+2)*GetPixelComponents(image);
+    s2=s1+(image->columns+2)*GetPixelComponents(image);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       /*
         Determine the surface normal and compute shading.
       */
-      normal.x=(double) (GetPixelIntensity(image,s0-GetPixelChannels(image))+
-        GetPixelIntensity(image,s1-GetPixelChannels(image))+
-        GetPixelIntensity(image,s2-GetPixelChannels(image))-
-        GetPixelIntensity(image,s0+GetPixelChannels(image))-
-        GetPixelIntensity(image,s1+GetPixelChannels(image))-
-        GetPixelIntensity(image,s2+GetPixelChannels(image)));
-      normal.y=(double) (GetPixelIntensity(image,s2-GetPixelChannels(image))+
+      normal.x=(double) (GetPixelIntensity(image,s0-GetPixelComponents(image))+
+        GetPixelIntensity(image,s1-GetPixelComponents(image))+
+        GetPixelIntensity(image,s2-GetPixelComponents(image))-
+        GetPixelIntensity(image,s0+GetPixelComponents(image))-
+        GetPixelIntensity(image,s1+GetPixelComponents(image))-
+        GetPixelIntensity(image,s2+GetPixelComponents(image)));
+      normal.y=(double) (GetPixelIntensity(image,s2-GetPixelComponents(image))+
         GetPixelIntensity(image,s2)+
-        GetPixelIntensity(image,s2+GetPixelChannels(image))-
-        GetPixelIntensity(image,s0-GetPixelChannels(image))-
+        GetPixelIntensity(image,s2+GetPixelComponents(image))-
+        GetPixelIntensity(image,s0-GetPixelComponents(image))-
         GetPixelIntensity(image,s0)-
-        GetPixelIntensity(image,s0+GetPixelChannels(image)));
+        GetPixelIntensity(image,s0+GetPixelComponents(image)));
       if ((normal.x == 0.0) && (normal.y == 0.0))
         shade=light.z;
       else
@@ -4092,10 +4092,10 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
             GetPixelBlue(image,s1)),q);
         }
       SetPixelAlpha(shade_image,GetPixelAlpha(image,s1),q);
-      s0+=GetPixelChannels(image);
-      s1+=GetPixelChannels(image);
-      s2+=GetPixelChannels(image);
-      q+=GetPixelChannels(shade_image);
+      s0+=GetPixelComponents(image);
+      s1+=GetPixelComponents(image);
+      s2+=GetPixelComponents(image);
+      q+=GetPixelComponents(shade_image);
     }
     if (SyncCacheViewAuthenticPixels(shade_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4344,7 +4344,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
         random_info[id])-0.5),(double) y+width*(GetPseudoRandomValue(
         random_info[id])-0.5),&pixel,exception);
       SetPixelPixelInfo(spread_image,&pixel,q);
-      q+=GetPixelChannels(spread_image);
+      q+=GetPixelComponents(spread_image);
     }
     if (SyncCacheViewAuthenticPixels(spread_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -5125,12 +5125,12 @@ MagickExport Image *StatisticImageChannel(const Image *image,
       for (v=0; v < (ssize_t) StatisticHeight; v++)
       {
         for (u=0; u < (ssize_t) StatisticWidth; u++)
-          InsertPixelList(image,r+u*GetPixelChannels(image),pixel_list[id]);
-        r+=(image->columns+StatisticWidth)*GetPixelChannels(image);
+          InsertPixelList(image,r+u*GetPixelComponents(image),pixel_list[id]);
+        r+=(image->columns+StatisticWidth)*GetPixelComponents(image);
       }
       GetPixelInfo(image,&pixel);
       SetPixelInfo(image,p+(StatisticWidth*StatisticHeight/2)*
-        GetPixelChannels(image),&pixel);
+        GetPixelComponents(image),&pixel);
       switch (type)
       {
         case GradientStatistic:
@@ -5198,8 +5198,8 @@ MagickExport Image *StatisticImageChannel(const Image *image,
       if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
           (image->matte != MagickFalse))
         SetPixelAlpha(statistic_image,ClampToQuantum(pixel.alpha),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(statistic_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(statistic_image);
     }
     if (SyncCacheViewAuthenticPixels(statistic_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -5419,8 +5419,8 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image,
           SetPixelAlpha(unsharp_image,
             ClampToQuantum(pixel.alpha),q);
         }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(unsharp_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(unsharp_image);
     }
     if (SyncCacheViewAuthenticPixels(unsharp_view,exception) == MagickFalse)
       status=MagickFalse;
index a5c32e7bd09f86267870a81dfb64d2fd6619ced4..d81d4d0950d34be967bc38e78d7f4def06adddf7 100644 (file)
@@ -626,7 +626,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
         (cdl_map[ScaleQuantumToMap(GetPixelGreen(image,q))].green-luma)),q);
       SetPixelBlue(image,ClampToQuantum(luma+color_correction.saturation*
         (cdl_map[ScaleQuantumToMap(GetPixelBlue(image,q))].blue-luma)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -808,7 +808,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image)
               SetPixelAlpha(image,ClampAlphaPixelComponent(clut_map+
                 ScaleQuantumToMap(GetPixelAlpha(image,q))),q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -968,7 +968,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
       SetPixelRed(image,red,q);
       SetPixelGreen(image,green,q);
       SetPixelBlue(image,blue,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1106,7 +1106,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
         histogram[ScaleQuantumToMap(intensity)].green++;
         histogram[ScaleQuantumToMap(intensity)].blue++;
         histogram[ScaleQuantumToMap(intensity)].black++;
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     else
       for (x=0; x < (ssize_t) image->columns; x++)
@@ -1122,7 +1122,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
           histogram[ScaleQuantumToMap(GetPixelBlack(image,p))].black++;
         if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
           histogram[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha++;
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
   }
   /*
@@ -1408,7 +1408,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
             SetPixelAlpha(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
               GetPixelAlpha(image,q))].alpha),q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1605,8 +1605,8 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
         (total_weight/2)-1)/total_weight),q);
       SetPixelAlpha(enhance_image,(Quantum) ((aggregate.alpha+
         (total_weight/2)-1)/total_weight),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(enhance_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(enhance_image);
     }
     if (SyncCacheViewAuthenticPixels(enhance_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1736,7 +1736,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image)
         histogram[ScaleQuantumToMap(GetPixelBlack(image,p))].black++;
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         histogram[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   /*
@@ -1868,7 +1868,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image)
           (white.alpha != black.alpha))
         SetPixelAlpha(image,ClampToQuantum(equalize_map[
           ScaleQuantumToMap(GetPixelAlpha(image,q))].alpha),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2051,7 +2051,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma)
                   ScaleQuantumToMap(GetPixelAlpha(image,q))],q);
             }
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
         (image->colorspace == CMYKColorspace))
@@ -2262,7 +2262,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image,
       if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) && (image->matte != MagickFalse))
         SetPixelAlpha(image,
           ClampToQuantum(pixel.alpha),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2423,7 +2423,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,
           (image->colorspace == CMYKColorspace))
         SetPixelBlack(image,
           LevelQuantum(GetPixelBlack(image,q)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2575,7 +2575,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image,
       if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
           (image->matte == MagickTrue))
         SetPixelAlpha(image,LevelizeValue(GetPixelAlpha(image,q)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2803,7 +2803,7 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
     for (x=(ssize_t) image->columns-1; x >= 0; x--)
     {
       histogram[ScaleQuantumToMap(GetPixelIntensity(image,p))]++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   /*
@@ -3091,7 +3091,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
       SetPixelRed(image,red,q);
       SetPixelGreen(image,green,q);
       SetPixelBlue(image,blue,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3227,7 +3227,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
           if ((GetPixelRed(image,q) != GetPixelGreen(image,q)) ||
               (GetPixelGreen(image,q) != GetPixelBlue(image,q)))
             {
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
               continue;
             }
           if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
@@ -3241,7 +3241,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
             SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q);
           if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
             SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -3298,7 +3298,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
         SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q);
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3523,7 +3523,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image,
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
           GetPixelAlpha(image,q))]),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index bc1f0d0fe8e9b7c9c2e26621b71a5617a6487149..806a693d6d33a993e5ecac77ad02484833b26473 100644 (file)
@@ -255,7 +255,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
       if (image->matte != MagickFalse)
         grays[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha=
           ScaleQuantumToMap(GetPixelAlpha(image,p));
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   image_view=DestroyCacheView(image_view);
@@ -419,7 +419,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
         status=MagickFalse;
         continue;
       }
-    p+=distance*GetPixelChannels(image);;
+    p+=distance*GetPixelComponents(image);;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       for (i=0; i < 4; i++)
@@ -464,7 +464,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
         v=0;
         while (grays[u].red != ScaleQuantumToMap(GetPixelRed(image,p)))
           u++;
-        while (grays[v].red != ScaleQuantumToMap(GetPixelRed(image,p+offset*GetPixelChannels(image))))
+        while (grays[v].red != ScaleQuantumToMap(GetPixelRed(image,p+offset*GetPixelComponents(image))))
           v++;
         cooccurrence[u][v].direction[i].red++;
         cooccurrence[v][u].direction[i].red++;
@@ -472,7 +472,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
         v=0;
         while (grays[u].green != ScaleQuantumToMap(GetPixelGreen(image,p)))
           u++;
-        while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(image,p+offset*GetPixelChannels(image))))
+        while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(image,p+offset*GetPixelComponents(image))))
           v++;
         cooccurrence[u][v].direction[i].green++;
         cooccurrence[v][u].direction[i].green++;
@@ -480,7 +480,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
         v=0;
         while (grays[u].blue != ScaleQuantumToMap(GetPixelBlue(image,p)))
           u++;
-        while (grays[v].blue != ScaleQuantumToMap(GetPixelBlue(image,p+offset*GetPixelChannels(image))))
+        while (grays[v].blue != ScaleQuantumToMap(GetPixelBlue(image,p+offset*GetPixelComponents(image))))
           v++;
         cooccurrence[u][v].direction[i].blue++;
         cooccurrence[v][u].direction[i].blue++;
@@ -490,7 +490,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
             v=0;
             while (grays[u].black != ScaleQuantumToMap(GetPixelBlack(image,p)))
               u++;
-            while (grays[v].black != ScaleQuantumToMap(GetPixelBlack(image,p+offset*GetPixelChannels(image))))
+            while (grays[v].black != ScaleQuantumToMap(GetPixelBlack(image,p+offset*GetPixelComponents(image))))
               v++;
             cooccurrence[u][v].direction[i].black++;
             cooccurrence[v][u].direction[i].black++;
@@ -501,13 +501,13 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
             v=0;
             while (grays[u].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p)))
               u++;
-            while (grays[v].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p+offset*GetPixelChannels(image))))
+            while (grays[v].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p+offset*GetPixelComponents(image))))
               v++;
             cooccurrence[u][v].direction[i].alpha++;
             cooccurrence[v][u].direction[i].alpha++;
           }
       }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   grays=(LongPixelPacket *) RelinquishMagickMemory(grays);
index b7fbf67679b6a470d7cc058988213d599096a5e0..948b67f737a2953a2acbd0b19a604fc8ee2c9d08 100644 (file)
@@ -339,7 +339,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info,
         }
       }
       i++;
-      q+=GetPixelChannels(magnitude_image);
+      q+=GetPixelComponents(magnitude_image);
     }
     status=SyncCacheViewAuthenticPixels(magnitude_view,exception);
     if (status == MagickFalse)
@@ -395,7 +395,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info,
         }
       }
       i++;
-      q+=GetPixelChannels(phase_image);
+      q+=GetPixelComponents(phase_image);
     }
     status=SyncCacheViewAuthenticPixels(phase_view,exception);
     if (status == MagickFalse)
@@ -492,7 +492,7 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info,
         }
       }
       i++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   image_view=DestroyCacheView(image_view);
@@ -913,7 +913,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info,
         }
       }
       i++;
-      p+=GetPixelChannels(magnitude_image);
+      p+=GetPixelComponents(magnitude_image);
     }
   }
   i=0L;
@@ -961,7 +961,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info,
         }
       }
       i++;
-      p+=GetPixelChannels(phase_image);
+      p+=GetPixelComponents(phase_image);
     }
   }
   if (fourier_info->modulus != MagickFalse)
@@ -1125,7 +1125,7 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info,
         }
       }
       i++;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       break;
index 8a962e31e5810f87fa857d4d15bf199c49c0adea..11e87422529b93a6d02dc61076631f01ad45edad 100644 (file)
@@ -409,8 +409,8 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(noise_image,ClampToQuantum(GenerateDifferentialNoise(
           random_info[id],GetPixelAlpha(image,p),noise_type,attenuate)),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(noise_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(noise_image);
     }
     sync=SyncCacheViewAuthenticPixels(noise_view,exception);
     if (sync == MagickFalse)
@@ -566,8 +566,8 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor,
       SetPixelRed(shift_image,ClampToQuantum(pixel.red),q);
       SetPixelGreen(shift_image,ClampToQuantum(pixel.green),q);
       SetPixelBlue(shift_image,ClampToQuantum(pixel.blue),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(shift_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(shift_image);
     }
     sync=SyncCacheViewAuthenticPixels(shift_view,exception);
     if (sync == MagickFalse)
@@ -798,8 +798,8 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity,
         (100.0-pixel.blue)+colorize.blue*pixel.blue)/100.0),q);
       SetPixelAlpha(colorize_image,ClampToQuantum((GetPixelAlpha(image,p)*
         (100.0-pixel.alpha)+colorize.alpha*pixel.alpha)/100.0),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(colorize_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(colorize_image);
     }
     sync=SyncCacheViewAuthenticPixels(colorize_view,exception);
     if (sync == MagickFalse)
@@ -1018,8 +1018,8 @@ MagickExport Image *ColorMatrixImage(const Image *image,
           }
         }
       }
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(color_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(color_image);
     }
     if (SyncCacheViewAuthenticPixels(color_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3019,7 +3019,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression,
           SetPixelAlpha(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
             alpha),q);
         }
-      q+=GetPixelChannels(fx_image);
+      q+=GetPixelComponents(fx_image);
     }
     if (SyncCacheViewAuthenticPixels(fx_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3208,7 +3208,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
             exception);
           SetPixelPixelInfo(implode_image,&pixel,q);
         }
-      q+=GetPixelChannels(implode_image);
+      q+=GetPixelComponents(implode_image);
     }
     if (SyncCacheViewAuthenticPixels(implode_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3415,8 +3415,8 @@ MagickExport Image *MorphImages(const Image *image,
             SetPixelBlack(morph_images,ClampToQuantum(alpha*
               GetPixelBlack(morph_images,q)+beta*GetPixelBlack(morph_image,p)),
               q);
-          p+=GetPixelChannels(morph_image);
-          q+=GetPixelChannels(morph_images);
+          p+=GetPixelComponents(morph_image);
+          q+=GetPixelComponents(morph_images);
         }
         sync=SyncCacheViewAuthenticPixels(morph_view,exception);
         if (sync == MagickFalse)
@@ -4027,8 +4027,8 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
         SetPixelGreen(sepia_image,ClampToQuantum(tone),q);
       if ((MagickRealType) GetPixelBlue(image,q) < tone)
         SetPixelBlue(sepia_image,ClampToQuantum(tone),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(sepia_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(sepia_image);
     }
     if (SyncCacheViewAuthenticPixels(sepia_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4173,7 +4173,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
       else
         SetPixelAlpha(border_image,ClampToQuantum((MagickRealType)
           (GetPixelAlpha(border_image,q)*opacity/100.0)),q);
-      q+=GetPixelChannels(border_image);
+      q+=GetPixelComponents(border_image);
     }
     if (SyncCacheViewAuthenticPixels(border_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4315,7 +4315,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
       if (image->colorspace == CMYKColorspace)
         pixel.black=pixel.red;
       SetPixelPixelInfo(random_image,&pixel,q);
-      q+=GetPixelChannels(random_image);
+      q+=GetPixelComponents(random_image);
     }
     if (SyncCacheViewAuthenticPixels(random_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4464,7 +4464,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
         SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
       if ((MagickRealType) GetPixelBlue(image,q) > threshold)
         SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4777,7 +4777,7 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image,
       SetPixelBlue(image,GetPixelBlue(left_image,q),r);
       SetPixelAlpha(image,(GetPixelAlpha(left_image,p)+
         GetPixelAlpha(left_image,q))/2,r);
-      p+=GetPixelChannels(left_image);
+      p+=GetPixelComponents(left_image);
       q++;
       r++;
     }
@@ -4961,7 +4961,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
             center.y),&pixel,exception);
           SetPixelPixelInfo(swirl_image,&pixel,q);
         }
-      q+=GetPixelChannels(swirl_image);
+      q+=GetPixelComponents(swirl_image);
     }
     if (SyncCacheViewAuthenticPixels(swirl_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -5142,8 +5142,8 @@ MagickExport Image *TintImage(const Image *image,const char *opacity,
         (1.0-(4.0*(weight*weight)));
       SetPixelBlue(tint_image,ClampToQuantum(pixel.blue),q);
       SetPixelAlpha(tint_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(tint_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(tint_image);
     }
     if (SyncCacheViewAuthenticPixels(tint_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -5396,7 +5396,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
         UndefinedInterpolatePixel,(double) x,(double) (y-sine_map[x]),&pixel,
         exception);
       SetPixelPixelInfo(wave_image,&pixel,q);
-      q+=GetPixelChannels(wave_image);
+      q+=GetPixelComponents(wave_image);
     }
     if (SyncCacheViewAuthenticPixels(wave_view,exception) == MagickFalse)
       status=MagickFalse;
index 9cbb84d93326e8976716efbd99dd7f0b8c3ae423..12dd013d021c8a8c0df04fdaa80892ec162ceb1e 100644 (file)
@@ -288,7 +288,7 @@ static CubeInfo *ClassifyImageColors(const Image *image,
           node_info->number_unique++;
           cube_info->colors++;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     proceed=SetImageProgress(image,EvaluateImageTag,(MagickOffsetType) y,
       image->rows);
@@ -761,7 +761,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image,
           if (cube_info->colors > MaximumUniqueColors)
             break;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (x < (ssize_t) image->columns)
       break;
@@ -921,7 +921,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image,
           if (cube_info->colors > 256)
             break;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (x < (ssize_t) image->columns)
       break;
index cb5b45218a622ce0c806505cca58fa6d0c81b1fe..be8ffe65fcab95967b00a046ddf76029355b2b86 100644 (file)
@@ -588,7 +588,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             {
               if (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha)
                 break;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             if (x < (ssize_t) image->columns)
               break;
index 398d9558ded0672f2ddab8b839622ac4718138e0..e7ce661871cd264e9871f7e1ebc4ea2dd8311676 100644 (file)
@@ -543,8 +543,8 @@ MagickExport Image *AppendImages(const Image *images,
         SetPixelAlpha(append_image,OpaqueAlpha,q);
         if (image->matte != MagickFalse)
           SetPixelAlpha(append_image,GetPixelAlpha(image,p),q);
-        p+=GetPixelChannels(image);
-        q+=GetPixelChannels(append_image);
+        p+=GetPixelComponents(image);
+        q+=GetPixelComponents(append_image);
       }
       sync=SyncCacheViewAuthenticPixels(append_view,exception);
       if (sync == MagickFalse)
@@ -773,7 +773,7 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
   (void) ResetMagickMemory(clone_image,0,sizeof(*clone_image));
   clone_image->signature=MagickSignature;
   clone_image->storage_class=image->storage_class;
-  clone_image->pixel_channels=image->pixel_channels;
+  clone_image->pixel_components=image->pixel_components;
   clone_image->metacontent_extent=image->metacontent_extent;
   clone_image->colorspace=image->colorspace;
   clone_image->matte=image->matte;
@@ -1095,7 +1095,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
           SetPixelRed(image,GetPixelIntensity(image,p),q);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
           q++;
         }
         image_view=DestroyCacheView(image_view);
@@ -1112,7 +1112,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
           SetPixelGreen(image,GetPixelIntensity(image,p),q);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
           q++;
         }
         image_view=DestroyCacheView(image_view);
@@ -1129,7 +1129,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
           SetPixelBlue(image,GetPixelIntensity(image,p),q);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
           q++;
         }
         image_view=DestroyCacheView(image_view);
@@ -1146,7 +1146,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
           SetPixelBlack(image,GetPixelIntensity(image,p),q);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
           q++;
         }
         image_view=DestroyCacheView(image_view);
@@ -1163,7 +1163,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         for (x=0; x < (ssize_t) combine_image->columns; x++)
         {
           SetPixelAlpha(image,GetPixelIntensity(image,p),q);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
           q++;
         }
         image_view=DestroyCacheView(image_view);
@@ -1922,7 +1922,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image,
               (pixel.alpha != (QuantumAny) pixel.alpha))
             break;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (x < (ssize_t) image->columns)
       status=MagickFalse;
@@ -2153,7 +2153,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelPixelInfo(image,background,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2359,7 +2359,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
         {
           SetPixelGreen(image,GetPixelRed(image,q),q);
           SetPixelBlue(image,GetPixelRed(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2369,7 +2369,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
         {
           SetPixelRed(image,GetPixelGreen(image,q),q);
           SetPixelBlue(image,GetPixelGreen(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2379,7 +2379,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
         {
           SetPixelRed(image,GetPixelBlue(image,q),q);
           SetPixelGreen(image,GetPixelBlue(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2390,7 +2390,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
           SetPixelRed(image,GetPixelAlpha(image,q),q);
           SetPixelGreen(image,GetPixelAlpha(image,q),q);
           SetPixelBlue(image,GetPixelAlpha(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2404,7 +2404,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
           SetPixelRed(image,GetPixelBlack(image,q),q);
           SetPixelGreen(image,GetPixelBlack(image,q),q);
           SetPixelBlue(image,GetPixelBlack(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2415,7 +2415,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
           SetPixelRed(image,GetPixelAlpha(image,q),q);
           SetPixelGreen(image,GetPixelAlpha(image,q),q);
           SetPixelBlue(image,GetPixelAlpha(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2424,7 +2424,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           SetPixelAlpha(image,GetPixelIntensity(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -2640,7 +2640,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
               if (image->colorspace == CMYKColorspace)
                 SetPixelBlack(image,pixel.black,q);
             }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
           status=MagickFalse;
@@ -2794,7 +2794,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
       SetPixelPacket(image,&pixel,q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(image,pixel.black,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2877,7 +2877,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelPixelInfo(image,color,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3536,7 +3536,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelAlpha(image,opacity,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -4187,7 +4187,7 @@ MagickExport MagickBooleanType SyncImage(Image *image)
       index=PushColormapIndex(image,(size_t) GetPixelIndex(image,q),
         &range_exception);
       SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index 558d2c5850e5f06be3b6417506e9a8fad60432f7..8faccd19102890e946d00e02caea21b86e29dcc8 100644 (file)
@@ -280,7 +280,7 @@ struct _Image
     ping;
 
   size_t
-    pixel_channels,
+    pixel_components,
     metacontent_extent;
 
   MagickBooleanType
index 2c90494e441056a009802da8d2d592ac783cf817..d7f1e6c05f28ece7130d462acd27f3353d5e824d 100644 (file)
@@ -120,7 +120,7 @@ static void ClearBounds(Image *image,RectangleInfo *bounds)
     for (x=0; x < (ssize_t) bounds->width; x++)
     {
       SetPixelAlpha(image,TransparentAlpha,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -194,7 +194,7 @@ static MagickBooleanType IsBoundsCleared(const Image *image1,
       if ((GetPixelAlpha(image1,p) <= (Quantum) (QuantumRange/2)) &&
           (GetPixelAlpha(image1,q) > (Quantum) (QuantumRange/2)))
         break;
-      p+=GetPixelChannels(image1);
+      p+=GetPixelComponents(image1);
       q++;
     }
     if (x < (ssize_t) bounds->width)
@@ -633,7 +633,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       SetPixelInfo(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
-      p+=GetPixelChannels(image1);
+      p+=GetPixelComponents(image1);
       q++;
     }
     if (y < (ssize_t) image1->rows)
@@ -664,7 +664,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       SetPixelInfo(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
-      p+=GetPixelChannels(image1);
+      p+=GetPixelComponents(image1);
       q++;
     }
     if (y < (ssize_t) image1->rows)
@@ -684,7 +684,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       SetPixelInfo(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
-      p+=GetPixelChannels(image1);
+      p+=GetPixelComponents(image1);
       q++;
     }
     if (x < (ssize_t) image1->columns)
@@ -704,7 +704,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
       SetPixelInfo(image2,q,&pixel2);
       if (ComparePixels(method,&pixel1,&pixel2))
         break;
-      p+=GetPixelChannels(image1);
+      p+=GetPixelComponents(image1);
       q++;
     }
     if (x < (ssize_t) image1->columns)
index f441c361b31f147b5e76c125a28b6ddf907d60b0..ca540abc6e0d62c15a437a97f2bafc25f2444863 100644 (file)
@@ -1365,7 +1365,7 @@ MagickExport Image *ReadPICTImage(const ImageInfo *image_info,
       SetPixelBlue(image,ScaleCharToQuantum(Pixel.blue & 0xff),q);
       if (image->storage_class == PseudoClass)
         SetPixelIndex(image,Color2Index(&Pixel),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index aae2cd7ee0c08364e8606cdd3a0af85a6a903233..00ca774f6fe4cd1d14f0b7632630e88350cd4488 100644 (file)
@@ -2632,14 +2632,14 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
         * This removes need for 'cloning' a new image every iteration
         */
         SetPixelRed(morphology_image,GetPixelRed(image,p+r*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
         SetPixelGreen(morphology_image,GetPixelGreen(image,p+r*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
         SetPixelBlue(morphology_image,GetPixelBlue(image,p+r*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
         if (image->colorspace == CMYKColorspace)
           SetPixelBlack(morphology_image,GetPixelBlack(image,p+r*
-            GetPixelChannels(image)),q);
+            GetPixelComponents(image)),q);
 
         /* Set the bias of the weighted average output */
         result.red     =
@@ -2732,8 +2732,8 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
             || ((image->colorspace == CMYKColorspace) &&
                 (GetPixelBlack(image,p+r) != GetPixelBlack(morphology_image,q))))
           changed++;  /* The pixel was changed in some way! */
-        p+=GetPixelChannels(image);
-        q+=GetPixelChannels(morphology_image);
+        p+=GetPixelComponents(image);
+        q+=GetPixelComponents(morphology_image);
       } /* y */
       if ( SyncCacheViewAuthenticPixels(morphology_view,exception) == MagickFalse)
         status=MagickFalse;
@@ -2813,14 +2813,14 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
        * This removes need for 'cloning' a new image every iteration
        */
       SetPixelRed(morphology_image,GetPixelRed(image,p+r*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       SetPixelGreen(morphology_image,GetPixelGreen(image,p+r*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       SetPixelBlue(morphology_image,GetPixelBlue(image,p+r*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(morphology_image,GetPixelBlack(image,p+r*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
 
       /* Defaults */
       min.red     =
@@ -2891,18 +2891,18 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
                   for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                     if ( IsNan(*k) ) continue;
                     result.red     += (*k)*
-                      GetPixelRed(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelRed(image,k_pixels+u*GetPixelComponents(image));
                     result.green   += (*k)*
-                      GetPixelGreen(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelGreen(image,k_pixels+u*GetPixelComponents(image));
                     result.blue    += (*k)*
-                      GetPixelBlue(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelBlue(image,k_pixels+u*GetPixelComponents(image));
                     if (image->colorspace == CMYKColorspace)
                       result.black += (*k)*
-                        GetPixelBlack(image,k_pixels+u*GetPixelChannels(image));
+                        GetPixelBlack(image,k_pixels+u*GetPixelComponents(image));
                     result.alpha += (*k)*
-                      GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image));
                   }
-                  k_pixels += virt_width*GetPixelChannels(image);
+                  k_pixels += virt_width*GetPixelComponents(image);
                 }
                 if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
                   SetPixelRed(morphology_image,ClampToQuantum(result.red),
@@ -2936,21 +2936,21 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
                   for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                     if ( IsNan(*k) ) continue;
                     alpha=(*k)*(QuantumScale*
-                      GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                      GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
                     gamma += alpha;
                     result.red     += alpha*
-                      GetPixelRed(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelRed(image,k_pixels+u*GetPixelComponents(image));
                     result.green   += alpha*
-                      GetPixelGreen(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelGreen(image,k_pixels+u*GetPixelComponents(image));
                     result.blue    += alpha*
-                      GetPixelBlue(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelBlue(image,k_pixels+u*GetPixelComponents(image));
                     if (image->colorspace == CMYKColorspace)
                       result.black+=alpha*
-                        GetPixelBlack(image,k_pixels+u*GetPixelChannels(image));
+                        GetPixelBlack(image,k_pixels+u*GetPixelComponents(image));
                     result.alpha += (*k)*
-                      GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image));
+                      GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image));
                   }
-                  k_pixels += virt_width*GetPixelChannels(image);
+                  k_pixels += virt_width*GetPixelComponents(image);
                 }
                 /* Sync'ed channels, all channels are modified */
                 gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2982,18 +2982,18 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
               for (u=0; u < (ssize_t) kernel->width; u++, k++) {
                 if ( IsNan(*k) || (*k) < 0.5 ) continue;
                 Minimize(min.red,     (double)
-                  GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(min.green,   (double) 
-                  GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(min.blue,    (double)
-                  GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 if (image->colorspace == CMYKColorspace)
                   Minimize(min.black,(double)
-                    GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(min.alpha,(double)
-                  GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             break;
 
@@ -3015,18 +3015,18 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
               for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                 if ( IsNan(*k) || (*k) < 0.5 ) continue;
                 Maximize(max.red,     (double)
-                  GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                 Maximize(max.green,   (double) 
-                  GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                 Maximize(max.blue,    (double) 
-                  GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 if (image->colorspace == CMYKColorspace)
                   Maximize(max.black,   (double)
-                    GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                 Maximize(max.alpha,(double) 
-                  GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             break;
 
@@ -3052,33 +3052,33 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
                 if ( (*k) > 0.7 )
                 { /* minimim of foreground pixels */
                   Minimize(min.red,     (double)
-                    GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                   Minimize(min.green,   (double)
-                    GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                   Minimize(min.blue,    (double)
-                    GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                   if ( image->colorspace == CMYKColorspace)
                     Minimize(min.black,(double)
-                      GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                      GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                   Minimize(min.alpha,(double)
-                    GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
                 }
                 else if ( (*k) < 0.3 )
                 { /* maximum of background pixels */
                   Maximize(max.red,     (double)
-                    GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                   Maximize(max.green,   (double)
-                    GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                   Maximize(max.blue,    (double)
-                    GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                   if (image->colorspace == CMYKColorspace)
                     Maximize(max.black,   (double)
-                      GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                      GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                   Maximize(max.alpha,(double)
-                    GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
                 }
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             /* Pattern Match if difference is positive */
             min.red     -= max.red;     Maximize( min.red,     0.0 );
@@ -3110,7 +3110,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
                   result.red = 1.0;
                 }
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             break;
 
@@ -3138,7 +3138,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
                   result.red = 1.0;
                 }
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             break;
 #if 0
@@ -3172,7 +3172,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
                 if ( image->colorspace == CMYKColorspace)
                   Minimize(result.black,(*k)+GetPixelBlack(p_image,k_indexes+u));
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             break;
 #endif
@@ -3245,8 +3245,8 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
           ((image->colorspace == CMYKColorspace) &&
            (GetPixelBlack(image,p+r) != GetPixelBlack(morphology_image,q))))
         changed++;  /* The pixel was changed in some way! */
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(morphology_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(morphology_image);
     } /* x */
     if ( SyncCacheViewAuthenticPixels(morphology_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3405,18 +3405,18 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
               for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                 if ( IsNan(*k) ) continue;
                 Minimize(result.red,     (*k)+
-                  GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.green,   (*k)+
-                  GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.blue,    (*k)+
-                  GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 if (image->colorspace == CMYKColorspace)
                   Minimize(result.black,(*k)+
-                    GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.alpha, (*k)+
-                  GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             /* repeat with the just processed pixels of this row */
             k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
@@ -3425,16 +3425,16 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 if ( x+u-offx < 0 ) continue;  /* off the edge! */
                 if ( IsNan(*k) ) continue;
                 Minimize(result.red,     (*k)+
-                  GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.green,   (*k)+
-                  GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.blue,    (*k)+
-                  GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 if (image->colorspace == CMYKColorspace)
                   Minimize(result.black,(*k)+
-                    GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.alpha,(*k)+
-                  GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
               }
             break;
         case VoronoiMorphology:
@@ -3448,14 +3448,14 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
             for (v=0; v <= (ssize_t) offy; v++) {
               for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                 if ( IsNan(*k) ) continue;
-                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
+                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
                       &result);
                     result.alpha += *k;
                   }
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             /* repeat with the just processed pixels of this row */
             k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
@@ -3463,9 +3463,9 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
               for (u=0; u < (ssize_t) offx; u++, k--) {
                 if ( x+u-offx < 0 ) continue;  /* off the edge! */
                 if ( IsNan(*k) ) continue;
-                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
+                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
                       &result);
                     result.alpha += *k;
                   }
@@ -3504,8 +3504,8 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
            (GetPixelBlack(image,p+r) != GetPixelBlack(image,q))))
         changed++;  /* The pixel was changed in some way! */
 
-      p+=GetPixelChannels(image); /* increment pixel buffers */
-      q+=GetPixelChannels(image);
+      p+=GetPixelComponents(image); /* increment pixel buffers */
+      q+=GetPixelComponents(image);
     } /* x */
 
     if ( SyncCacheViewAuthenticPixels(auth_view,exception) == MagickFalse)
@@ -3589,18 +3589,18 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
               for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                 if ( IsNan(*k) ) continue;
                 Minimize(result.red,     (*k)+
-                  GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.green,   (*k)+
-                  GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.blue,    (*k)+
-                  GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 if ( image->colorspace == CMYKColorspace)
                   Minimize(result.black,(*k)+
-                    GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.alpha, (*k)+
-                  GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             /* repeat with the just processed pixels of this row */
             k = &kernel->values[ kernel->width*(kernel->y)+kernel->x-1 ];
@@ -3609,16 +3609,16 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 if ( (x+u-offx) >= (ssize_t)image->columns ) continue;
                 if ( IsNan(*k) ) continue;
                 Minimize(result.red,     (*k)+
-                  GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.green,   (*k)+
-                  GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.blue,    (*k)+
-                  GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
                 if ( image->colorspace == CMYKColorspace)
                   Minimize(result.black,   (*k)+
-                    GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+                    GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
                 Minimize(result.alpha, (*k)+
-                  GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
+                  GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
               }
             break;
         case VoronoiMorphology:
@@ -3632,14 +3632,14 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
             for (v=offy; v < (ssize_t) kernel->height; v++) {
               for (u=0; u < (ssize_t) kernel->width; u++, k--) {
                 if ( IsNan(*k) ) continue;
-                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
+                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
                       &result);
                     result.alpha += *k;
                   }
               }
-              k_pixels += virt_width*GetPixelChannels(image);
+              k_pixels += virt_width*GetPixelComponents(image);
             }
             /* repeat with the just processed pixels of this row */
             k = &kernel->values[ kernel->width*(kernel->y)+kernel->x-1 ];
@@ -3647,9 +3647,9 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
               for (u=offx+1; u < (ssize_t) kernel->width; u++, k--) {
                 if ( (x+u-offx) >= (ssize_t)image->columns ) continue;
                 if ( IsNan(*k) ) continue;
-                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
+                if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
                   {
-                    SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
+                    SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
                       &result);
                     result.alpha += *k;
                   }
index b7e84365896944f7f243d43e9150fb8796781fce..822c935b8eae10b1de8901e5b6a922d17f3b0346 100644 (file)
@@ -649,7 +649,7 @@ MagickExport void *ImageToHBITMAP(Image *image)
       q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(image,p));
       q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(image,p));
       q->rgbReserved=0;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
       q++;
     }
   }
index ceda3aee4aaeaf3bc67450b5b7c54531b97fe623..bac4cda9a6abcb59fea33b9fe8bde034dc4d30e1 100644 (file)
@@ -232,8 +232,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
       exception);
     if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       break;
-    p+=x1*GetPixelChannels(image);
-    q+=x1*GetPixelChannels(floodplane_image);
+    p+=x1*GetPixelComponents(image);
+    q+=x1*GetPixelComponents(floodplane_image);
     for (x=x1; x >= 0; x--)
     {
       if (GetPixelAlpha(image,q) == TransparentAlpha)
@@ -242,8 +242,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
       if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
         break;
       SetPixelAlpha(floodplane_image,TransparentAlpha,q);
-      p-=GetPixelChannels(image);
-      q-=GetPixelChannels(floodplane_image);
+      p-=GetPixelComponents(image);
+      q-=GetPixelComponents(floodplane_image);
     }
     if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
       break;
@@ -277,8 +277,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
                   break;
                 SetPixelAlpha(floodplane_image,
                   TransparentAlpha,q);
-                p+=GetPixelChannels(image);
-                q+=GetPixelChannels(floodplane_image);
+                p+=GetPixelComponents(image);
+                q+=GetPixelComponents(floodplane_image);
               }
               if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
                 break;
@@ -305,8 +305,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
             SetPixelInfo(image,p,&pixel);
             if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
               break;
-            p+=GetPixelChannels(image);
-            q+=GetPixelChannels(floodplane_image);
+            p+=GetPixelComponents(image);
+            q+=GetPixelComponents(floodplane_image);
           }
         }
       start=x;
@@ -351,8 +351,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
           if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
             SetPixelAlpha(image,ClampToQuantum(fill.alpha),q);
         }
-      p+=GetPixelChannels(floodplane_image);
-      q+=GetPixelChannels(image);
+      p+=GetPixelComponents(floodplane_image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       break;
@@ -665,19 +665,19 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
         i+=(ssize_t) (image->columns+width);
       }
       SetPixelRed(paint_image,GetPixelRed(image,p+j*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       SetPixelGreen(paint_image,GetPixelGreen(image,p+j*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       SetPixelBlue(paint_image,GetPixelBlue(image,p+j*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(paint_image,GetPixelBlack(image,p+j*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(paint_image,GetPixelAlpha(image,p+j*
-          GetPixelChannels(image)),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(paint_image);
+          GetPixelComponents(image)),q);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(paint_image);
     }
     if (SyncCacheViewAuthenticPixels(paint_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -832,7 +832,7 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image,
           if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
             SetPixelAlpha(image,ClampToQuantum(fill->alpha),q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -960,7 +960,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image,
       SetPixelInfo(image,q,&pixel);
       if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
         SetPixelAlpha(image,opacity,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1095,7 +1095,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
         MagickTrue : MagickFalse;
       if (match != invert)
         SetPixelAlpha(image,opacity,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index eb81c2058c79068ac940eb2e6412b96701ae77ea..6159c1fec7c419ac48378765745c739255e30001 100644 (file)
@@ -67,17 +67,17 @@ static inline PixelTrait GetPixelCbTraits(const Image *image)
   return(image->component_map[image->map][CbPixelComponent].traits);
 }
 
-static inline size_t GetPixelChannels(const Image *image)
-{
-  return(image->pixel_channels);
-}
-
 static inline Quantum GetPixelComponent(const Image *image,
   const PixelComponent component)
 {
   return(image->component_map[image->map][component].component);
 }
 
+static inline size_t GetPixelComponents(const Image *image)
+{
+  return(image->pixel_components);
+}
+
 static inline Quantum GetPixelCr(const Image *image,const Quantum *pixel)
 {
   return(pixel[image->component_map[image->map][CrPixelComponent].component]);
@@ -453,17 +453,17 @@ static inline void SetPixelCbTraits(Image *image,const PixelTrait traits)
   image->component_map[image->map][CbPixelComponent].traits=traits;
 }
 
-static inline void SetPixelChannels(Image *image,const size_t channels)
-{
-  image->pixel_channels=channels;
-}
-
 static inline void SetPixelComponent(const Image *image,
   const PixelComponent component,const PixelComponent components)
 {
   image->component_map[image->map][component].component=components;
 }
 
+static inline void SetPixelComponents(Image *image,const size_t channels)
+{
+  image->pixel_components=channels;
+}
+
 static inline void SetPixelComponentTraits(Image *image,
   const PixelComponent component,const PixelTrait traits)
 {
index 07d4baf6d298bac3d2cff62d27625bbfd5d7be0c..afbd12558e2f0f5154fb5ff45c9bff628c0df7c1 100644 (file)
@@ -434,7 +434,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
               *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
               *q++=ScaleQuantumToChar(GetPixelRed(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -452,7 +452,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
               *q++=ScaleQuantumToChar(GetPixelRed(image,p));
               *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -470,7 +470,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
               *q++=ScaleQuantumToChar(GetPixelRed(image,p));
               *q++=ScaleQuantumToChar((Quantum) 0);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -485,7 +485,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             for (x=0; x < (ssize_t) columns; x++)
             {
               *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -502,7 +502,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToChar(GetPixelRed(image,p));
               *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
               *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -520,7 +520,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
               *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
               *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -538,7 +538,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
               *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
               *q++=ScaleQuantumToChar((Quantum) 0);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -599,7 +599,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -622,7 +622,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(double) (QuantumScale*GetPixelBlue(image,p));
               *q++=(double) (QuantumScale*GetPixelGreen(image,p));
               *q++=(double) (QuantumScale*GetPixelRed(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -640,7 +640,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(double) (QuantumScale*GetPixelGreen(image,p));
               *q++=(double) (QuantumScale*GetPixelRed(image,p));
               *q++=(double) (QuantumScale*GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -658,7 +658,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(double) (QuantumScale*GetPixelGreen(image,p));
               *q++=(double) (QuantumScale*GetPixelRed(image,p));
               *q++=0.0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -673,7 +673,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             for (x=0; x < (ssize_t) columns; x++)
             {
               *q++=(double) (QuantumScale*GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -690,7 +690,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(double) (QuantumScale*GetPixelRed(image,p));
               *q++=(double) (QuantumScale*GetPixelGreen(image,p));
               *q++=(double) (QuantumScale*GetPixelBlue(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -708,7 +708,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(double) (QuantumScale*GetPixelGreen(image,p));
               *q++=(double) (QuantumScale*GetPixelBlue(image,p));
               *q++=(double) (QuantumScale*GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -726,7 +726,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(double) (QuantumScale*GetPixelGreen(image,p));
               *q++=(double) (QuantumScale*GetPixelBlue(image,p));
               *q++=0.0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -788,7 +788,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -811,7 +811,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(float) (QuantumScale*GetPixelBlue(image,p));
               *q++=(float) (QuantumScale*GetPixelGreen(image,p));
               *q++=(float) (QuantumScale*GetPixelRed(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -829,7 +829,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(float) (QuantumScale*GetPixelGreen(image,p));
               *q++=(float) (QuantumScale*GetPixelRed(image,p));
               *q++=(float) (QuantumScale*GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -847,7 +847,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(float) (QuantumScale*GetPixelGreen(image,p));
               *q++=(float) (QuantumScale*GetPixelRed(image,p));
               *q++=0.0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -862,7 +862,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             for (x=0; x < (ssize_t) columns; x++)
             {
               *q++=(float) (QuantumScale*GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -879,7 +879,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(float) (QuantumScale*GetPixelRed(image,p));
               *q++=(float) (QuantumScale*GetPixelGreen(image,p));
               *q++=(float) (QuantumScale*GetPixelBlue(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -897,7 +897,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(float) (QuantumScale*GetPixelGreen(image,p));
               *q++=(float) (QuantumScale*GetPixelBlue(image,p));
               *q++=(float) (QuantumScale*GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -915,7 +915,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(float) (QuantumScale*GetPixelGreen(image,p));
               *q++=(float) (QuantumScale*GetPixelBlue(image,p));
               *q++=0.0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -976,7 +976,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -999,7 +999,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1017,7 +1017,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1035,7 +1035,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
               *q++=0U;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1051,7 +1051,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             {
               *q++=(unsigned int) ScaleQuantumToLong(
                 GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1068,7 +1068,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1086,7 +1086,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1104,7 +1104,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
               *q++=0U;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1166,7 +1166,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -1189,7 +1189,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
               *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=ScaleQuantumToLong(GetPixelRed(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1207,7 +1207,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=ScaleQuantumToLong(GetPixelRed(image,p));
               *q++=ScaleQuantumToLong(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1225,7 +1225,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=ScaleQuantumToLong(GetPixelRed(image,p));
               *q++=0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1240,7 +1240,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             for (x=0; x < (ssize_t) columns; x++)
             {
               *q++=ScaleQuantumToLong(GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1257,7 +1257,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToLong(GetPixelRed(image,p));
               *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1275,7 +1275,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
               *q++=ScaleQuantumToLong(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1293,7 +1293,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
               *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
               *q++=0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1354,7 +1354,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -1377,7 +1377,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=GetPixelBlue(image,p);
               *q++=GetPixelGreen(image,p);
               *q++=GetPixelRed(image,p);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1395,7 +1395,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=GetPixelGreen(image,p);
               *q++=GetPixelRed(image,p);
               *q++=(Quantum) (GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1413,7 +1413,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=GetPixelGreen(image,p);
               *q++=GetPixelRed(image,p);
               *q++=(Quantum) 0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1428,7 +1428,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             for (x=0; x < (ssize_t) columns; x++)
             {
               *q++=GetPixelIntensity(image,p);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1445,7 +1445,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=GetPixelRed(image,p);
               *q++=GetPixelGreen(image,p);
               *q++=GetPixelBlue(image,p);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1463,7 +1463,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=GetPixelGreen(image,p);
               *q++=GetPixelBlue(image,p);
               *q++=(Quantum) (GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1481,7 +1481,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=GetPixelGreen(image,p);
               *q++=GetPixelBlue(image,p);
               *q++=(Quantum) 0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1542,7 +1542,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -1565,7 +1565,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
               *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
               *q++=ScaleQuantumToShort(GetPixelRed(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1583,7 +1583,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
               *q++=ScaleQuantumToShort(GetPixelRed(image,p));
               *q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1601,7 +1601,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
               *q++=ScaleQuantumToShort(GetPixelRed(image,p));
               *q++=0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1616,7 +1616,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             for (x=0; x < (ssize_t) columns; x++)
             {
               *q++=ScaleQuantumToShort(GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1633,7 +1633,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToShort(GetPixelRed(image,p));
               *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
               *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1651,7 +1651,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
               *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
               *q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1669,7 +1669,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
               *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
               *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
               *q++=0;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           break;
@@ -1730,7 +1730,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
             }
             q++;
           }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
       break;
@@ -1992,7 +1992,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelRed(image,ScaleCharToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2012,7 +2012,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelRed(image,ScaleCharToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2032,7 +2032,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelRed(image,ScaleCharToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2052,7 +2052,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelRed(image,ScaleCharToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2071,7 +2071,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleCharToQuantum(*p++),q);
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2090,7 +2090,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleCharToQuantum(*p++),q);
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2110,7 +2110,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2130,7 +2130,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2150,7 +2150,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2213,7 +2213,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -2244,7 +2244,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2272,7 +2272,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2298,7 +2298,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
                 (*p)),q);
               p++;
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2319,7 +2319,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2344,7 +2344,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2372,7 +2372,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2397,7 +2397,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2467,7 +2467,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -2498,7 +2498,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2526,7 +2526,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2552,7 +2552,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
                 (*p)),q);
               p++;
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2573,7 +2573,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2598,7 +2598,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2626,7 +2626,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2651,7 +2651,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
                 (*p)),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2721,7 +2721,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -2746,7 +2746,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2766,7 +2766,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2786,7 +2786,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2805,7 +2805,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2824,7 +2824,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2844,7 +2844,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2864,7 +2864,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2927,7 +2927,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -2952,7 +2952,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2972,7 +2972,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -2992,7 +2992,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3011,7 +3011,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3030,7 +3030,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleLongToQuantum(*p++),q);
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3050,7 +3050,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3070,7 +3070,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
               SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3133,7 +3133,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -3158,7 +3158,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,*p++,q);
               SetPixelGreen(image,*p++,q);
               SetPixelRed(image,*p++,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3178,7 +3178,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,*p++,q);
               SetPixelRed(image,*p++,q);
               SetPixelAlpha(image,*p++,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3198,7 +3198,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,*p++,q);
               SetPixelRed(image,*p++,q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3217,7 +3217,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,*p++,q);
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3236,7 +3236,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,*p++,q);
               SetPixelGreen(image,*p++,q);
               SetPixelBlue(image,*p++,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3256,7 +3256,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,*p++,q);
               SetPixelBlue(image,*p++,q);
               SetPixelAlpha(image,*p++,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3276,7 +3276,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,*p++,q);
               SetPixelBlue(image,*p++,q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3339,7 +3339,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -3364,7 +3364,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
               SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
               SetPixelRed(image,ScaleShortToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3384,7 +3384,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
               SetPixelRed(image,ScaleShortToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleShortToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3404,7 +3404,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
               SetPixelRed(image,ScaleShortToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3423,7 +3423,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleShortToQuantum(*p++),q);
               SetPixelGreen(image,GetPixelRed(image,q),q);
               SetPixelBlue(image,GetPixelRed(image,q),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3442,7 +3442,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelRed(image,ScaleShortToQuantum(*p++),q);
               SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
               SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3462,7 +3462,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
               SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
               SetPixelAlpha(image,ScaleShortToQuantum(*p++),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3482,7 +3482,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
               SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
               SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3545,7 +3545,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
             }
             p++;
           }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -3748,24 +3748,24 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           break;
         }
       AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
-      AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
-      AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
-      AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
-      AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
-      AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
-      AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
-      AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
-      AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
-      AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
-      AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,
+      AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
+      AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
+      AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
+      AlphaBlendPixelInfo(image,p+4*GetPixelComponents(image),pixels+4,alpha+4);
+      AlphaBlendPixelInfo(image,p+5*GetPixelComponents(image),pixels+5,alpha+5);
+      AlphaBlendPixelInfo(image,p+6*GetPixelComponents(image),pixels+6,alpha+6);
+      AlphaBlendPixelInfo(image,p+7*GetPixelComponents(image),pixels+7,alpha+7);
+      AlphaBlendPixelInfo(image,p+8*GetPixelComponents(image),pixels+8,alpha+8);
+      AlphaBlendPixelInfo(image,p+9*GetPixelComponents(image),pixels+9,alpha+9);
+      AlphaBlendPixelInfo(image,p+10*GetPixelComponents(image),pixels+10,
         alpha+10);
-      AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,
+      AlphaBlendPixelInfo(image,p+11*GetPixelComponents(image),pixels+11,
         alpha+11);
-      AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,
+      AlphaBlendPixelInfo(image,p+12*GetPixelComponents(image),pixels+12,
         alpha+12);
-      AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,
+      AlphaBlendPixelInfo(image,p+13*GetPixelComponents(image),pixels+13,
         alpha+13);
-      AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,
+      AlphaBlendPixelInfo(image,p+14*GetPixelComponents(image),pixels+14,
         alpha+14);
       AlphaBlendPixelInfo(image,p+15,pixels+15,alpha+15);
       pixel->red=0.0;
@@ -3801,26 +3801,26 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           break;
         }
       AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
-      AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
-      AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
-      AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
-      AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
-      AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
-      AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
-      AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
-      AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
-      AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
-      AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,
+      AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
+      AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
+      AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
+      AlphaBlendPixelInfo(image,p+4*GetPixelComponents(image),pixels+4,alpha+4);
+      AlphaBlendPixelInfo(image,p+5*GetPixelComponents(image),pixels+5,alpha+5);
+      AlphaBlendPixelInfo(image,p+6*GetPixelComponents(image),pixels+6,alpha+6);
+      AlphaBlendPixelInfo(image,p+7*GetPixelComponents(image),pixels+7,alpha+7);
+      AlphaBlendPixelInfo(image,p+8*GetPixelComponents(image),pixels+8,alpha+8);
+      AlphaBlendPixelInfo(image,p+9*GetPixelComponents(image),pixels+9,alpha+9);
+      AlphaBlendPixelInfo(image,p+10*GetPixelComponents(image),pixels+10,
         alpha+10);
-      AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,
+      AlphaBlendPixelInfo(image,p+11*GetPixelComponents(image),pixels+11,
         alpha+11);
-      AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,
+      AlphaBlendPixelInfo(image,p+12*GetPixelComponents(image),pixels+12,
         alpha+12);
-      AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,
+      AlphaBlendPixelInfo(image,p+13*GetPixelComponents(image),pixels+13,
         alpha+13);
-      AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,
+      AlphaBlendPixelInfo(image,p+14*GetPixelComponents(image),pixels+14,
         alpha+14);
-      AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,
+      AlphaBlendPixelInfo(image,p+15*GetPixelComponents(image),pixels+15,
         alpha+15);
       delta.x=x-x_offset;
       delta.y=y-y_offset;
@@ -3843,9 +3843,9 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           break;
         }
       AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
-      AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
-      AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
-      AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+      AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
+      AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
+      AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
       delta.x=x-x_offset;
       delta.y=y-y_offset;
       epsilon.x=1.0-delta.x;
@@ -3930,9 +3930,9 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           break;
         }
       AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
-      AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
-      AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
-      AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+      AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
+      AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
+      AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
       delta.x=x-x_offset;
       delta.y=y-y_offset;
       luminance.x=GetPixelInfoLuminance(pixels+0)-(double)
@@ -4066,26 +4066,26 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           break;
         }
       AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
-      AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
-      AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
-      AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
-      AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
-      AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
-      AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
-      AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
-      AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
-      AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
-      AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,
+      AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
+      AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
+      AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
+      AlphaBlendPixelInfo(image,p+4*GetPixelComponents(image),pixels+4,alpha+4);
+      AlphaBlendPixelInfo(image,p+5*GetPixelComponents(image),pixels+5,alpha+5);
+      AlphaBlendPixelInfo(image,p+6*GetPixelComponents(image),pixels+6,alpha+6);
+      AlphaBlendPixelInfo(image,p+7*GetPixelComponents(image),pixels+7,alpha+7);
+      AlphaBlendPixelInfo(image,p+8*GetPixelComponents(image),pixels+8,alpha+8);
+      AlphaBlendPixelInfo(image,p+9*GetPixelComponents(image),pixels+9,alpha+9);
+      AlphaBlendPixelInfo(image,p+10*GetPixelComponents(image),pixels+10,
         alpha+10);
-      AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,
+      AlphaBlendPixelInfo(image,p+11*GetPixelComponents(image),pixels+11,
         alpha+11);
-      AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,
+      AlphaBlendPixelInfo(image,p+12*GetPixelComponents(image),pixels+12,
         alpha+12);
-      AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,
+      AlphaBlendPixelInfo(image,p+13*GetPixelComponents(image),pixels+13,
         alpha+13);
-      AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,
+      AlphaBlendPixelInfo(image,p+14*GetPixelComponents(image),pixels+14,
         alpha+14);
-      AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,
+      AlphaBlendPixelInfo(image,p+15*GetPixelComponents(image),pixels+15,
         alpha+15);
       pixel->red=0.0;
       pixel->green=0.0;
@@ -4576,7 +4576,7 @@ MagickExport void SetPixelComponentMap(Image *image,
 */
 MagickExport void StandardPixelComponentMap(Image *image)
 {
-  image->pixel_channels=4;
+  image->pixel_components=4;
   SetPixelComponent(image,RedPixelComponent,RedPixelComponent);
   SetPixelComponentTraits(image,RedPixelComponent,ActivePixelTrait);
   SetPixelComponent(image,GreenPixelComponent,GreenPixelComponent);
@@ -4587,13 +4587,13 @@ MagickExport void StandardPixelComponentMap(Image *image)
   SetPixelComponentTraits(image,AlphaPixelComponent,ActivePixelTrait);
   if (image->colorspace == CMYKColorspace)
     {
-      image->pixel_channels++;
+      image->pixel_components++;
       SetPixelComponent(image,BlackPixelComponent,BlackPixelComponent);
       SetPixelComponentTraits(image,BlackPixelComponent,ActivePixelTrait);
     }
   if (image->storage_class == PseudoClass)
     {
-      image->pixel_channels++;
+      image->pixel_components++;
       SetPixelComponent(image,IndexPixelComponent,IndexPixelComponent);
       SetPixelComponentTraits(image,IndexPixelComponent,ActivePixelTrait);
     }
index 76b09f6d3c553edc90d690f3cbc7e48117fc6986..78c4ac66736669b049d2c1e2af81f1eec3f4eb1e 100644 (file)
@@ -141,7 +141,7 @@ MagickExport double GetImageTotalInkDensity(Image *image)
           if (density > total_ink_density)
             total_ink_density=density;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   image_view=DestroyCacheView(image_view);
index e6f9c83e16dc4c3e3914905c0ebc24126a515b75..c50b7efbdb70f9d46fc5a765d2b8c7032466dce9 100644 (file)
@@ -1242,12 +1242,12 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                   }
                 if (source_channels > 3)
                   *p++=ScaleQuantumToShort(GetPixelBlack(image,q));
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               cmsDoTransform(transform[id],source_pixels[id],target_pixels[id],
                 (unsigned int) image->columns);
               p=target_pixels[id];
-              q-=image->columns*GetPixelChannels(image);
+              q-=image->columns*GetPixelComponents(image);
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,ScaleShortToQuantum(*p),q);
@@ -1266,7 +1266,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                     SetPixelBlack(image,ScaleShortToQuantum(*p),q);
                     p++;
                   }
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               sync=SyncCacheViewAuthenticPixels(image_view,exception);
               if (sync == MagickFalse)
index c445523729c9a58ac8735ffadb0fb90563fe5269..b62cd56d5aa61f3ad1adbd9054eba0c4d475c5a1 100644 (file)
@@ -594,7 +594,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
             PixelPacket
               packet;
 
-            GetPixelPacket(image,q+count*GetPixelChannels(image),&packet);
+            GetPixelPacket(image,q+count*GetPixelComponents(image),&packet);
             if (IsPixelEquivalent(image,q,&packet) == MagickFalse)
               break;
           }
@@ -627,7 +627,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
                 if (cube.associate_alpha != MagickFalse)
                   SetPixelAlpha(image,image->colormap[index].alpha,q);
               }
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -838,7 +838,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
         PixelPacket
           packet;
 
-        GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+        GetPixelPacket(image,p+count*GetPixelComponents(image),&packet);
         if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
           break;
       }
@@ -892,7 +892,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
       node_info->total_color.blue+=count*QuantumScale*pixel.blue;
       if (cube_info->associate_alpha != MagickFalse)
         node_info->total_color.alpha+=count*QuantumScale*pixel.alpha;
-      p+=count*GetPixelChannels(image);
+      p+=count*GetPixelComponents(image);
     }
     if (cube_info->colors > cube_info->maximum_colors)
       {
@@ -933,7 +933,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
         PixelPacket
           packet;
 
-        GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+        GetPixelPacket(image,p+count*GetPixelComponents(image),&packet);
         if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
           break;
       }
@@ -987,7 +987,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
       node_info->total_color.blue+=count*QuantumScale*pixel.blue;
       if (cube_info->associate_alpha != MagickFalse)
         node_info->total_color.alpha+=count*QuantumScale*pixel.alpha;
-      p+=count*GetPixelChannels(image);
+      p+=count*GetPixelComponents(image);
     }
     proceed=SetImageProgress(image,ClassifyImageTag,(MagickOffsetType) y,
       image->rows);
@@ -1525,7 +1525,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
         status=MagickFalse;
         continue;
       }
-    q+=(y & 0x01)*image->columns*GetPixelChannels(image);
+    q+=(y & 0x01)*image->columns*GetPixelComponents(image);
     cube=(*cube_info);
     current=pixels[id]+(y & 0x01)*image->columns;
     previous=pixels[id]+((y+1) & 0x01)*image->columns;
@@ -1542,7 +1542,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
       ssize_t
         u;
 
-      q-=(y & 0x01)*GetPixelChannels(image);
+      q-=(y & 0x01)*GetPixelComponents(image);
       u=(y & 0x01) != 0 ? (ssize_t) image->columns-1-x : x;
       AssociateAlphaPixel(image,&cube,q,&pixel);
       if (x > 0)
@@ -1649,7 +1649,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
           if (proceed == MagickFalse)
             status=MagickFalse;
         }
-      q+=((y+1) & 0x01)*GetPixelChannels(image);
+      q+=((y+1) & 0x01)*GetPixelComponents(image);
     }
   }
   image_view=DestroyCacheView(image_view);
@@ -2215,7 +2215,7 @@ MagickExport MagickBooleanType GetImageQuantizeError(Image *image)
       mean_error+=distance*distance;
       if (distance > maximum_error)
         maximum_error=distance;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   image_view=DestroyCacheView(image_view);
@@ -2405,7 +2405,7 @@ MagickExport MagickBooleanType PosterizeImageChannel(Image *image,
       if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
           (image->matte == MagickTrue))
         SetPixelAlpha(image,PosterizePixel(GetPixelAlpha(image,q)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3241,7 +3241,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
             }
           SetPixelIndex(image,(Quantum) 
             colormap_index[intensity],q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
           status=MagickFalse;
@@ -3297,7 +3297,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
     {
       SetPixelIndex(image,(Quantum) colormap_index[ScaleQuantumToMap(
         GetPixelIndex(image,q))],q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index cef5547b2964419cdb0e17e38bbc9ebed9fb221b..1799a21c4c989621bd6b9df3f52c0ffec9d94b31 100644 (file)
@@ -280,13 +280,13 @@ MagickExport size_t ExportQuantumPixels(Image *image,CacheView *image_view,
     {
       number_pixels=GetImageExtent(image);
       p=GetVirtualPixelQueue(image);
-      channels=GetPixelChannels(image);
+      channels=GetPixelComponents(image);
     }
   else
     {
       number_pixels=GetCacheViewExtent(image_view);
       p=GetCacheViewVirtualPixelQueue(image_view);
-      channels=GetPixelChannels(image);
+      channels=GetPixelComponents(image);
     }
   if (quantum_info->alpha_type == AssociatedQuantumAlpha)
     {
index 0da2d489fe3caf3fedb368957f38196a15f1bc58..455f5fd83c41e080c2bfbb7db9e6285cc1c371f7 100644 (file)
@@ -300,13 +300,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
     {
       number_pixels=GetImageExtent(image);
       q=GetAuthenticPixelQueue(image);
-      channels=GetPixelChannels(image);
+      channels=GetPixelComponents(image);
     }
   else
     {
       number_pixels=GetCacheViewExtent(image_view);
       q=GetCacheViewAuthenticPixelQueue(image_view);
-      channels=GetPixelChannels(image);
+      channels=GetPixelComponents(image);
     }
   InitializeQuantumState(quantum_info,image->endian,&quantum_state);
   extent=GetQuantumExtent(image,quantum_info,quantum_type);
index 7da164c1774a526d05bdfeff7d2c97d382d5c537..59ef93d16fa0bf7103edf984cef9aee72c939288 100644 (file)
@@ -626,7 +626,7 @@ MagickExport MagickBooleanType ResamplePixelColor(
 #else
       }
 #endif
-      pixels+=GetPixelChannels(resample_filter->image);
+      pixels+=GetPixelComponents(resample_filter->image);
       Q += DQ;
       DQ += DDQ;
     }
index 116bcfd0743b997a75b282c7538eee0bcc80b79d..2258f78ae30d4f55b53c88a82383b6857bc33e8a 100644 (file)
@@ -1202,7 +1202,7 @@ MagickExport Image *AdaptiveResizeImage(const Image *image,
       (void) InterpolatePixelInfo(image,image_view,
         MeshInterpolatePixel,offset.x-0.5,offset.y-0.5,&pixel,exception);
       SetPixelPixelInfo(resize_image,&pixel,q);
-      q+=GetPixelChannels(resize_image);
+      q+=GetPixelComponents(resize_image);
     }
     if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
       continue;
@@ -2164,17 +2164,17 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
               (contribution[i].pixel-contribution[0].pixel);
             alpha=contribution[i].weight;
             pixel.red+=alpha*GetPixelRed(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.green+=alpha*GetPixelGreen(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.blue+=alpha*GetPixelBlue(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             if ((image->colorspace == CMYKColorspace) &&
                 (resize_image->colorspace == CMYKColorspace))
               pixel.black+=alpha*GetPixelBlue(image,p+j*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
             pixel.alpha+=alpha*GetPixelAlpha(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
           }
           SetPixelRed(resize_image,ClampToQuantum(pixel.red),q);
           SetPixelGreen(resize_image,ClampToQuantum(pixel.green),q);
@@ -2195,19 +2195,19 @@ 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*
-              GetPixelAlpha(image,p+j*GetPixelChannels(image));
+              GetPixelAlpha(image,p+j*GetPixelComponents(image));
             pixel.red+=alpha*GetPixelRed(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.green+=alpha*GetPixelGreen(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.blue+=alpha*GetPixelBlue(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             if ((image->colorspace == CMYKColorspace) &&
                 (resize_image->colorspace == CMYKColorspace))
               pixel.black+=alpha*GetPixelBlack(image,p+j*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
             pixel.alpha+=contribution[i].weight*
-              GetPixelAlpha(image,p+j*GetPixelChannels(image));
+              GetPixelAlpha(image,p+j*GetPixelComponents(image));
             gamma+=alpha;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2227,9 +2227,9 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
           j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
             (contribution[i-start].pixel-contribution[0].pixel);
           SetPixelIndex(resize_image,GetPixelIndex(image,p+j*
-            GetPixelChannels(image)),q);
+            GetPixelComponents(image)),q);
         }
-      q+=GetPixelChannels(resize_image);
+      q+=GetPixelComponents(resize_image);
     }
     if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2396,17 +2396,17 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
               image->columns+x);
             alpha=contribution[i].weight;
             pixel.red+=alpha*GetPixelRed(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.green+=alpha*GetPixelGreen(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.blue+=alpha*GetPixelBlue(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             if ((image->colorspace == CMYKColorspace) &&
                 (resize_image->colorspace == CMYKColorspace))
               pixel.black+=alpha*GetPixelBlack(image,p+j*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
             pixel.alpha+=alpha*GetPixelAlpha(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
           }
           SetPixelRed(resize_image,ClampToQuantum(pixel.red),q);
           SetPixelGreen(resize_image,ClampToQuantum(pixel.green),q);
@@ -2427,19 +2427,19 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
             j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
               image->columns+x);
             alpha=contribution[i].weight*QuantumScale*
-              GetPixelAlpha(image,p+j*GetPixelChannels(image));
+              GetPixelAlpha(image,p+j*GetPixelComponents(image));
             pixel.red+=alpha*GetPixelRed(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.green+=alpha*GetPixelGreen(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             pixel.blue+=alpha*GetPixelBlue(image,p+j*
-              GetPixelChannels(image));
+              GetPixelComponents(image));
             if ((image->colorspace == CMYKColorspace) &&
                 (resize_image->colorspace == CMYKColorspace))
               pixel.black+=alpha*GetPixelBlack(image,p+j*
-                GetPixelChannels(image));
+                GetPixelComponents(image));
             pixel.alpha+=contribution[i].weight*GetPixelAlpha(image,p+j*
-             GetPixelChannels(image));
+             GetPixelComponents(image));
             gamma+=alpha;
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2459,9 +2459,9 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
           j=(ssize_t) ((contribution[i-start].pixel-contribution[0].pixel)*
             image->columns+x);
           SetPixelIndex(resize_image,GetPixelIndex(image,p+j*
-            GetPixelChannels(image)),q);
+            GetPixelComponents(image)),q);
         }
-      q+=GetPixelChannels(resize_image);
+      q+=GetPixelComponents(resize_image);
     }
     if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2712,21 +2712,21 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
     for (x=0; x < (ssize_t) sample_image->columns; x++)
     {
       SetPixelRed(sample_image,GetPixelRed(image,p+x_offset[x]*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       SetPixelGreen(sample_image,GetPixelGreen(image,p+x_offset[x]*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       SetPixelBlue(sample_image,GetPixelBlue(image,p+x_offset[x]*
-        GetPixelChannels(image)),q);
+        GetPixelComponents(image)),q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(sample_image,GetPixelBlack(image,p+x_offset[x]*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(sample_image,GetPixelAlpha(image,p+x_offset[x]*
-          GetPixelChannels(image)),q);
+          GetPixelComponents(image)),q);
       if (image->storage_class == PseudoClass)
         SetPixelIndex(sample_image,GetPixelIndex(image,p+x_offset[x]*
-          GetPixelChannels(image)),q);
-      q+=GetPixelChannels(sample_image);
+          GetPixelComponents(image)),q);
+      q+=GetPixelComponents(sample_image);
     }
     if (SyncCacheViewAuthenticPixels(sample_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2915,7 +2915,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
             x_vector[x].alpha=(MagickRealType) GetPixelAlpha(image,p);
           if (image->colorspace == CMYKColorspace)
             x_vector[x].black=(MagickRealType) (alpha*GetPixelBlack(image,p));
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
     else
@@ -2952,7 +2952,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
                 if (image->matte != MagickFalse)
                   x_vector[x].alpha=(MagickRealType)
                     GetPixelAlpha(image,p);
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               number_rows++;
             }
@@ -2991,7 +2991,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
                   GetPixelBlack(image,p));
               if (image->matte != MagickFalse)
                 x_vector[x].alpha=(MagickRealType) GetPixelAlpha(image,p);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             number_rows++;
             next_row=MagickFalse;
@@ -3042,7 +3042,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
             SetPixelBlack(scale_image,ClampToQuantum(alpha*s->black),q);
           if (scale_image->matte != MagickFalse)
             SetPixelAlpha(scale_image,ClampToQuantum(s->alpha),q);
-          q+=GetPixelChannels(scale_image);
+          q+=GetPixelComponents(scale_image);
           s++;
         }
       }
@@ -3142,7 +3142,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
         if (scale_image->matte != MagickFalse)
           SetPixelAlpha(scale_image,ClampToQuantum(t->alpha),q);
         t++;
-        q+=GetPixelChannels(scale_image);
+        q+=GetPixelComponents(scale_image);
       }
     }
     if (SyncCacheViewAuthenticPixels(scale_view,exception) == MagickFalse)
index beb7e72b41b39acce99094a6daf8959fcc8d65eb..e14f3e1e26cfa66ef50f75aaa9902e00e24118a7 100644 (file)
@@ -394,7 +394,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
             cluster->count++;
             break;
           }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (image->progress_monitor != (MagickProgressMonitor) NULL)
       {
@@ -633,7 +633,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
               }
           }
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1126,7 +1126,7 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image,
             cluster->count++;
             break;
           }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     proceed=SetImageProgress(image,SegmentImageTag,(MagickOffsetType) y,
       2*image->rows);
@@ -1267,7 +1267,7 @@ static void InitializeHistogram(const Image *image,ssize_t **histogram,
       histogram[Red][(ssize_t) ScaleQuantumToChar(GetPixelRed(image,p))]++;
       histogram[Green][(ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p))]++;
       histogram[Blue][(ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p))]++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
 }
index 0f3a15bb24c78dc4b723d7ccfc9e1ffb57a6721b..44dfca6e923f3bdef368a6b1ebac4acda0034f8a 100644 (file)
@@ -750,7 +750,7 @@ static MagickBooleanType RadonTransform(const Image *image,
           bit=0;
           byte=0;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (bit != 0)
       {
@@ -801,7 +801,7 @@ static MagickBooleanType RadonTransform(const Image *image,
           bit=0;
           byte=0;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (bit != 0)
       {
@@ -861,7 +861,7 @@ static void GetImageBackgroundColor(Image *image,const ssize_t offset,
       background.blue+=QuantumScale*GetPixelBlue(image,p);
       background.alpha+=QuantumScale*GetPixelAlpha(image,p);
       count++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   image_view=DestroyCacheView(image_view);
@@ -1140,15 +1140,15 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
                 status=MagickFalse;
                 break;
               }
-            tile_pixels=p+((height-1)*width+y)*GetPixelChannels(image);
+            tile_pixels=p+((height-1)*width+y)*GetPixelComponents(image);
             for (x=0; x < (ssize_t) height; x++)
             {
               SetPixelRed(rotate_image,GetPixelRed(image,tile_pixels),q);
               SetPixelGreen(rotate_image,GetPixelGreen(image,tile_pixels),q);
               SetPixelBlue(rotate_image,GetPixelBlue(image,tile_pixels),q);
               SetPixelAlpha(rotate_image,GetPixelAlpha(image,tile_pixels),q);
-              tile_pixels-=width*GetPixelChannels(image);
-              q+=GetPixelChannels(rotate_image);
+              tile_pixels-=width*GetPixelComponents(image);
+              q+=GetPixelComponents(rotate_image);
             }
             sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
             if (sync == MagickFalse)
@@ -1207,15 +1207,15 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
             status=MagickFalse;
             continue;
           }
-        q+=GetPixelChannels(rotate_image)*image->columns;
+        q+=GetPixelComponents(rotate_image)*image->columns;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q-=GetPixelChannels(rotate_image);
+          q-=GetPixelComponents(rotate_image);
           SetPixelRed(rotate_image,GetPixelRed(image,p),q);
           SetPixelGreen(rotate_image,GetPixelGreen(image,p),q);
           SetPixelBlue(rotate_image,GetPixelBlue(image,p),q);
           SetPixelAlpha(rotate_image,GetPixelAlpha(image,p),q);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
         if (sync == MagickFalse)
@@ -1308,15 +1308,15 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
                 status=MagickFalse;
                 break;
               }
-            tile_pixels=p+((width-1)-y)*GetPixelChannels(image);
+            tile_pixels=p+((width-1)-y)*GetPixelComponents(image);
             for (x=0; x < (ssize_t) height; x++)
             {
               SetPixelRed(rotate_image,GetPixelRed(image,tile_pixels),q);
               SetPixelGreen(rotate_image,GetPixelGreen(image,tile_pixels),q);
               SetPixelBlue(rotate_image,GetPixelBlue(image,tile_pixels),q);
               SetPixelAlpha(rotate_image,GetPixelAlpha(image,tile_pixels),q);
-              tile_pixels+=width*GetPixelChannels(image);
-              q+=GetPixelChannels(rotate_image);
+              tile_pixels+=width*GetPixelComponents(image);
+              q+=GetPixelComponents(rotate_image);
             }
             sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
             if (sync == MagickFalse)
@@ -1465,7 +1465,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
         status=MagickFalse;
         continue;
       }
-    p+=x_offset*GetPixelChannels(image);
+    p+=x_offset*GetPixelComponents(image);
     displacement=degrees*(MagickRealType) (y-height/2.0);
     if (displacement == 0.0)
       continue;
@@ -1491,14 +1491,14 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
         */
         if (step > x_offset)
           break;
-        q=p-step*GetPixelChannels(image);
+        q=p-step*GetPixelComponents(image);
         for (i=0; i < (ssize_t) width; i++)
         {
           if ((x_offset+i) < step)
             {
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
               SetPixelInfo(image,p,&pixel);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
               continue;
             }
           SetPixelInfo(image,p,&source);
@@ -1507,17 +1507,17 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
             &destination);
           SetPixelPixelInfo(image,&destination,q);
           SetPixelInfo(image,p,&pixel);
-          p+=GetPixelChannels(image);
-          q+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
+          q+=GetPixelComponents(image);
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
         SetPixelPixelInfo(image,&destination,q);
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
         for (i=0; i < (step-1); i++)
         {
           SetPixelPixelInfo(image,&background,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -1526,12 +1526,12 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
         /*
           Transfer pixels right-to-left.
         */
-        p+=width*GetPixelChannels(image);
-        q=p+step*GetPixelChannels(image);
+        p+=width*GetPixelComponents(image);
+        q=p+step*GetPixelComponents(image);
         for (i=0; i < (ssize_t) width; i++)
         {
-          p-=GetPixelChannels(image);
-          q-=GetPixelChannels(image);
+          p-=GetPixelComponents(image);
+          q-=GetPixelComponents(image);
           if ((size_t) (x_offset+width+step-i) >= image->columns)
             continue;
           SetPixelInfo(image,p,&source);
@@ -1543,11 +1543,11 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
-        q-=GetPixelChannels(image);
+        q-=GetPixelComponents(image);
         SetPixelPixelInfo(image,&destination,q);
         for (i=0; i < (step-1); i++)
         {
-          q-=GetPixelChannels(image);
+          q-=GetPixelComponents(image);
           SetPixelPixelInfo(image,&background,q);
         }
         break;
@@ -1685,7 +1685,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
         status=MagickFalse;
         continue;
       }
-    p+=y_offset*GetPixelChannels(image);
+    p+=y_offset*GetPixelComponents(image);
     displacement=degrees*(MagickRealType) (x-width/2.0);
     if (displacement == 0.0)
       continue;
@@ -1711,14 +1711,14 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
         */
         if (step > y_offset)
           break;
-        q=p-step*GetPixelChannels(image);
+        q=p-step*GetPixelComponents(image);
         for (i=0; i < (ssize_t) height; i++)
         {
           if ((y_offset+i) < step)
             {
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
               SetPixelInfo(image,p,&pixel);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
               continue;
             }
           SetPixelInfo(image,p,&source);
@@ -1727,17 +1727,17 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
             &destination);
           SetPixelPixelInfo(image,&destination,q);
           SetPixelInfo(image,p,&pixel);
-          p+=GetPixelChannels(image);
-          q+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
+          q+=GetPixelComponents(image);
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
         SetPixelPixelInfo(image,&destination,q);
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
         for (i=0; i < (step-1); i++)
         {
           SetPixelPixelInfo(image,&background,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -1746,12 +1746,12 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
         /*
           Transfer pixels bottom-to-top.
         */
-        p+=height*GetPixelChannels(image);
-        q=p+step*GetPixelChannels(image);
+        p+=height*GetPixelComponents(image);
+        q=p+step*GetPixelComponents(image);
         for (i=0; i < (ssize_t) height; i++)
         {
-          p-=GetPixelChannels(image);
-          q-=GetPixelChannels(image);
+          p-=GetPixelComponents(image);
+          q-=GetPixelComponents(image);
           if ((size_t) (y_offset+height+step-i) >= image->rows)
             continue;
           SetPixelInfo(image,p,&source);
@@ -1763,11 +1763,11 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
         }
         CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
           &background,(MagickRealType) background.alpha,area,&destination);
-        q-=GetPixelChannels(image);
+        q-=GetPixelComponents(image);
         SetPixelPixelInfo(image,&destination,q);
         for (i=0; i < (step-1); i++)
         {
-          q-=GetPixelChannels(image);
+          q-=GetPixelComponents(image);
           SetPixelPixelInfo(image,&background,q);
         }
         break;
index 9e987e8e77053f3b5cb8fae00b15870ec313f477..a84c8e9dea1ef5b87ea825e801bdd16aed573b69 100644 (file)
@@ -577,7 +577,7 @@ MagickExport Image *EvaluateImages(const Image *images,
         else
           SetPixelAlpha(evaluate_image,
             ClampToQuantum(evaluate_pixel[i/2].alpha),q);
-        q+=GetPixelChannels(evaluate_image);
+        q+=GetPixelComponents(evaluate_image);
       }
       if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
         status=MagickFalse;
@@ -663,7 +663,7 @@ MagickExport Image *EvaluateImages(const Image *images,
           evaluate_pixel[x].alpha=ApplyEvaluateOperator(random_info[id],
             GetPixelAlpha(next,p),i == 0 ? AddEvaluateOperator : op,
             evaluate_pixel[x].alpha);
-          p+=GetPixelChannels(next);
+          p+=GetPixelComponents(next);
         }
         image_view=DestroyCacheView(image_view);
         next=GetNextImageInList(next);
@@ -691,7 +691,7 @@ MagickExport Image *EvaluateImages(const Image *images,
         else
           SetPixelAlpha(evaluate_image,ClampToQuantum(evaluate_pixel[x].alpha),
             q);
-        q+=GetPixelChannels(evaluate_image);
+        q+=GetPixelComponents(evaluate_image);
       }
       if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
         status=MagickFalse;
@@ -797,7 +797,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
             SetPixelAlpha(image,ClampToQuantum(ApplyEvaluateOperator(
               random_info[id],GetPixelAlpha(image,q),op,value)),q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1029,7 +1029,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image,
             SetPixelAlpha(image,ApplyFunction(GetPixelAlpha(image,q),function,
               number_parameters,parameters,exception),q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1377,7 +1377,7 @@ MagickExport MagickBooleanType GetImageChannelKurtosis(const Image *image,
             GetPixelAlpha(image,p);
           area++;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   if (y < (ssize_t) image->rows)
@@ -1509,7 +1509,7 @@ MagickExport MagickBooleanType GetImageChannelRange(const Image *image,
           if (pixel.alpha > *maxima)
             *maxima=(double) pixel.alpha;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
@@ -1746,7 +1746,7 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
             GetPixelAlpha(image,p)*GetPixelAlpha(image,p);
         }
       x++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   area=(double) image->columns*image->rows;
index ee3a483f147bdbcd198b0fe3ce0f522d9acc0c5d..c567a2c2538990b688dcdd02b385e411cf93123b 100644 (file)
@@ -708,7 +708,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image,
     Pixels are stored in a temporary buffer until they are synced to the cache.
   */
   number_pixels=(MagickSizeType) columns*rows;
-  length=(size_t) number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+  length=(size_t) number_pixels*cache_info->pixel_components*sizeof(Quantum);
   if (cache_info->metacontent_extent != 0)
     length+=number_pixels*cache_info->metacontent_extent;
   if (cache_info->pixels == (Quantum *) NULL)
@@ -736,7 +736,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image,
   cache_info->metacontent=(void *) NULL;
   if (cache_info->metacontent_extent != 0)
     cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
-      cache_info->pixel_channels);
+      cache_info->pixel_components);
   return(cache_info->pixels);
 }
 \f
@@ -867,7 +867,7 @@ static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
   cache_info->columns=columns;
   cache_info->rows=rows;
   number_pixels=(MagickSizeType) columns*rows;
-  length=(size_t) number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+  length=(size_t) number_pixels*cache_info->pixel_components*sizeof(Quantum);
   if (cache_info->metacontent_extent != 0)
     length+=number_pixels*cache_info->metacontent_extent;
   if (cache_info->pixels == (Quantum *) NULL)
@@ -887,7 +887,7 @@ static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
   cache_info->metacontent=(void *) NULL;
   if (cache_info->metacontent_extent != 0)
     cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
-      cache_info->pixel_channels);
+      cache_info->pixel_components);
   return(cache_info->pixels);
 }
 \f
index b5c7b05e0218c495efbeb5bb5891641d9cb4f892..e2ec886d1b6934f88aa3ad10d728af28df5e4c79 100644 (file)
@@ -244,14 +244,14 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
       {
         for (u=0; u < (ssize_t) width; u++)
         {
-          pixel.red+=GetPixelAlpha(image,r+u*GetPixelChannels(image));
-          pixel.green+=GetPixelGreen(image,r+u*GetPixelChannels(image));
-          pixel.blue+=GetPixelBlue(image,r+u*GetPixelChannels(image));
+          pixel.red+=GetPixelAlpha(image,r+u*GetPixelComponents(image));
+          pixel.green+=GetPixelGreen(image,r+u*GetPixelComponents(image));
+          pixel.blue+=GetPixelBlue(image,r+u*GetPixelComponents(image));
           if (image->colorspace == CMYKColorspace)
-            pixel.black+=GetPixelBlack(image,r+u*GetPixelChannels(image));
-          pixel.alpha+=GetPixelAlpha(image,r+u*GetPixelChannels(image));
+            pixel.black+=GetPixelBlack(image,r+u*GetPixelComponents(image));
+          pixel.alpha+=GetPixelAlpha(image,r+u*GetPixelComponents(image));
         }
-        r+=(image->columns+width)*GetPixelChannels(image);
+        r+=(image->columns+width)*GetPixelComponents(image);
       }
       mean.red=(MagickRealType) (pixel.red/number_pixels+offset);
       mean.green=(MagickRealType) (pixel.green/number_pixels+offset);
@@ -270,8 +270,8 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
           q);
       SetPixelAlpha(threshold_image,(Quantum) (((MagickRealType)
         GetPixelAlpha(threshold_image,q) <= mean.alpha) ? 0 : QuantumRange),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(threshold_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(threshold_image);
     }
     sync=SyncCacheViewAuthenticPixels(threshold_view,exception);
     if (sync == MagickFalse)
@@ -409,7 +409,7 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
             GetPixelIntensity(image,q) <= threshold ? 0 : QuantumRange),q);
           SetPixelGreen(image,GetPixelRed(image,q),q);
           SetPixelBlue(image,GetPixelRed(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
       }
     else
@@ -438,7 +438,7 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
                 GetPixelAlpha(image,q) >= threshold ? OpaqueAlpha :
                 TransparentAlpha),q);
           }
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -618,7 +618,7 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image,
               ((MagickRealType) GetPixelAlpha(image,q) < threshold.alpha))
             SetPixelAlpha(image,0,q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -771,7 +771,7 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image,
         SetPixelBlack(image,ClampToUnsignedQuantum(GetPixelBlack(image,q)),q);
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(image,ClampToUnsignedQuantum(GetPixelAlpha(image,q)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1493,7 +1493,7 @@ printf("DEBUG levels  r=%u g=%u b=%u a=%u i=%u\n",
           SetPixelBlack(image,RoundToQuantum((MagickRealType)
             ((l+(t>=threshold))*(MagickRealType) QuantumRange/levels.black)),q);
         }
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
         status=MagickFalse;
@@ -1686,7 +1686,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
           index=(Quantum) (intensity <= threshold.black ? 0 : 1);
           SetPixelIndex(image,index,q);
           SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -1812,7 +1812,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
       if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
         SetPixelAlpha(image,(Quantum) ((MagickRealType)
           GetPixelAlpha(image,q) <= threshold.alpha ? 0 : QuantumRange),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1993,7 +1993,7 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image,
               ((MagickRealType) GetPixelAlpha(image,q) > threshold.alpha))
             SetPixelAlpha(image,QuantumRange,q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
index c5f2726db04ed7b2f9da15779f3772ecd0f64a69..b83723c480d17bb89b29020dc67213270700675b 100644 (file)
@@ -192,9 +192,9 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
           SetPixelBlue(chop_image,GetPixelBlue(image,p),q);
           if (image->colorspace == CMYKColorspace)
             SetPixelBlack(chop_image,GetPixelBlack(image,p),q);
-          q+=GetPixelChannels(chop_image);
+          q+=GetPixelComponents(chop_image);
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(chop_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -246,10 +246,10 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
           SetPixelRed(chop_image,GetPixelRed(image,p),q);
           SetPixelGreen(chop_image,GetPixelGreen(image,p),q);
           SetPixelBlue(chop_image,GetPixelBlue(image,p),q);
-          p+=GetPixelChannels(image);
-          q+=GetPixelChannels(chop_image);
+          p+=GetPixelComponents(image);
+          q+=GetPixelComponents(chop_image);
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(chop_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -354,8 +354,8 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       for (x=0; x < (ssize_t) images->columns; x++)
       {
         SetPixelRed(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
-        p+=GetPixelChannels(images);
-        q+=GetPixelChannels(cmyk_image);
+        p+=GetPixelComponents(images);
+        q+=GetPixelComponents(cmyk_image);
       }
       if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
         break;
@@ -386,8 +386,8 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       for (x=0; x < (ssize_t) images->columns; x++)
       {
         SetPixelGreen(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
-        p+=GetPixelChannels(images);
-        q+=GetPixelChannels(cmyk_image);
+        p+=GetPixelComponents(images);
+        q+=GetPixelComponents(cmyk_image);
       }
       if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
         break;
@@ -418,8 +418,8 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       for (x=0; x < (ssize_t) images->columns; x++)
       {
         SetPixelBlue(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
-        p+=GetPixelChannels(images);
-        q+=GetPixelChannels(cmyk_image);
+        p+=GetPixelComponents(images);
+        q+=GetPixelComponents(cmyk_image);
       }
       if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
         break;
@@ -450,8 +450,8 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       for (x=0; x < (ssize_t) images->columns; x++)
       {
         SetPixelBlack(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
-        p+=GetPixelChannels(images);
-        q+=GetPixelChannels(cmyk_image);
+        p+=GetPixelComponents(images);
+        q+=GetPixelComponents(cmyk_image);
       }
       if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
         break;
@@ -662,8 +662,8 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
       SetPixelAlpha(crop_image,GetPixelAlpha(image,p),q);
       if (image->storage_class == PseudoClass)
         SetPixelIndex(crop_image,GetPixelIndex(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(crop_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(crop_image);
     }
     if (SyncCacheViewAuthenticPixels(crop_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1069,8 +1069,8 @@ MagickExport Image *ExcerptImage(const Image *image,
       if (image->storage_class == PseudoClass)
         SetPixelIndex(excerpt_image,GetPixelIndex(image,p),q);
       SetPixelAlpha(excerpt_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(excerpt_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(excerpt_image);
     }
     if (SyncCacheViewAuthenticPixels(excerpt_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1258,8 +1258,8 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
       if (image->storage_class == PseudoClass)
         SetPixelIndex(flip_image,GetPixelIndex(image,p),q);
       SetPixelAlpha(flip_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(flip_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(flip_image);
     }
     if (SyncCacheViewAuthenticPixels(flip_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1376,10 +1376,10 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
         status=MagickFalse;
         continue;
       }
-    q+=GetPixelChannels(flop_image)*flop_image->columns;
+    q+=GetPixelComponents(flop_image)*flop_image->columns;
     for (x=0; x < (ssize_t) flop_image->columns; x++)
     {
-      q-=GetPixelChannels(flop_image);
+      q-=GetPixelComponents(flop_image);
       SetPixelRed(flop_image,GetPixelRed(image,p),q);
       SetPixelGreen(flop_image,GetPixelGreen(image,p),q);
       SetPixelBlue(flop_image,GetPixelBlue(image,p),q);
@@ -1388,7 +1388,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
       SetPixelAlpha(flop_image,GetPixelAlpha(image,p),q);
       if (image->storage_class == PseudoClass)
         SetPixelIndex(flop_image,GetPixelIndex(image,p),q);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (SyncCacheViewAuthenticPixels(flop_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1501,8 +1501,8 @@ static inline MagickBooleanType CopyImageRegion(Image *destination,
       if (destination->colorspace == CMYKColorspace)
         SetPixelBlack(destination,GetPixelBlack(source,p),q);
       SetPixelAlpha(destination,GetPixelAlpha(source,p),q);
-      p+=GetPixelChannels(source);
-      q+=GetPixelChannels(destination);
+      p+=GetPixelComponents(source);
+      q+=GetPixelComponents(destination);
     }
     sync=SyncCacheViewAuthenticPixels(destination_view,exception);
     if (sync == MagickFalse)
@@ -1808,11 +1808,11 @@ MagickExport Image *SpliceImage(const Image *image,
       SetPixelAlpha(splice_image,OpaqueAlpha,q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(splice_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(splice_image);
     }
     for ( ; x < (ssize_t) (splice_geometry.x+splice_geometry.width); x++)
-      q+=GetPixelChannels(splice_image);
+      q+=GetPixelComponents(splice_image);
     for ( ; x < (ssize_t) splice_image->columns; x++)
     {
       SetPixelRed(splice_image,GetPixelRed(image,p),q);
@@ -1823,8 +1823,8 @@ MagickExport Image *SpliceImage(const Image *image,
       SetPixelAlpha(splice_image,OpaqueAlpha,q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(splice_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(splice_image);
     }
     if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -1880,11 +1880,11 @@ MagickExport Image *SpliceImage(const Image *image,
         SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(splice_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(splice_image);
     }
     for ( ; x < (ssize_t) (splice_geometry.x+splice_geometry.width); x++)
-      q+=GetPixelChannels(splice_image);
+      q+=GetPixelComponents(splice_image);
     for ( ; x < (ssize_t) splice_image->columns; x++)
     {
       SetPixelRed(splice_image,GetPixelRed(image,p),q);
@@ -1895,8 +1895,8 @@ MagickExport Image *SpliceImage(const Image *image,
         SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(splice_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(splice_image);
     }
     if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2188,8 +2188,8 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception)
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(transpose_image,GetPixelBlack(image,p),q);
       SetPixelAlpha(transpose_image,GetPixelAlpha(image,p),q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(transpose_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(transpose_image);
     }
     if (SyncCacheViewAuthenticPixels(transpose_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -2311,17 +2311,17 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception)
         status=MagickFalse;
         continue;
       }
-    q+=GetPixelChannels(transverse_image)*image->columns;
+    q+=GetPixelComponents(transverse_image)*image->columns;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      q-=GetPixelChannels(transverse_image);
+      q-=GetPixelComponents(transverse_image);
       SetPixelRed(transverse_image,GetPixelRed(image,p),q);
       SetPixelGreen(transverse_image,GetPixelGreen(image,p),q);
       SetPixelBlue(transverse_image,GetPixelBlue(image,p),q);
       SetPixelAlpha(transverse_image,GetPixelAlpha(image,p),q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(transverse_image,GetPixelBlack(image,p),q);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     sync=SyncCacheViewAuthenticPixels(transverse_view,exception);
     if (sync == MagickFalse)
index 7be785915562b49d6b1cc701c64efc81502691cf..a109a71385cef90cf49978e0602b5f7456e45a21 100644 (file)
@@ -599,7 +599,7 @@ MagickExport MagickBooleanType XAnnotateImage(Display *display,
           if (annotate_info->stencil == BackgroundStencil)
             SetPixelAlpha(annotate_image,TransparentAlpha,q);
         }
-      q+=GetPixelChannels(annotate_image);
+      q+=GetPixelComponents(annotate_image);
     }
     if (SyncCacheViewAuthenticPixels(annotate_view,exception) == MagickFalse)
       break;
@@ -2230,7 +2230,7 @@ static void XDitherImage(Image *image,XImage *ximage)
         (((size_t) color.green & 0xe0) >> 3) |
         (((size_t) color.blue & 0xc0) >> 6));
       *q++=(char) pixel;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
       j++;
       if (j == 16)
         j=0;
@@ -2506,7 +2506,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
           SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil ==
             OpaqueStencil ? OpaqueAlpha : TransparentAlpha),q);
         }
-      q+=GetPixelChannels(draw_image);
+      q+=GetPixelComponents(draw_image);
     }
     if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
       break;
@@ -2610,7 +2610,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
     {
       if (GetPixelAlpha(image,q) != TransparentAlpha)
         SetPixelAlpha(draw_image,OpaqueAlpha,q);
-      q+=GetPixelChannels(draw_image);
+      q+=GetPixelComponents(draw_image);
     }
     if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
       break;
@@ -4404,7 +4404,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
                   index=(pixel >> blue_shift) & blue_mask;
                   SetPixelBlue(composite_image,
                     ScaleShortToQuantum(colors[index].blue),q);
-                  q+=GetPixelChannels(composite_image);
+                  q+=GetPixelComponents(composite_image);
                 }
                 if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
                   break;
@@ -4431,7 +4431,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
                   color=(65535UL*color)/blue_mask;
                   SetPixelBlue(composite_image,
                     ScaleShortToQuantum((unsigned short) color),q);
-                  q+=GetPixelChannels(composite_image);
+                  q+=GetPixelComponents(composite_image);
                 }
                 if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
                   break;
@@ -4473,7 +4473,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
                 SetPixelIndex(composite_image,index,q);
                 SetPixelPacket(composite_image,
                   composite_image->colormap+(ssize_t) index,q);
-                q+=GetPixelChannels(composite_image);
+                q+=GetPixelComponents(composite_image);
               }
               if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
                 break;
@@ -5960,7 +5960,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
               bit=0;
               byte=0;
             }
-          p+=GetPixelChannels(canvas);
+          p+=GetPixelComponents(canvas);
         }
         if (bit != 0)
           *q=byte >> (8-bit);
@@ -6017,7 +6017,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6057,7 +6057,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6085,7 +6085,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
             {
               pixel=pixels[(ssize_t) GetPixelIndex(canvas,p)];
               *q++=(unsigned char) pixel;
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6122,7 +6122,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
               }
               for (k=0; k < (int) bytes_per_pixel; k++)
                 *q++=channel[k];
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6179,7 +6179,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6220,7 +6220,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6248,7 +6248,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
             {
               pixel=XGammaPixel(canvas,map_info,p);
               *q++=(unsigned char) pixel;
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6285,7 +6285,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                       *q++=ScaleQuantumToChar(XRedGamma(
                         GetPixelRed(canvas,p)));
                       *q++=0;
-                      p+=GetPixelChannels(canvas);
+                      p+=GetPixelComponents(canvas);
                     }
                     continue;
                   }
@@ -6298,7 +6298,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                   *q++=ScaleQuantumToChar((Quantum)
                     GetPixelRed(canvas,p));
                   *q++=0;
-                  p+=GetPixelChannels(canvas);
+                  p+=GetPixelComponents(canvas);
                 }
               }
             }
@@ -6332,7 +6332,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                         *q++=ScaleQuantumToChar(XBlueGamma(
                           GetPixelBlue(canvas,p)));
                         *q++=0;
-                        p+=GetPixelChannels(canvas);
+                        p+=GetPixelComponents(canvas);
                       }
                       continue;
                     }
@@ -6345,7 +6345,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                     *q++=ScaleQuantumToChar((Quantum)
                       GetPixelBlue(canvas,p));
                     *q++=0;
-                    p+=GetPixelChannels(canvas);
+                    p+=GetPixelComponents(canvas);
                   }
                 }
               }
@@ -6380,7 +6380,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
                     }
                     for (k=0; k < (int) bytes_per_pixel; k++)
                       *q++=channel[k];
-                    p+=GetPixelChannels(canvas);
+                    p+=GetPixelComponents(canvas);
                   }
                   q+=scanline_pad;
                 }
@@ -6416,7 +6416,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
               bit=0;
               byte=0;
             }
-          p+=GetPixelChannels(canvas);
+          p+=GetPixelComponents(canvas);
         }
         if (bit != 0)
           *q=byte >> (8-bit);
@@ -6587,7 +6587,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
               bit=0;
               byte=0;
             }
-          p+=GetPixelChannels(canvas);
+          p+=GetPixelComponents(canvas);
         }
         if (bit != 0)
           *q=byte << (8-bit);
@@ -6645,7 +6645,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6686,7 +6686,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6715,7 +6715,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
               pixel=pixels[(ssize_t)
                 GetPixelIndex(canvas,p)];
               *q++=(unsigned char) pixel;
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6753,7 +6753,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
               }
               for (k=0; k < (int) bytes_per_pixel; k++)
                 *q++=channel[k];
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6810,7 +6810,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6851,7 +6851,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                   break;
                 }
               }
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6879,7 +6879,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
             {
               pixel=XGammaPixel(canvas,map_info,p);
               *q++=(unsigned char) pixel;
-              p+=GetPixelChannels(canvas);
+              p+=GetPixelComponents(canvas);
             }
             q+=scanline_pad;
           }
@@ -6916,7 +6916,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                         GetPixelGreen(canvas,p)));
                       *q++=ScaleQuantumToChar(XBlueGamma(
                         GetPixelBlue(canvas,p)));
-                      p+=GetPixelChannels(canvas);
+                      p+=GetPixelComponents(canvas);
                     }
                     continue;
                   }
@@ -6929,7 +6929,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                     GetPixelGreen(canvas,p));
                   *q++=ScaleQuantumToChar((Quantum)
                     GetPixelBlue(canvas,p));
-                  p+=GetPixelChannels(canvas);
+                  p+=GetPixelComponents(canvas);
                 }
               }
             }
@@ -6963,7 +6963,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                           GetPixelGreen(canvas,p)));
                         *q++=ScaleQuantumToChar(XRedGamma(
                           GetPixelRed(canvas,p)));
-                        p+=GetPixelChannels(canvas);
+                        p+=GetPixelComponents(canvas);
                       }
                       continue;
                     }
@@ -6976,7 +6976,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                       GetPixelGreen(canvas,p));
                     *q++=ScaleQuantumToChar((Quantum)
                       GetPixelRed(canvas,p));
-                    p+=GetPixelChannels(canvas);
+                    p+=GetPixelComponents(canvas);
                   }
                 }
               }
@@ -7011,7 +7011,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
                     }
                     for (k=0; k < (int) bytes_per_pixel; k++)
                       *q++=channel[k];
-                    p+=GetPixelChannels(canvas);
+                    p+=GetPixelComponents(canvas);
                   }
                   q+=scanline_pad;
                 }
@@ -7047,7 +7047,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
               bit=0;
               byte=0;
             }
-          p+=GetPixelChannels(canvas);
+          p+=GetPixelComponents(canvas);
         }
         if (bit != 0)
           *q=byte << (8-bit);
@@ -7795,7 +7795,7 @@ MagickExport void XMakeStandardColormap(Display *display,
                       map_info->blue_max),q);
                   SetPixelAlpha(affinity_image,
                     TransparentAlpha,q);
-                  q+=GetPixelChannels(affinity_image);
+                  q+=GetPixelComponents(affinity_image);
                 }
                 (void) SyncAuthenticPixels(affinity_image,exception);
                 (void) RemapImage(resource_info->quantize_info,image,
@@ -7983,7 +7983,7 @@ MagickExport void XMakeStandardColormap(Display *display,
             for (x=(int) image->columns-1; x >= 0; x--)
             {
               diversity[(ssize_t) GetPixelIndex(image,p)].count++;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
           image_view=DestroyCacheView(image_view);
index cd98ab47b96220273d6abd886550b42d7d3dc027..c006c9fadc99fc5e02dca8fe7f1effd7094c7885 100644 (file)
@@ -1076,7 +1076,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 SetPixelRed(mask_image,GetPixelAlpha(mask_image,q),q);
                 SetPixelGreen(mask_image,GetPixelAlpha(mask_image,q),q);
                 SetPixelBlue(mask_image,GetPixelAlpha(mask_image,q),q);
-                q+=GetPixelChannels(mask_image);
+                q+=GetPixelComponents(mask_image);
               }
               if (SyncCacheViewAuthenticPixels(mask_view,exception) == MagickFalse)
                 break;
index 20ce1dbd51e32ab14100d614f815aac1d3b6981e..152aa7073cea63e1cd25835d07528603fe1e6e17 100644 (file)
@@ -512,7 +512,7 @@ WandExport PixelWand **PixelGetCurrentIteratorRow(PixelIterator *iterator,
   for (x=0; x < (ssize_t) iterator->region.width; x++)
   {
     PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
-    pixels+=GetPixelChannels(iterator->image);
+    pixels+=GetPixelComponents(iterator->image);
   }
   *number_wands=iterator->region.width;
   return(iterator->pixel_wands);
@@ -696,7 +696,7 @@ WandExport PixelWand **PixelGetNextIteratorRow(PixelIterator *iterator,
   for (x=0; x < (ssize_t) iterator->region.width; x++)
   {
     PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
-    pixels+=GetPixelChannels(iterator->image);
+    pixels+=GetPixelComponents(iterator->image);
   }
   *number_wands=iterator->region.width;
   return(iterator->pixel_wands);
@@ -767,7 +767,7 @@ WandExport PixelWand **PixelGetPreviousIteratorRow(PixelIterator *iterator,
   for (x=0; x < (ssize_t) iterator->region.width; x++)
   {
     PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
-    pixels+=GetPixelChannels(iterator->image);
+    pixels+=GetPixelComponents(iterator->image);
   }
   *number_wands=iterator->region.width;
   return(iterator->pixel_wands);
@@ -959,7 +959,7 @@ WandExport MagickBooleanType PixelSyncIterator(PixelIterator *iterator)
   for (x=0; x < (ssize_t) iterator->region.width; x++)
   {
     PixelGetQuantumPixel(iterator->image,iterator->pixel_wands[x],pixels);
-    pixels+=GetPixelChannels(iterator->image);
+    pixels+=GetPixelComponents(iterator->image);
   }
   if (SyncCacheViewAuthenticPixels(iterator->view,exception) == MagickFalse)
     {
index 876f96c830451ab6824fb048e39971d25190107f..b819618df8a96c93f8e50b4bb8b7688d236ce5fd 100644 (file)
@@ -323,7 +323,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     for (x=0; x < (ssize_t) source->extent.width; x++)
     {
       PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
-      pixels+=GetPixelChannels(source->image);
+      pixels+=GetPixelComponents(source->image);
     }
     duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->extent.x,y,
       duplex->extent.width,1,duplex->exception);
@@ -336,7 +336,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     {
       PixelSetQuantumPixel(duplex->image,duplex_pixels,
         duplex->pixel_wands[id][x]);
-      duplex_pixels+=GetPixelChannels(duplex->image);
+      duplex_pixels+=GetPixelComponents(duplex->image);
     }
     destination_pixels=GetCacheViewAuthenticPixels(destination->view,
       destination->extent.x,y,destination->extent.width,1,exception);
@@ -349,7 +349,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     {
       PixelSetQuantumPixel(destination->image,destination_pixels,
         destination->pixel_wands[id][x]);
-      destination_pixels+=GetPixelChannels(destination->image);
+      destination_pixels+=GetPixelComponents(destination->image);
     }
     if (transfer(source,duplex,destination,y,id,context) == MagickFalse)
       status=MagickFalse;
@@ -359,7 +359,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
     {
       PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
         destination_pixels);
-      destination_pixels+=GetPixelChannels(destination->image);
+      destination_pixels+=GetPixelComponents(destination->image);
     }
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -564,7 +564,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source,
     for (x=0; x < (ssize_t) source->extent.width; x++)
     {
       PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
-      pixels+=GetPixelChannels(source->image);
+      pixels+=GetPixelComponents(source->image);
     }
     if (get(source,y,id,context) == MagickFalse)
       status=MagickFalse;
@@ -963,7 +963,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination,
     {
       PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
         pixels);
-      pixels+=GetPixelChannels(destination->image);
+      pixels+=GetPixelComponents(destination->image);
     }
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -1134,7 +1134,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
     for (x=0; x < (ssize_t) source->extent.width; x++)
     {
       PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
-      pixels+=GetPixelChannels(source->image);
+      pixels+=GetPixelComponents(source->image);
     }
     destination_pixels=GetCacheViewAuthenticPixels(destination->view,
       destination->extent.x,y,destination->extent.width,1,exception);
@@ -1147,7 +1147,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
     {
       PixelSetQuantumPixel(destination->image,destination_pixels,
         destination->pixel_wands[id][x]);
-      destination_pixels+=GetPixelChannels(destination->image);
+      destination_pixels+=GetPixelComponents(destination->image);
     }
     if (transfer(source,destination,y,id,context) == MagickFalse)
       status=MagickFalse;
@@ -1157,7 +1157,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
     {
       PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
         destination_pixels);
-      destination_pixels+=GetPixelChannels(destination->image);
+      destination_pixels+=GetPixelComponents(destination->image);
     }
     sync=SyncCacheViewAuthenticPixels(destination->view,exception);
     if (sync == MagickFalse)
@@ -1282,14 +1282,14 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source,
     for (x=0; x < (ssize_t) source->extent.width; x++)
     {
       PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
-      pixels+=GetPixelChannels(source->image);
+      pixels+=GetPixelComponents(source->image);
     }
     if (update(source,y,id,context) == MagickFalse)
       status=MagickFalse;
     for (x=0; x < (ssize_t) source->extent.width; x++)
     {
       PixelGetQuantumPixel(source->image,source->pixel_wands[id][x],pixels);
-      pixels+=GetPixelChannels(source->image);
+      pixels+=GetPixelComponents(source->image);
     }
     if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
       {
index e72560f62f2ad4425187009db9757689a9ff3553..b27825246ba80e24d11aea5559b7a9279511ed78 100644 (file)
@@ -8230,7 +8230,7 @@ Mogrify(ref,...)
                     {
                       if (GetPixelAlpha(image,q) == OpaqueAlpha)
                         SetPixelAlpha(composite_image,ClampToQuantum(opacity),q);
-                      q+=GetPixelChannels(composite_image);
+                      q+=GetPixelComponents(composite_image);
                     }
                     sync=SyncCacheViewAuthenticPixels(composite_view,exception);
                     if (sync == MagickFalse)
index 214b17506b3f62563f8bc40b8fc7b248ed6ac60a..76b9ccfaefab813e6a481c324022d88d8af090fc 100644 (file)
@@ -183,7 +183,7 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception)
         SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
         if (GetPixelAlpha(image,q) != OpaqueAlpha)
           image->matte=MagickTrue;
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
@@ -387,7 +387,7 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image)
           GetPixelAlpha(image,p) : OpaqueAlpha));
         if (*q == 255)
           *q=254;
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
         q++;
       }
       count=WriteBlob(image,(size_t) (q-pixels),pixels);
index 5f8441b3da6fed504939576f73e647fa39424f78..12d881bcbc3a703eee80cbb9e0a2e1c3eb5f478f 100644 (file)
@@ -180,7 +180,7 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
         if (GetPixelAlpha(image,q) != OpaqueAlpha)
           image->matte=MagickTrue;
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
@@ -382,7 +382,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image)
         *q++=ScaleQuantumToChar(GetPixelRed(image,p));
         *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
         *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
       count=WriteBlob(image,(size_t) (q-pixels),pixels);
       if (count != (ssize_t) (q-pixels))
index c882751be199590e6b2ee388cb26c6fe2f961c5d..556863b4697e913e03f0c5fbc83945a095254b7c 100644 (file)
@@ -253,8 +253,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 SetPixelAlpha(image,OpaqueAlpha,q);
                 if (image->matte != MagickFalse)
                   SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -359,8 +359,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                     default:
                       break;
                   }
-                  p+=GetPixelChannels(canvas_image);
-                  q+=GetPixelChannels(image);
+                  p+=GetPixelComponents(canvas_image);
+                  q+=GetPixelComponents(image);
                 }
                 if (SyncAuthenticPixels(image,exception) == MagickFalse)
                   break;
@@ -425,8 +425,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -477,8 +477,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -529,8 +529,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -590,8 +590,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
@@ -677,8 +677,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -748,8 +748,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -819,8 +819,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -892,8 +892,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
index b0bc2833172d998938e1b227cda0147d768fb05f..a42f4010c4d52c6d3119a442bdddff822b9637bf 100644 (file)
@@ -1009,7 +1009,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               index=(Quantum) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
               SetPixelIndex(image,index,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             p++;
           }
@@ -1019,7 +1019,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 index=(Quantum) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
                 SetPixelIndex(image,index,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               p++;
             }
@@ -1051,17 +1051,17 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             index=ConstrainColormapIndex(image,*p & 0x0f);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             p++;
           }
           if ((image->columns % 2) != 0)
             {
               index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
               SetPixelIndex(image,index,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
               p++;
             }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1095,7 +1095,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             index=ConstrainColormapIndex(image,*p++);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -1165,7 +1165,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->matte != MagickFalse)
               SetPixelAlpha(image,
                 ScaleShortToQuantum((unsigned short) opacity),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -1198,7 +1198,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
             SetPixelRed(image,ScaleCharToQuantum(*p++),q);
             SetPixelAlpha(image,OpaqueAlpha,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -1260,7 +1260,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->matte != MagickFalse)
               SetPixelAlpha(image,
                 ScaleShortToQuantum((unsigned short) opacity),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -1658,7 +1658,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
                 bit=0;
                 byte=0;
               }
-             p+=GetPixelChannels(image);
+             p+=GetPixelComponents(image);
            }
            if (bit != 0)
              {
@@ -1707,7 +1707,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
                 nibble=0;
                 byte=0;
               }
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (nibble != 0)
             {
@@ -1741,7 +1741,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             *q++=(unsigned char) GetPixelIndex(image,p);
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           for ( ; x < (ssize_t) bytes_per_line; x++)
             *q++=0x00;
@@ -1771,7 +1771,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
             *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
             *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
             *q++=ScaleQuantumToChar(GetPixelRed(image,p));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           for (x=3L*(ssize_t) image->columns; x < (ssize_t) bytes_per_line; x++)
             *q++=0x00;
@@ -1802,7 +1802,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
             *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
             *q++=ScaleQuantumToChar(GetPixelRed(image,p));
             *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (image->previous == (Image *) NULL)
             {
index cd737db053660345a62712003c311183e9bc0ae1..086758f5995eec9c82c05ff4eec65f0a2c0eacaa 100644 (file)
@@ -218,7 +218,7 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info,
           SetPixelBlue(image,ScaleCharToQuantum(pBits->rgbBlue),q);
           SetPixelAlpha(image,OpaqueAlpha,q);
           pBits++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
index d736168871a206708907d8adecf88c41d01be518..0f3767514cf449c92205ff2bedc5b0430ef09714 100644 (file)
@@ -253,8 +253,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 SetPixelAlpha(image,OpaqueAlpha,q);
                 if (image->matte != MagickFalse)
                   SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -360,8 +360,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                     default:
                       break;
                   }
-                  p+=GetPixelChannels(canvas_image);
-                  q+=GetPixelChannels(image);
+                  p+=GetPixelComponents(canvas_image);
+                  q+=GetPixelComponents(image);
                 }
                 if (SyncAuthenticPixels(image,exception) == MagickFalse)
                   break;
@@ -426,8 +426,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -478,8 +478,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -530,8 +530,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -582,8 +582,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -637,8 +637,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
@@ -724,8 +724,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -795,8 +795,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -866,8 +866,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -937,8 +937,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -1010,8 +1010,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
index 091d49999cb02b5c0661f2b4544b4b23c42b03e6..f84ef1d5cfa768d32fb01aa60be50792796a8c78 100644 (file)
@@ -118,7 +118,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
           {
             index=(Quantum) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           p++;
         }
@@ -128,7 +128,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
               {
                 index=(Quantum) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
                 SetPixelIndex(image,index,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
             p++;
           }
@@ -145,35 +145,35 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
         {
           index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,(*p) & 0x3);
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           p++;
         }
         if ((image->columns % 4) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             if ((image->columns % 4) >= 1)
 
               {
                 index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
                 SetPixelIndex(image,index,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
                 if ((image->columns % 4) >= 2)
 
                   {
                     index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
                     SetPixelIndex(image,index,q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
               }
             p++;
@@ -192,17 +192,17 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
         {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             index=ConstrainColormapIndex(image,(*p) & 0xf);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             p++;
           }
         if ((image->columns % 2) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             p++;
           }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -218,7 +218,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
           index=ConstrainColormapIndex(image,*p);
           SetPixelIndex(image,index,q);
           p++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -259,7 +259,7 @@ static int GetCutColors(Image *image)
         intensity=GetPixelRed(image,q);
       if (intensity >= scale_intensity)
         return(255);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
   }
   if (intensity < ScaleCharToQuantum(2))
@@ -589,7 +589,7 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           SetPixelGreen(image,QuantumRange,q);
                           SetPixelBlue(image,QuantumRange,q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse) goto Finish;
                 }
index b207379a5fece9db8c4156b5f28f9bbbd4a60d70..b3c4c7c35bc9b4d07920c3ddfc04a50391b80e7f 100644 (file)
@@ -3752,7 +3752,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 default:
                   break;
               }
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3907,7 +3907,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelRed(image,pixel.red,q);
             SetPixelGreen(image,pixel.green,q);
             SetPixelBlue(image,pixel.blue,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -4040,7 +4040,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 (((size_t) pixel.green) << 8)),q);
               SetPixelBlue(image,(((size_t) GetPixelBlue(image,q)) |
                 (((size_t) pixel.blue) << 8)),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
index dc7a796878c4ecb5f7a10f7b21d74c55fd6ad2ef..0422561530f075e03b8e6e2a63b82da320b6b3c1 100644 (file)
@@ -554,7 +554,7 @@ static MagickBooleanType ReadDXT1(Image *image, DDSInfo *dds_info)
               SetPixelAlpha(image,ScaleCharToQuantum(colors.a[code]),q);
               if (colors.a[code] && (image->matte == MagickFalse))
                 image->matte=MagickTrue;  /* Correct matte */
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
         }
       }
@@ -643,7 +643,7 @@ static MagickBooleanType ReadDXT3(Image *image, DDSInfo *dds_info)
               else
                 alpha = 17U * (unsigned char) ((a1 >> (4*(4*(j-2)+i))) & 0xf);
               SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) alpha),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
         }
       }
@@ -747,7 +747,7 @@ static MagickBooleanType ReadDXT5(Image *image, DDSInfo *dds_info)
               else
                 alpha = (((6-alpha_code) * a0 + (alpha_code-1) * a1) / 5);
               SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) alpha),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
         }
       }
@@ -791,7 +791,7 @@ static MagickBooleanType ReadUncompressedRGB(Image *image, DDSInfo *dds_info)
         ReadBlobByte(image)),q);
       if (dds_info->pixelformat.rgb_bitcount == 32)
         (void) ReadBlobByte(image);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -832,7 +832,7 @@ static MagickBooleanType ReadUncompressedRGBA(Image *image, DDSInfo *dds_info)
         ReadBlobByte(image)),q);
       SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
         ReadBlobByte(image)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index 1fb6753467e7faa49232df5c343dd4779ea727c2..69743f78895352ef16e0476685a1fc25a99b5a5b 100644 (file)
@@ -247,7 +247,7 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info,
           }
         (void) WriteBlobString(image,tuple);
         (void) WriteBlobString(image,"\n");
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
       status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
         image->rows);
index 658a7acb878f92d60b6ac68c91019bff8adc839e..0f2a51947170184c2b3d5dbc634ff3bc9a49d413 100644 (file)
@@ -656,7 +656,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             index=(Quantum) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           p++;
         }
@@ -666,7 +666,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               index=(Quantum) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
               SetPixelIndex(image,index,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             p++;
           }
@@ -698,17 +698,17 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,*p & 0xf);
           SetPixelIndex(image,index,q);
           p++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if ((image->columns % 2) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             p++;
           }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -743,7 +743,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           index=ConstrainColormapIndex(image,*p);
           SetPixelIndex(image,index,q);
           p++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -797,7 +797,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
               SetPixelBlue(image,ScaleCharToQuantum(ScaleColor5to8(
                 (unsigned char) (word & 0x1f))),q);
             }
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -830,7 +830,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           SetPixelRed(image,ScaleCharToQuantum(*p++),q);
           if (image->matte != MagickFalse)
             SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -1092,7 +1092,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
               bit=0;
               byte=0;
             }
-           p+=GetPixelChannels(image);
+           p+=GetPixelComponents(image);
          }
          if (bit != 0)
            {
@@ -1122,7 +1122,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           *q++=(unsigned char) GetPixelIndex(image,p);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
         for ( ; x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
@@ -1155,7 +1155,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
             GetPixelBlue(image,p)) << 0)));
           *q++=(unsigned char)(word & 0xff);
           *q++=(unsigned char)(word >> 8);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
         for (x=(ssize_t) (2*image->columns); x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
@@ -1185,7 +1185,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
           *q++=ScaleQuantumToChar(GetPixelRed(image,p));
           if (image->matte != MagickFalse)
             *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
         if (dib_info.bits_per_pixel == 24)
           for (x=(ssize_t) (3*image->columns); x < (ssize_t) bytes_per_line; x++)
index 5d6ae7825cadcb3cba67f8cee3a94c8d4949831a..0bdc8933d3a562fd1fce510e0d263ab76af6c7cc 100644 (file)
@@ -410,7 +410,7 @@ get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h,
                                                 if (bit == 8)
                                                         bit=0;
                                                 byte>>=1;
-                                          o+=GetPixelChannels(image);
+                                          o+=GetPixelComponents(image);
                                         }
                                 if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
                                         break;
@@ -444,7 +444,7 @@ get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h,
                     SetPixelRed(image,ScaleCharToQuantum(*s++),r);
                     SetPixelGreen(image,ScaleCharToQuantum(*s++),r);
                     SetPixelBlue(image,ScaleCharToQuantum(*s++),r);
-                    r+=GetPixelChannels(image);
+                    r+=GetPixelComponents(image);
                   }
 
                               SyncAuthenticPixels(image,&image->exception);
index 22dfcffc0aeb8d54e1890b07f24bcabcd8eee3e4..2b2cf4d66fc02e7544bdab40514c5aa03f7fdd31 100644 (file)
@@ -385,7 +385,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelGreen(image,ScaleShortToQuantum(colors[index].green),q);
             index=(pixel >> blue_shift) & blue_mask;
             SetPixelBlue(image,ScaleShortToQuantum(colors[index].blue),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -410,7 +410,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
             color=(pixel >> blue_shift) & blue_mask;
             color=(color*65535L)/blue_mask;
             SetPixelBlue(image,ScaleShortToQuantum((unsigned short) color),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -452,7 +452,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           SetPixelIndex(image,(unsigned short) XGetPixel(dps_image,x,y),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -501,7 +501,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   SetPixelAlpha(image,OpaqueAlpha,q);
                   if (XGetPixel(matte_image,x,y) == 0)
                     SetPixelAlpha(image,TransparentAlpha,q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
                 if (SyncAuthenticPixels(image,exception) == MagickFalse)
                   break;
index 7df34b61eca4f2e0688c807a72ee8b40bd500794..c9ae41e11870c7954c75f1a7e201c5eb31fdf6fb 100644 (file)
@@ -618,7 +618,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info,
       SetPixelBlue(image,ScaleCharToQuantum(pBits->rgbBlue),q);
       SetPixelAlpha(image,OpaqueAlpha,q);
       pBits++;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index 7cd528c48ba90edec6d8adebee8cd92d17275f1f..c8c5969ec043ed5c1f8ff2f69e0099267521fc0c 100644 (file)
@@ -233,7 +233,7 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ImfHalfToFloat(scanline[x].b)),q);
       SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
         ImfHalfToFloat(scanline[x].a)),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -443,7 +443,7 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image)
       else
         ImfFloatToHalf(QuantumScale*GetPixelAlpha(image,p),&half_quantum);
       scanline[x].a=half_quantum;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     ImfOutputSetFrameBuffer(file,scanline-(y*image->columns),1,image->columns);
     ImfOutputWritePixels(file,1);
index 9058fc6a801254f10f465cef0a05cf1481eae235..694c16acfa9488b9e07154efb9bb636a06f2ef12 100644 (file)
@@ -448,7 +448,7 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
           (pixel-fits_info.min_data)+fits_info.zero)),q);
         SetPixelGreen(image,GetPixelRed(image,q),q);
         SetPixelBlue(image,GetPixelRed(image,q),q);
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
index 4c7d4a62c2cdf532e3ce1b7b79c72f6d0e582bf6..cefeb776ebcaf9071915a44a28150ef5054ba8a7 100644 (file)
@@ -470,7 +470,7 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
       SetPixelAlpha(image,OpaqueAlpha,q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(image,ScaleCharToQuantum(*a),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
       r+=red_component->columnStride;
       g+=green_component->columnStride;
       b+=blue_component->columnStride;
index def359986e7b95e8eb063c63ef996782da66b8de..b3c8bb92cfb3b11e64a479cb88aaa9eb3938acd3 100644 (file)
@@ -450,7 +450,7 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity)
       SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha :
         OpaqueAlpha,q);
       x++;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (x < (ssize_t) image->columns)
       break;
@@ -666,7 +666,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
     if (y == 0)
       {
         waiting_code=(short) GetPixelIndex(image,p);
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     for (x=(ssize_t) (y == 0 ? 1 : 0); x < (ssize_t) image->columns; x++)
     {
@@ -674,7 +674,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
         Probe hash table.
       */
       index=(Quantum) ((size_t) GetPixelIndex(image,p) & 0xff);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
       k=(ssize_t) (((size_t) index << (MaxGIFBits-8))+waiting_code);
       if (k >= MaxHashTable)
         k-=MaxHashTable;
index c9d6e5e0e3b6d57421a799ad6de4d15cf1115f17..699a48561a0713402a3f1c33da94a79d53e6c572 100644 (file)
@@ -228,8 +228,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
             SetPixelRed(image,GetPixelRed(canvas_image,p),q);
             SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
             SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-            p+=GetPixelChannels(canvas_image);
-            q+=GetPixelChannels(image);
+            p+=GetPixelComponents(canvas_image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
index 95d075b1848587be9099aa9c88755518253bca2d..1e6cd25f5e60cf2fb1b6ff59d3b2b572efc7788d 100644 (file)
@@ -152,7 +152,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
           (cube_size-1.0)),q);
         SetPixelBlue(image,ClampToQuantum(QuantumRange*blue/(cube_size-1.0)),q);
         SetPixelAlpha(image,OpaqueAlpha,q);
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
index d5978aa94524b17ba82af446e49348b7ffb6e498..86d5a2dc7a745704f2562b72bd24b640809cce9b 100644 (file)
@@ -474,7 +474,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception)
           SetPixelGreen(image,ClampToQuantum(QuantumRange*gamma*pixel[1]),q);
           SetPixelBlue(image,ClampToQuantum(QuantumRange*gamma*pixel[2]),q);
         }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -784,7 +784,7 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image)
           pixels[i++]=pixel[2];
           pixels[i++]=pixel[3];
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if ((image->columns >= 8) && (image->columns <= 0x7ffff))
       {
index 6adcad6ea945e6aa81478a5c7f5b3e99e649b380..7e0f11bf6472a15675a6aa899eb214ca1300c847 100644 (file)
@@ -277,7 +277,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
         histogram[ScaleQuantumToChar(GetPixelGreen(image,p))].green++;
       if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
         histogram[ScaleQuantumToChar(GetPixelBlue(image,p))].blue++;
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
   }
   maximum=histogram[0].red;
index 92dc674294aabc7291c0a6576b916b4d5b5c18d8..b337f40176fddc9bb7d857215810761d82b7b374 100644 (file)
@@ -162,7 +162,7 @@ static Image *ReadHRZImage(const ImageInfo *image_info,ExceptionInfo *exception)
       SetPixelGreen(image,4*ScaleCharToQuantum(*p++),q);
       SetPixelBlue(image,4*ScaleCharToQuantum(*p++),q);
       SetPixelAlpha(image,OpaqueAlpha,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -328,7 +328,7 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image)
       *q++=ScaleQuantumToChar(GetPixelRed(hrz_image,p))/4;
       *q++=ScaleQuantumToChar(GetPixelGreen(hrz_image,p))/4;
       *q++=ScaleQuantumToChar(GetPixelBlue(hrz_image,p))/4;
-      p+=GetPixelChannels(hrz_image);
+      p+=GetPixelComponents(hrz_image);
     }
     count=WriteBlob(image,(size_t) (q-pixels),pixels);
     if (count != (ssize_t) (q-pixels))
index 3a7e7aa62daecf5b8e5606a1a1ea681d17b5f138..c13e2357b0cf62a1a0fd8b291a401209b0e18125 100644 (file)
@@ -409,7 +409,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                 {
                   SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
                     0x00),q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               }
               if ((image->columns % 8) != 0)
@@ -419,7 +419,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                   {
                     SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
                       0x00),q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
                 }
               for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -450,15 +450,15 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               {
                 byte=(size_t) ReadBlobByte(image);
                 SetPixelIndex(image,((byte >> 4) & 0xf),q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
                 SetPixelIndex(image,((byte) & 0xf),q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if ((image->columns % 2) != 0)
                 {
                   byte=(size_t) ReadBlobByte(image);
                   SetPixelIndex(image,((byte >> 4) & 0xf),q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               for (x=0; x < (ssize_t) scanline_pad; x++)
                 (void) ReadBlobByte(image);
@@ -488,7 +488,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               {
                 byte=(size_t) ReadBlobByte(image);
                 SetPixelIndex(image,byte,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               for (x=0; x < (ssize_t) scanline_pad; x++)
                 (void) ReadBlobByte(image);
@@ -519,7 +519,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                 byte=(size_t) ReadBlobByte(image);
                 byte|=(size_t) (ReadBlobByte(image) << 8);
                 SetPixelIndex(image,byte,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               for (x=0; x < (ssize_t) scanline_pad; x++)
                 (void) ReadBlobByte(image);
@@ -557,7 +557,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                 if (icon_info.bits_per_pixel == 32)
                   SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
                     ReadBlobByte(image)),q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if (icon_info.bits_per_pixel == 24)
                 for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -597,7 +597,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                 {
                   SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
                     TransparentAlpha : OpaqueAlpha),q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               }
               if ((image->columns % 8) != 0)
@@ -607,7 +607,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                   {
                     SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
                       TransparentAlpha : OpaqueAlpha),q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
                 }
               if ((image->columns % 32) != 0)
@@ -1015,7 +1015,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
                     bit=0;
                     byte=0;
                   }
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (bit != 0)
                 *q++=(unsigned char) (byte << (8-bit));
@@ -1056,7 +1056,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
                     nibble=0;
                     byte=0;
                   }
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (nibble != 0)
                 *q++=(unsigned char) (byte << 4);
@@ -1083,7 +1083,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) next->columns; x++)
               {
                 *q++=(unsigned char) GetPixelIndex(next,p);
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (next->previous == (Image *) NULL)
                 {
@@ -1115,7 +1115,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
                   *q++=ScaleQuantumToChar(QuantumRange);
                 else
                   *q++=ScaleQuantumToChar(GetPixelAlpha(next,p));
-                p+=GetPixelChannels(next);
+                p+=GetPixelComponents(next);
               }
               if (icon_info.bits_per_pixel == 24)
                 for (x=3L*(ssize_t) next->columns; x < (ssize_t) bytes_per_line; x++)
@@ -1211,7 +1211,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
                 bit=0;
                 byte=0;
               }
-            p+=GetPixelChannels(next);
+            p+=GetPixelComponents(next);
           }
           if (bit != 0)
             (void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
index bdd44229557343c598c803f6ba8ca041532a7bec..d59cd3ad9f7e06f8daa48f4fd6b52c79d93ab364 100644 (file)
@@ -235,7 +235,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
         bit=0;
       SetPixelIndex(image,index,q);
       SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -472,7 +472,7 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
             bit=0;
             byte=0;
           }
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
       if (bit != 0)
         *q++=byte << (8-bit);
index c8667dc1af1f5f0e9b237d726eab26e69bb06b10..4274d8e1f9208ebada67d81d472634ca775525a7 100644 (file)
@@ -541,7 +541,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
           SetPixelRed(image,ScaleAnyToQuantum((QuantumAny) pixel,range[0]),q);
           SetPixelGreen(image,GetPixelRed(image,q),q);
           SetPixelBlue(image,GetPixelRed(image,q),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -558,7 +558,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
           SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny) pixel,range[1]),q);
           pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
           SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny) pixel,range[2]),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -577,7 +577,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
           SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny) pixel,range[2]),q);
           pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]);
           SetPixelAlpha(image,ScaleAnyToQuantum((QuantumAny) pixel,range[3]),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         break;
       }
@@ -939,7 +939,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
             jas_matrix_setv(pixels[3],x,(jas_seqent_t) ScaleQuantumToAny(
               GetPixelAlpha(image,p),range));
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     for (i=0; i < (ssize_t) number_components; i++)
       (void) jas_image_writecmpt(jp2_image,(short) i,0,(unsigned int) y,
index 7808d02872b9183acbdd382b496ae80eb4eeea9a..221ef0024fac0f1f87d5c99476d67f0b5ef9e4b1 100644 (file)
@@ -1247,7 +1247,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         else
           if (image->colorspace != CMYKColorspace)
@@ -1260,7 +1260,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
               SetPixelBlue(image,ScaleShortToQuantum((unsigned char)
                 (GETJSAMPLE(*p++) << 4)),q);
               SetPixelAlpha(image,OpaqueAlpha,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
           else
             for (x=0; x < (ssize_t) image->columns; x++)
@@ -1274,7 +1274,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
               SetPixelBlack(image,QuantumRange-ScaleShortToQuantum(
                 (unsigned char) (GETJSAMPLE(*p++) << 4)),q);
               SetPixelAlpha(image,OpaqueAlpha,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
       }
     else
@@ -1285,7 +1285,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
           SetPixelIndex(image,index,q);
           SetPixelPacket(image,image->colormap+(ssize_t) index,q);
           p++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
       else
         if (image->colorspace != CMYKColorspace)
@@ -1298,7 +1298,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
             SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
               GETJSAMPLE(*p++)),q);
             SetPixelAlpha(image,OpaqueAlpha,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         else
           for (x=0; x < (ssize_t) image->columns; x++)
@@ -1312,7 +1312,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
             SetPixelBlack(image,QuantumRange-ScaleCharToQuantum(
               (unsigned char) GETJSAMPLE(*p++)),q);
             SetPixelAlpha(image,OpaqueAlpha,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -2227,7 +2227,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelRed(image,p));
             *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelGreen(image,p));
             *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelBlue(image,p));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
           status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2252,7 +2252,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelIntensity(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
             status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2286,7 +2286,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
                 GetPixelBlue(image,p))));
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
                 GetPixelBlack(image,p))));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
             status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2313,7 +2313,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
         {
           *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelIntensity(image,p)) >>
             4);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
         (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
         status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2341,7 +2341,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelRed(image,p)) >> 4);
             *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelGreen(image,p)) >> 4);
             *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelBlue(image,p)) >> 4);
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
           status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2375,7 +2375,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               GetPixelBlue(image,p)) >> 4));
             *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
               GetPixelBlack(image,p)) >> 4));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
           status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
index 9d9216222e76b89bf48a2044e11bc38dc33b49dc..10b1935ec2b110c4a2bcda6e2b5851d25b3bff8d 100644 (file)
@@ -193,7 +193,7 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 byte<<=1;
                 if (bit == 8)
                   bit=0;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -228,7 +228,7 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
             byte<<=1;
             if (bit == 8)
               bit=0;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
index 0a08aee96ff8ac36b11086f51ed706ae95851783..58b3ca52c0bc052094217b055991f1c755a10060 100644 (file)
@@ -227,7 +227,7 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
       SetPixelIndex(image,index,q);
       SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -423,7 +423,7 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image)
       if (image->colors > 256)
         *q++=(unsigned char) ((size_t) GetPixelIndex(image,p) >> 8);
       *q++=(unsigned char) GetPixelIndex(image,p);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     (void) WriteBlob(image,(size_t) (q-pixels),pixels);
   }
index c35d967837cd6489a02db4508eabc267dd7e72b4..b9692444c11a1c4488528101d02c1bb74add4d04 100644 (file)
@@ -235,7 +235,7 @@ static void InsertComplexDoubleRow(double *p, int y, Image * image, double MinVa
         }
     }
     p++;
-    q+=GetPixelChannels(image);
+    q+=GetPixelComponents(image);
   }
   if (!SyncAuthenticPixels(image,exception))
     return;
index 43da96369038f1f68a18e257b481e5dda69b4e88..b037aab5f1b0905d854c158cccf7aec507615dec 100644 (file)
@@ -199,8 +199,8 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
       SetPixelGreen(matte_image,GetPixelAlpha(image,p),q);
       SetPixelBlue(matte_image,GetPixelAlpha(image,p),q);
       SetPixelAlpha(matte_image,OpaqueAlpha,q);
-      p+=GetPixelChannels(image);
-      q+=GetPixelChannels(matte_image);
+      p+=GetPixelComponents(image);
+      q+=GetPixelComponents(matte_image);
     }
     if (SyncAuthenticPixels(matte_image,exception) == MagickFalse)
       break;
index 25d28ccaab1731ff770753664a148ec1c034e9bf..f73431e857394fc4e41914ec9ca983973da7533d 100644 (file)
@@ -1412,7 +1412,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
               }
             if (image->matte != MagickFalse)
               SetPixelAlpha(image,pixel.alpha,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           break;
         }
@@ -2392,7 +2392,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
         {
           length=0;
           SetPixelInfo(image,p,&pixel);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
           for (x=1; x < (ssize_t) image->columns; x++)
           {
             SetPixelInfo(image,p,&target);
@@ -2405,7 +2405,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
                 length=0;
               }
             SetPixelInfo(image,p,&pixel);
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           q=PopRunlengthPacket(image,q,length,&pixel);
           (void) WriteBlob(image,(size_t) (q-pixels),pixels);
index 138b257c13edef965237888cfae9a4b828a883d0..32e071b7cba0824d04c08f4b890e43a44a892d0d 100644 (file)
@@ -172,7 +172,7 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
       if (bit == 8)
         bit=0;
       byte>>=1;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -340,7 +340,7 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info,
           bit=0;
           byte=0;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (bit != 0)
       (void) WriteBlobByte(image,(unsigned char) (byte >> (8-bit)));
index 3d8e1bc948f7c4ea1dfbfd3bf46ffa4a8e5a92d7..78f38a0a5e36a0a0f84b51a2da5be497d8b5c7fa 100644 (file)
@@ -1944,7 +1944,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                           if (GetPixelAlpha(composite_image,q) == OpaqueAlpha)
                             SetPixelAlpha(composite_image,
                               ClampToQuantum(opacity),q);
-                          q+=GetPixelChannels(composite_image);
+                          q+=GetPixelComponents(composite_image);
                         }
                         if (SyncCacheViewAuthenticPixels(composite_view,&exception) == MagickFalse)
                           break;
index e3a2b9afeed29ccfedd1df5ebfc5f301e7ff049c..374b277c5be6282d2fd677c4f278582b2881d493 100644 (file)
@@ -180,7 +180,7 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
         SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
         SetPixelAlpha(image,OpaqueAlpha,q);
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
@@ -383,7 +383,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image)
         *q++=ScaleQuantumToChar(GetPixelRed(image,p));
         *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
         *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
       (void) WriteBlob(image,(size_t) (q-pixels),pixels);
       if (image->previous == (Image *) NULL)
index 00f87e2bea6b0dd3c01cc225c28de6f2714f4aa7..3492c698f2cc093b5e6c39a9f2f5655763c5f4d6 100644 (file)
@@ -139,7 +139,7 @@ static Image *ReadNULLImage(const ImageInfo *image_info,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelPixelInfo(image,&background,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index 621650fb62c9100a0bd49ce0c7f2876ab99b105a..53e925ba44036a236ec5e01a88782a6b37d20188 100644 (file)
@@ -186,7 +186,7 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       bit++;
       if (bit == 8)
         bit=0;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -367,7 +367,7 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image)
           bit=0;
           byte=0;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (bit != 0)
       (void) WriteBlobByte(image,byte);
index cc8549929ab0afcab3e5ea09ebdc24877ad5b62f..66fa9b6bf7cf9b7cdb61f4232cee76a20f04adff 100644 (file)
@@ -477,7 +477,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
             SetPixelGreen(image,(QuantumRange*((color16 >> 5) & 0x3f))/0x3f,q);
             SetPixelBlue(image,(QuantumRange*((color16 >> 0) & 0x1f))/0x1f,q);
             SetPixelAlpha(image,OpaqueAlpha,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         }
       else
@@ -497,7 +497,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
                 ptr++;
                 bit=8-bits_per_pixel;
               }
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -826,7 +826,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
             {
               SetPixelIndex(image,FindColor(image,&image->colormap[(ssize_t)
                 GetPixelIndex(image,q)]),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
           }
           affinity_image=DestroyImage(affinity_image);
@@ -868,7 +868,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
               }
             *ptr++=(unsigned char) ((color16 >> 8) & 0xff);
             *ptr++=(unsigned char) (color16 & 0xff);
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
         }
       else
@@ -891,7 +891,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
                 byte=0x00;
                 bit=(unsigned char) (8-bits_per_pixel);
               }
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if ((image->columns % (8/bits_per_pixel)) != 0)
             *ptr++=byte;
index 62fb2a70dbf1018c36aaa9c57f4910f44e9446f1..19f7e352829c5ce66f33e28c5d7cb0f0f5cf7efe 100644 (file)
@@ -676,7 +676,7 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelRed(image,ScaleCharToQuantum(*yy++),q);
             SetPixelGreen(image,ScaleCharToQuantum(*c1++),q);
             SetPixelBlue(image,ScaleCharToQuantum(*c2++),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -784,7 +784,7 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
       SetPixelRed(image,ScaleCharToQuantum(*yy++),q);
       SetPixelGreen(image,ScaleCharToQuantum(*c1++),q);
       SetPixelBlue(image,ScaleCharToQuantum(*c2++),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -1027,7 +1027,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
     for (x=0; x < (ssize_t) (tile_image->columns << 1); x++)
     {
       (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelRed(tile_image,p)));
-      p+=GetPixelChannels(tile_image);
+      p+=GetPixelComponents(tile_image);
     }
     q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
       1,&downsample_image->exception);
index ae35056f3eff811c2b2c8b0654b5107b8902f4be..e8d524c3ae1249a57989500424ec43a1c507a7a5 100644 (file)
@@ -871,7 +871,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image)
                 bit=0;
                 byte=0;
               }
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (bit != 0)
             *q++=byte << (8-bit);
@@ -885,7 +885,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             *q++=(unsigned char) GetPixelIndex(image,p);
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           break;
         }
@@ -900,7 +900,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image)
             *q++=ScaleQuantumToChar(GetPixelRed(image,p));
             *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
             *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           break;
         }
index 91e0ab0a14be284896a86a0f73c8cfd42c59c48e..11e82021d3da866cee6d3a6a81f5c301bb0abe4d 100644 (file)
@@ -610,7 +610,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->matte != MagickFalse)
               SetPixelAlpha(image,ScaleCharToQuantum(*r++),q);
           }
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
@@ -1008,7 +1008,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
                 {
                   *q++=ScaleQuantumToChar(GetPixelRed(image,p));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 break;
               }
@@ -1017,7 +1017,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
                 {
                   *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 break;
               }
@@ -1026,7 +1026,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
                 {
                   *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 break;
               }
@@ -1036,7 +1036,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) (GetPixelAlpha(image,p)));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 break;
               }
@@ -1065,7 +1065,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               *q++=(unsigned char) GetPixelIndex(image,p);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             if (PCXWritePixels(&pcx_info,pcx_pixels,image) == MagickFalse)
               break;
@@ -1115,7 +1115,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
                     bit=0;
                     byte=0;
                   }
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (bit != 0)
                 *q++=byte << (8-bit);
index dc4b37474c706c618ba60c50e1862380e60f9771..7bcebc44e66750c36581bc6ed8968b2f5047e402 100644 (file)
@@ -442,7 +442,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             index=(Quantum) (*p & (0x80 >> bit) ? 0x00 : 0x01);
             SetPixelIndex(image,index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           p++;
         }
@@ -470,17 +470,17 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           index=ConstrainColormapIndex(image,3UL-((*p >> 6) & 0x03));
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,3UL-((*p >> 4) & 0x03));
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,3UL-((*p >> 2) & 0x03));
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,3UL-((*p) & 0x03));
           SetPixelIndex(image,index,q);
           p++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -506,11 +506,11 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           index=ConstrainColormapIndex(image,15UL-((*p >> 4) & 0x0f));
           SetPixelIndex(image,index,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
           index=ConstrainColormapIndex(image,15UL-((*p) & 0x0f));
           SetPixelIndex(image,index,q);
           p++;
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
index 06483d94233659d02a041215cc3abf0332f5de10..06cf2f90574c67f040fd7269033fd2bb243ad9cc 100644 (file)
@@ -1605,7 +1605,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (image->previous == (Image *) NULL)
                 {
@@ -1647,7 +1647,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               {
                 Ascii85Encode(image,ScaleQuantumToChar(
                   GetPixelIntensity(image,p)));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (image->previous == (Image *) NULL)
                 {
@@ -1712,7 +1712,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
                 if (image->colorspace == CMYKColorspace)
                   *q++=ScaleQuantumToChar(GetPixelBlack(image,p));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (image->previous == (Image *) NULL)
                 {
@@ -1758,7 +1758,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 if (image->colorspace == CMYKColorspace)
                   Ascii85Encode(image,ScaleQuantumToChar(
                     GetPixelBlack(image,p)));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (image->previous == (Image *) NULL)
                 {
@@ -1804,7 +1804,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   *q++=(unsigned char) GetPixelIndex(image,p);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 if (image->previous == (Image *) NULL)
                   {
@@ -1846,7 +1846,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   Ascii85Encode(image,(unsigned char) GetPixelIndex(image,p));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 if (image->previous == (Image *) NULL)
                   {
@@ -2054,7 +2054,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) tile_image->columns; x++)
               {
                 *q++=ScaleQuantumToChar(GetPixelIntensity(tile_image,p));
-                p+=GetPixelChannels(tile_image);
+                p+=GetPixelComponents(tile_image);
               }
             }
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2090,7 +2090,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               {
                 Ascii85Encode(image,
                   ScaleQuantumToChar(GetPixelIntensity(tile_image,p)));
-                p+=GetPixelChannels(tile_image);
+                p+=GetPixelComponents(tile_image);
               }
             }
             Ascii85Flush(image);
@@ -2153,7 +2153,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 *q++=ScaleQuantumToChar(GetPixelBlue(tile_image,p));
                 if (image->colorspace == CMYKColorspace)
                   *q++=ScaleQuantumToChar(GetPixelBlack(tile_image,p));
-                p+=GetPixelChannels(tile_image);
+                p+=GetPixelComponents(tile_image);
               }
             }
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2196,7 +2196,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 if (image->colorspace == CMYKColorspace)
                   Ascii85Encode(image,ScaleQuantumToChar(
                     GetPixelBlack(tile_image,p)));
-                p+=GetPixelChannels(tile_image);
+                p+=GetPixelComponents(tile_image);
               }
             }
             Ascii85Flush(image);
@@ -2238,7 +2238,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) tile_image->columns; x++)
                 {
                   *q++=(unsigned char) GetPixelIndex(tile_image,p);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               }
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2274,7 +2274,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                 {
                   Ascii85Encode(image,(unsigned char)
                     GetPixelIndex(tile_image,p));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
               }
               Ascii85Flush(image);
@@ -2441,7 +2441,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
             }
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -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(GetPixelAlpha(image,p)));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
             }
             Ascii85Flush(image);
index c2e3776fb4c29136f07497186addd826c2c6bf35..5ad5d970bb66285d59e1a31c8f537e1639e3fb5b 100644 (file)
@@ -494,7 +494,7 @@ static unsigned char *DecodeImage(Image *blob,Image *image,
       */
       for (y=0; y < (ssize_t) image->rows; y++)
       {
-        q=pixels+y*width*GetPixelChannels(image);;
+        q=pixels+y*width*GetPixelComponents(image);;
         number_pixels=bytes_per_line;
         count=ReadBlob(blob,(size_t) number_pixels,scanline);
         (void) count;
@@ -1219,7 +1219,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                         }
                   }
                 p++;
-                q+=GetPixelChannels(tile_image);
+                q+=GetPixelComponents(tile_image);
               }
               if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
                 break;
@@ -1878,7 +1878,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         scanline[x]=(unsigned char) GetPixelIndex(image,p);
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
       count+=EncodeImage(image,scanline,(size_t) (row_bytes & 0x7FFF),
         packed_scanline);
@@ -1932,7 +1932,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
             *blue++=ScaleQuantumToChar(GetPixelBlue(image,p));
             if (image->matte != MagickFalse)
               *opacity++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           count+=EncodeImage(image,scanline,bytes_per_line & 0x7FFF,
             packed_scanline);
index bc0dbd144cf82bfb3b76e59010a92294b4481ac2..bff50cfe5288fce9458c0bf6647df7744a163208 100644 (file)
@@ -189,7 +189,7 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         SetPixelGreen(image,green,q);
         SetPixelRed(image,red,q);
         length--;
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
index 411398c039086a7bd31ac9c8259c25ba4cc3c0b6..c351b19ee2443982943d7193e127ab34ebc16ea8 100644 (file)
@@ -175,7 +175,7 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelAlpha(image,QuantumRange/2,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index 6ff261d166d85e52b2e97e0d43745a17c15c043a..bc041fd0360b78b9eb8bde2c208e42dcb0ca644f 100644 (file)
@@ -1028,7 +1028,7 @@ LosslessReduceDepthOK(Image *image)
                 if (ok_to_reduce == MagickFalse)
                   break;
 
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (x >= 0)
                 break;
@@ -1158,7 +1158,7 @@ static MagickBooleanType ImageIsGray(Image *image)
     {
        if (IsPixelGray(image,p) == MagickFalse)
           return(MagickFalse);
-       p+=GetPixelChannels(image);
+       p+=GetPixelComponents(image);
     }
   }
   return(MagickTrue);
@@ -2945,7 +2945,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                     found_transparent_pixel = MagickTrue;
                     break;
                   }
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
             }
 
@@ -3078,7 +3078,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                 SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) *p++),q);
                 if (GetPixelAlpha(image,q) != OpaqueAlpha)
                   found_transparent_pixel = MagickTrue;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
 
             else
@@ -3117,7 +3117,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                   SetPixelAlpha(image,ScaleShortToQuantum(quantum),q);
                   if (GetPixelAlpha(image,q) != OpaqueAlpha)
                     found_transparent_pixel = MagickTrue;
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
 
 #else /* MAGICKCORE_QUANTUM_DEPTH == 8 */
@@ -3130,7 +3130,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                   if (GetPixelAlpha(image,q) != OpaqueAlpha)
                     found_transparent_pixel = MagickTrue;
                   p++;
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
 #endif
             }
@@ -3154,7 +3154,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           SetPixelIndex(image,*r++,q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
 
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3304,7 +3304,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                 }
 #endif
 
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
 
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -4323,8 +4323,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
       SetPixelRed(image,GetPixelRed(jng_image,s),q);
       SetPixelGreen(image,GetPixelGreen(jng_image,s),q);
       SetPixelBlue(image,GetPixelBlue(jng_image,s),q);
-      q+=GetPixelChannels(image);
-      s+=GetPixelChannels(jng_image);
+      q+=GetPixelComponents(image);
+      s+=GetPixelComponents(jng_image);
     }
 
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -4370,8 +4370,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
                for (x=(ssize_t) image->columns; x != 0; x--)
                {
                   SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
-                  q+=GetPixelChannels(image);
-                  s+=GetPixelChannels(jng_image);
+                  q+=GetPixelComponents(image);
+                  s+=GetPixelComponents(jng_image);
                }
 
              else
@@ -4380,8 +4380,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
                   SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
                   if (GetPixelAlpha(image,q) != OpaqueAlpha)
                     image->matte=MagickTrue;
-                  q+=GetPixelChannels(image);
-                  s+=GetPixelChannels(jng_image);
+                  q+=GetPixelComponents(image);
+                  s+=GetPixelComponents(jng_image);
                }
 
              if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6211,7 +6211,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                             GetPixelBlue(image,q)),q);
                           SetPixelAlpha(image,ScaleQuantumToShort(
                             GetPixelAlpha(image,q)),q);
-                          q+=GetPixelChannels(image);
+                          q+=GetPixelComponents(image);
                        }
 
                        if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6415,9 +6415,9 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                                  +GetPixelAlpha(image,pixels)),q);
                             }
                         }
-                      n+=GetPixelChannels(image);
-                      q+=GetPixelChannels(large_image);
-                      pixels+=GetPixelChannels(image);
+                      n+=GetPixelComponents(image);
+                      q+=GetPixelComponents(large_image);
+                      pixels+=GetPixelComponents(image);
                     } /* x */
 
                     if (SyncAuthenticPixels(large_image,exception) == 0)
@@ -6452,8 +6452,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     *pixels;
 
                   q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-                  pixels=q+(image->columns-length)*GetPixelChannels(image);
-                  n=pixels+GetPixelChannels(image);
+                  pixels=q+(image->columns-length)*GetPixelComponents(image);
+                  n=pixels+GetPixelComponents(image);
 
                   for (x=(ssize_t) (image->columns-length);
                     x < (ssize_t) image->columns; x++)
@@ -6570,10 +6570,10 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                                  +GetPixelAlpha(image,pixels)),q);
                             }
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
-                    n+=GetPixelChannels(image);
-                    p+=GetPixelChannels(image);
+                    n+=GetPixelComponents(image);
+                    p+=GetPixelComponents(image);
                   }
 
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6599,7 +6599,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           GetPixelBlue(image,q)),q);
                         SetPixelAlpha(image,ScaleShortToQuantum(
                           GetPixelAlpha(image,q)),q);
-                        q+=GetPixelChannels(image);
+                        q+=GetPixelComponents(image);
                      }
 
                      if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8055,7 +8055,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                      }
                  }
              }
-           q+=GetPixelChannels(image);
+           q+=GetPixelComponents(image);
         }
      }
 
@@ -8148,7 +8148,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                           ping_have_non_bw=MagickTrue;
                           break;
                        }
-                     s+=GetPixelChannels(image);
+                     s+=GetPixelComponents(image);
                    }
                  }
 
@@ -8162,7 +8162,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                        {
                          ping_have_non_bw=MagickTrue;
                        }
-                     s+=GetPixelChannels(image);
+                     s+=GetPixelComponents(image);
                    }
                  }
              }
@@ -8283,7 +8283,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                     break;
                   }
                 }
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
 
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8395,7 +8395,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                 }
               else
                   SetPixelAlpha(image,OpaqueAlpha,r);
-              r+=GetPixelChannels(image);
+              r+=GetPixelComponents(image);
           }
 
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8605,7 +8605,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               {
                 SetPixelRed(image,ScaleCharToQuantum(0x24),r);
               }
-            r+=GetPixelChannels(image);
+            r+=GetPixelComponents(image);
           }
 
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8698,7 +8698,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                      break;
                    }
 
-                 q+=GetPixelChannels(image);
+                 q+=GetPixelComponents(image);
              }
 
              if (ping_have_cheap_transparency == MagickFalse)
index f82ba75ae739ae32992c9fad73ca4acefab853aa..3b9d5be98e9f746f96ff4327a4909f2bccf91ed1 100644 (file)
@@ -439,7 +439,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelRed(image,PNMInteger(image,2) == 0 ? QuantumRange : 0,q);
             SetPixelGreen(image,GetPixelRed(image,q),q);
             SetPixelBlue(image,GetPixelRed(image,q),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -495,7 +495,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 max_value)],q);
             SetPixelGreen(image,GetPixelRed(image,q),q);
             SetPixelBlue(image,GetPixelRed(image,q),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -561,7 +561,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelRed(image,pixel.red,q);
             SetPixelGreen(image,pixel.green,q);
             SetPixelBlue(image,pixel.blue,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -725,7 +725,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
                   SetPixelGreen(image,GetPixelRed(image,q),q);
                   SetPixelBlue(image,GetPixelRed(image,q),q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               }
             else
@@ -739,7 +739,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
                   SetPixelGreen(image,GetPixelRed(image,q),q);
                   SetPixelBlue(image,GetPixelRed(image,q),q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               }
           sync=SyncAuthenticPixels(image,exception);
@@ -825,7 +825,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
               SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
               SetPixelAlpha(image,OpaqueAlpha,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
           else
             if (image->depth == 16)
@@ -842,7 +842,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   p=PushShortPixel(MSBEndian,p,&pixel);
                   SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
                   SetPixelAlpha(image,OpaqueAlpha,q);
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               }
             else
@@ -860,7 +860,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     p=PushCharPixel(p,&pixel);
                     SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
                     SetPixelAlpha(image,OpaqueAlpha,q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
                 }
               else
@@ -877,7 +877,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     p=PushShortPixel(MSBEndian,p,&pixel);
                     SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
                     SetPixelAlpha(image,OpaqueAlpha,q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
                 }
           if ((type == BilevelType) || (type == GrayscaleType))
@@ -894,7 +894,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   type=UndefinedType;
                 if ((type != BilevelType) && (type != GrayscaleType))
                   break;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
             }
           sync=SyncAuthenticPixels(image,exception);
@@ -1020,7 +1020,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           p=PushCharPixel(p,&pixel);
                           SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   }
                 else
@@ -1040,7 +1040,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           p=PushShortPixel(MSBEndian,p,&pixel);
                           SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   }
                 break;
@@ -1069,7 +1069,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           p=PushCharPixel(p,&pixel);
                           SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   }
                 else
@@ -1093,7 +1093,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           p=PushShortPixel(MSBEndian,p,&pixel);
                           SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   }
                 break;
@@ -1119,7 +1119,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           p=PushCharPixel(p,&pixel);
                           SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   }
                 else
@@ -1141,7 +1141,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                           p=PushShortPixel(MSBEndian,p,&pixel);
                           SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
                         }
-                      q+=GetPixelChannels(image);
+                      q+=GetPixelComponents(image);
                     }
                   }
                 break;
@@ -1645,7 +1645,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                 (void) WriteBlob(image,q-pixels,pixels);
                 q=pixels;
               }
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (image->previous == (Image *) NULL)
             {
@@ -1704,7 +1704,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                 (void) WriteBlob(image,q-pixels,pixels);
                 q=pixels;
               }
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (image->previous == (Image *) NULL)
             {
@@ -1766,7 +1766,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                 (void) WriteBlob(image,q-pixels,pixels);
                 q=pixels;
               }
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (image->previous == (Image *) NULL)
             {
@@ -1868,7 +1868,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                         pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
                     }
                   q=PopCharPixel((unsigned char) pixel,q);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
               else
                 for (x=0; x < (ssize_t) image->columns; x++)
@@ -1883,7 +1883,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                         pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
                     }
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
               extent=(size_t) (q-pixels);
             }
@@ -1946,7 +1946,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   q=PopCharPixel((unsigned char) pixel,q);
                   pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
                   q=PopCharPixel((unsigned char) pixel,q);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
               else
                 for (x=0; x < (ssize_t) image->columns; x++)
@@ -1957,7 +1957,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                   pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
                   q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
               extent=(size_t) (q-pixels);
             }
@@ -2021,7 +2021,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                             GetPixelAlpha(image,p),range);
                           q=PopCharPixel((unsigned char) pixel,q);
                         }
-                      p+=GetPixelChannels(image);
+                      p+=GetPixelComponents(image);
                     }
                   else
                     for (x=0; x < (ssize_t) image->columns; x++)
@@ -2034,7 +2034,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                             GetPixelAlpha(image,p),range);
                           q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                         }
-                      p+=GetPixelChannels(image);
+                      p+=GetPixelComponents(image);
                     }
                   break;
                 }
@@ -2057,7 +2057,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                           pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
                           q=PopCharPixel((unsigned char) pixel,q);
                         }
-                      p+=GetPixelChannels(image);
+                      p+=GetPixelComponents(image);
                     }
                   else
                     for (x=0; x < (ssize_t) image->columns; x++)
@@ -2075,7 +2075,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                           pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
                           q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                         }
-                      p+=GetPixelChannels(image);
+                      p+=GetPixelComponents(image);
                     }
                   break;
                 }
@@ -2095,7 +2095,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                           pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
                           q=PopCharPixel((unsigned char) pixel,q);
                         }
-                      p+=GetPixelChannels(image);
+                      p+=GetPixelComponents(image);
                     }
                   else
                     for (x=0; x < (ssize_t) image->columns; x++)
@@ -2111,7 +2111,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
                           pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
                           q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
                         }
-                      p+=GetPixelChannels(image);
+                      p+=GetPixelComponents(image);
                     }
                   break;
                 }
index 9ea57be02e6b6f267e491019cba4381c979b88c3..7ce244efea48e5f59cdf90d1f5e7c7cec3061cc7 100644 (file)
@@ -1769,7 +1769,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                     (void) WriteBlob(image,q-pixels,pixels);
                     q=pixels;
                   }
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (image->previous == (Image *) NULL)
                 {
@@ -1828,7 +1828,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                     bit=0;
                     byte=0;
                   }
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (bit != 0)
                 {
@@ -1906,7 +1906,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                       length=0;
                     }
                   GetPixelPacket(image,p,&pixel);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 WriteRunlengthPacket(image,pixel,length,p);
                 if ((q-pixels+10) >= 80)
@@ -1967,7 +1967,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                       (void) WriteBlob(image,q-pixels,pixels);
                       q=pixels;
                     }
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 if (image->previous == (Image *) NULL)
                   {
@@ -2054,7 +2054,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                   pixel.green=GetPixelGreen(image,p);
                   pixel.blue=GetPixelBlue(image,p);
                   pixel.alpha=GetPixelAlpha(image,p);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 q=PopHexPixel(hex_digits,(size_t) index,q);
                 q=PopHexPixel(hex_digits,(size_t)
@@ -2096,7 +2096,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                       (void) WriteBlob(image,q-pixels,pixels);
                       q=pixels;
                     }
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 if (image->previous == (Image *) NULL)
                   {
index ae734eb1066b6d8afdfa28d0b5b79ac9aa1a6143..1190dd9f1eae4cf4268829ed8199259c91d34426 100644 (file)
@@ -785,7 +785,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
                 image->rows);
@@ -821,7 +821,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
               {
                 Ascii85Encode(image,ScaleQuantumToChar(
                   GetPixelIntensity(image,p)));
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                 y,image->rows);
@@ -902,7 +902,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                         *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
                         *q++=ScaleQuantumToChar(GetPixelBlack(image,p));
                       }
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                   y,image->rows);
@@ -967,7 +967,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                         Ascii85Encode(image,ScaleQuantumToChar(
                           GetPixelBlack(image,p)));
                       }
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                   y,image->rows);
@@ -1032,7 +1032,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   *q++=(unsigned char) GetPixelIndex(image,p);
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                   y,image->rows);
@@ -1067,7 +1067,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
                   Ascii85Encode(image,(unsigned char) GetPixelIndex(image,p));
-                  p+=GetPixelChannels(image);
+                  p+=GetPixelComponents(image);
                 }
                 progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
                   y,image->rows);
index dac057642ec810bb0ecc45f235beb2ffa5408cc4..09fd6033a878c1eb546f4fb20e6a325bda31d41c 100644 (file)
@@ -272,7 +272,7 @@ static MagickBooleanType SerializeImage(const ImageInfo *image_info,
         *q++=ScaleQuantumToChar(GetPixelRed(image,p));
         *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
         *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     else
       for (x=0; x < (ssize_t) image->columns; x++)
@@ -281,7 +281,7 @@ static MagickBooleanType SerializeImage(const ImageInfo *image_info,
         *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
         *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
         *q++=ScaleQuantumToChar(GetPixelBlack(image,p));
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     if (image->previous == (Image *) NULL)
       {
@@ -343,7 +343,7 @@ static MagickBooleanType SerializeImageChannel(const ImageInfo *image_info,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     else
       {
@@ -360,7 +360,7 @@ static MagickBooleanType SerializeImageChannel(const ImageInfo *image_info,
               *q++=code;
               code='\0';
             }
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
     status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -409,7 +409,7 @@ static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       *q++=(unsigned char) GetPixelIndex(image,p);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (image->previous == (Image *) NULL)
       {
index 6b3e793ff3e353f893a7653aef17307ff4886893..e5fa83dbbd62b96cd812f3454814f0fa59d1efad 100644 (file)
@@ -669,7 +669,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
                       (0x01 << (7-bit))) != 0 ? 0 : 255,q);
                     SetPixelPacket(image,image->colormap+(ssize_t)
                       GetPixelIndex(image,q),q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                     x++;
                   }
                   q--;
@@ -712,7 +712,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
         default:
           break;
       }
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -1317,7 +1317,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     SetPixelAlpha(layer_info[i].image,(Quantum)
                       (QuantumScale*(GetPixelAlpha(layer_info[i].image,q))*
                       layer_info[i].opacity),q);
-                    q+=GetPixelChannels(layer_info[i].image);
+                    q+=GetPixelComponents(layer_info[i].image);
                   }
                   if (SyncAuthenticPixels(layer_info[i].image,exception) == MagickFalse)
                     break;
index 5fd602bf0d98467ac361d68d98afaed029bbb0af..30cb2580a0c3a77f9d3b103c19cc39bef2b68b10 100644 (file)
@@ -225,8 +225,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,
             SetPixelRed(image,GetPixelRed(canvas_image,p),q);
             SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
             SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-            p+=GetPixelChannels(canvas_image);
-            q+=GetPixelChannels(image);
+            p+=GetPixelComponents(canvas_image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
index 8f9e990867ca13f1619c9ca3bae76530d597da84..14bf48501404b61ab855d196e3bacf89be9dc78f 100644 (file)
@@ -258,8 +258,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 SetPixelAlpha(image,OpaqueAlpha,q);
                 if (image->matte != MagickFalse)
                   SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -366,8 +366,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                     default:
                       break;
                   }
-                  p+=GetPixelChannels(canvas_image);
-                  q+=GetPixelChannels(image);
+                  p+=GetPixelComponents(canvas_image);
+                  q+=GetPixelComponents(image);
                 }
                 if (SyncAuthenticPixels(image,exception) == MagickFalse)
                   break;
@@ -432,8 +432,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -485,8 +485,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               {
                 SetPixelGreen(image,
                   GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -538,8 +538,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               {
                 SetPixelBlue(image,
                   GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -600,8 +600,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                   {
                     SetPixelAlpha(image,
                       GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
@@ -687,8 +687,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -759,8 +759,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               {
                 SetPixelGreen(image,
                   GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -831,8 +831,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               {
                 SetPixelBlue(image,
                   GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -905,8 +905,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                   {
                     SetPixelAlpha(image,
                       GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
index c2fecd991f9e39a3ca3fd7e5e7f1180212ae4a55..0b3b074b0bd5e7aa79716b3080476ad1941e5a3c 100644 (file)
@@ -447,7 +447,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
             if (image->matte != MagickFalse)
               SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -503,7 +503,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelIndex(image,*p++,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -533,7 +533,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 SetPixelGreen(image,image->colormap[*p++].green,q);
                 SetPixelBlue(image,image->colormap[*p++].blue,q);
                 SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
index ad2f66e6b2a62c074674e73669739d526b0f6a29..bc12048d55762ab6a62ffef6da8f75fec9a9bd11 100644 (file)
@@ -262,7 +262,7 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           }
         }
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
index c72b4889075ee28fc4203b66b1b6deb745631b4c..327c23c10b0a62fdaa76458809623f407cf292eb 100644 (file)
@@ -562,7 +562,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   SetPixelAlpha(image,ScaleShortToQuantum((unsigned short)
                     ((*(p+6) << 8) | (*(p+7)))),q);
                 p+=8;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -591,7 +591,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
               if (image->matte != MagickFalse)
                 SetPixelAlpha(image,ScaleCharToQuantum(*(p+3)),q);
               p+=4;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -628,7 +628,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 quantum|=(*(p+1));
                 SetPixelIndex(image,quantum,q);
                 p+=8;
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -652,7 +652,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               SetPixelIndex(image,*p,q);
               p+=4;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -986,7 +986,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image)
           *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
           *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
           *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       else
         for (x=0; x < (ssize_t) image->columns; x++)
@@ -1000,7 +1000,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image)
           *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
           *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
           *q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       if (image->previous == (Image *) NULL)
         {
index b02037973798f445efe26944fd6cc123cb6dbf21..8ca8a4f5b847e9bf6d0c7fbdba70e8efcbce4f26 100644 (file)
@@ -448,7 +448,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (bit=7; bit >= 0; bit--)
           {
             SetPixelIndex(image,((*p) & (0x01 << bit) ? 0x00 : 0x01),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           p++;
         }
@@ -457,7 +457,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (bit=7; bit >= (ssize_t) (8-(image->columns % 8)); bit--)
             {
               SetPixelIndex(image,(*p) & (0x01 << bit) ? 0x00 : 0x01,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             p++;
           }
@@ -489,7 +489,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               SetPixelIndex(image,*p++,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if ((image->columns % 2) != 0)
               p++;
@@ -548,7 +548,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   SetPixelBlue(image,image->colormap[(ssize_t)
                     GetPixelBlue(image,q)].blue,q);
                 }
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (((bytes_per_pixel*image->columns) % 2) != 0)
               p++;
@@ -858,7 +858,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
             *q++=ScaleQuantumToChar(GetPixelRed(image,p));
             *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
             *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
           }
           if (((bytes_per_pixel*image->columns) & 0x01) != 0)
             *q++='\0';  /* pad scanline */
@@ -903,7 +903,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
                   bit=0;
                   byte=0;
                 }
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             if (bit != 0)
               (void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
@@ -945,7 +945,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
             {
               (void) WriteBlobByte(image,(unsigned char)
                 GetPixelIndex(image,p));
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             if (image->columns & 0x01)
               (void) WriteBlobByte(image,0);  /* pad scanline */
index 8a60045968f2f6e96c58f8c9c07415462b8b70ce..984ebc407d5e09c5a2678a1a6b35b915a878b712 100644 (file)
@@ -2938,7 +2938,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
 #endif
               CompositePixelOver(image,&fill_color,fill_color.alpha,q,
                 (MagickRealType) GetPixelAlpha(image,q),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -3351,7 +3351,7 @@ static MagickBooleanType TraceSVGImage(Image *image)
             trace->bitmap[i++]=GetPixelGreen(image,p);
             trace->bitmap[i++]=GetPixelBlue(image,p);
           }
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     }
     splines=at_splines_new_full(trace,fitting_options,NULL,NULL,NULL,NULL,NULL,
@@ -3400,7 +3400,7 @@ static MagickBooleanType TraceSVGImage(Image *image)
           "  <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",
           (double) x,(double) y,tuple);
         (void) WriteBlobString(image,message);
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     }
     (void) WriteBlobString(image,"</svg>\n");
index 90ce761e09b78075cfe0e7bc29de5d3224521cad..a6e659254da71ebcb7e7c45f3966f4111807a51e 100644 (file)
@@ -446,7 +446,7 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception)
       SetPixelBlue(image,pixel.blue,q);
       if (image->matte != MagickFalse)
         SetPixelAlpha(image,pixel.alpha,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (((unsigned char) (tga_info.attributes & 0xc0) >> 6) == 4)
       offset+=4;
@@ -791,7 +791,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image)
             if (image->matte != MagickFalse)
               *q++=(unsigned char) ScaleQuantumToChar(GetPixelAlpha(image,p));
           }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     (void) WriteBlob(image,(size_t) (q-targa_pixels),targa_pixels);
     if (image->previous == (Image *) NULL)
index ea73e3bebca38b43f613bbd005c42607753b5cf4..d48b0c2eaf1aabe5113cfff9e82cc2688c30bd8d 100644 (file)
@@ -1414,7 +1414,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
               SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
                 (TIFFGetA(*p))),q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -1506,7 +1506,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                   SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
                     TIFFGetA(*p)),q);
                   p++;
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               else
                 for (column=columns_remaining; column > 0; column--)
@@ -1518,10 +1518,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                   SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
                     TIFFGetB(*p)),q);
                   p++;
-                  q+=GetPixelChannels(image);
+                  q+=GetPixelComponents(image);
                 }
               p+=columns-columns_remaining;
-              q-=GetPixelChannels(image)*(image->columns+columns_remaining);
+              q-=GetPixelComponents(image)*(image->columns+columns_remaining);
             }
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1580,7 +1580,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (const Quantum *) NULL)
             break;
-          q+=GetPixelChannels(image)*(image->columns-1);
+          q+=GetPixelComponents(image)*(image->columns-1);
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             SetPixelRed(image,ScaleCharToQuantum((unsigned char)
@@ -1593,7 +1593,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
               SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
                 TIFFGetA(*p)),q);
             p--;
-            q-=GetPixelChannels(image);;
+            q-=GetPixelComponents(image);;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
index d68a94704678a56b91f8d57a6aa4c1757da1d9a7..3c02c02b2caf69f88981b36277d88ad2d7ee2fb4 100644 (file)
@@ -262,16 +262,16 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           {
             SetPixelIndex(image,(*p) & 0x0f,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             SetPixelIndex(image,(*p >> 4) & 0x0f,q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if ((image->columns % 2) != 0)
             {
               SetPixelIndex(image,(*p >> 4) & 0x0f,q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -299,7 +299,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             SetPixelIndex(image,*p++,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -334,7 +334,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               (1UL*word >> 5) & 0x1f)),q);
             SetPixelRed(image,ScaleCharToQuantum(ScaleColor5to8(
               (1UL*word >> 0) & 0x1f)),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -364,7 +364,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelRed(image,ScaleCharToQuantum(*p++),q);
             SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
             SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
index c054e2db588014dde369b8b59dadc2e3f00ec090..c2d705e153cdfe9f624ebf481b3b929068ecec4f 100644 (file)
@@ -238,7 +238,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelPacket(image,&background_color,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index 907fc26972ca0e9ec1b2605fe31e1a3779780477..bc2859a314027764e1e80cdfe0b41ac79f0fa854 100644 (file)
@@ -697,7 +697,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
           &image->exception);
         (void) WriteBlobString(image,tuple);
         (void) WriteBlobString(image,"\n");
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
       status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
         image->rows);
index da10b53f15d0accf88aa75b81be01f0c93f49a7e..4e48f6e82e43fc0a159f8899f1afc7fe86faad27 100644 (file)
@@ -251,7 +251,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
               if (matte_image[i] != 0)
                 transparent=MagickTrue;
               i++;
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
           }
         }
@@ -273,7 +273,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
               if (matte_image[i] != 0)
                 SetPixelIndex(image,image->colors,q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
           }
         }
@@ -360,7 +360,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
       symbol[j]='\0';
       (void) CopyMagickString(buffer,symbol,MaxTextExtent);
       (void) WriteBlobString(image,buffer);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
       (y == (ssize_t) (image->rows-1) ? ");" : ","));
index e74297bad17257ba2231e97294598b3b27058eda..d0b799c0cea82f173853a735bdb897d4a89abcbd 100644 (file)
@@ -162,11 +162,11 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
       SetPixelRed(image,ScaleCharToQuantum(y1),q);
       SetPixelGreen(image,ScaleCharToQuantum(u),q);
       SetPixelBlue(image,ScaleCharToQuantum(v),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
       SetPixelRed(image,ScaleCharToQuantum(y2),q);
       SetPixelGreen(image,ScaleCharToQuantum(u),q);
       SetPixelBlue(image,ScaleCharToQuantum(v),q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -351,7 +351,7 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
       pixel.green=(double) GetPixelGreen(uyvy_image,p);
       pixel.blue=(double) GetPixelBlue(uyvy_image,p);
       full=full == MagickFalse ? MagickTrue : MagickFalse;
-      p+=GetPixelChannels(uyvy_image);
+      p+=GetPixelComponents(uyvy_image);
     }
     status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
       image->rows);
index a4fae9d2b4da26dadccd2481560c726980dca6ae..74639416035077d8798f4423f7ec68c6c7bcb053 100644 (file)
@@ -632,7 +632,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
                   quantum|=0x01;
                   SetPixelIndex(image,quantum,q);
                 }
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             p++;
           }
@@ -644,7 +644,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
                     quantum=(size_t) GetPixelIndex(image,q);
                     quantum|=0x01;
                     SetPixelIndex(image,quantum,q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
               p++;
             }
@@ -669,7 +669,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
           for (x=0; x < (ssize_t) image->columns; x++)
           {
             SetPixelIndex(image,*p++,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -709,7 +709,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
               SetPixelAlpha(image,image->matte != MagickFalse ?
                 ScaleCharToQuantum(*(p+number_pixels*3)) : OpaqueAlpha,q);
               p++;
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -1104,7 +1104,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
             if (image->matte != MagickFalse)
               *(q+number_pixels*3)=ScaleQuantumToChar((Quantum)
                 (GetPixelAlpha(image,p)));
-            p+=GetPixelChannels(image);
+            p+=GetPixelComponents(image);
             q++;
           }
           if (image->previous == (Image *) NULL)
@@ -1150,7 +1150,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               *q++=(unsigned char) GetPixelIndex(image,p);
-              p+=GetPixelChannels(image);
+              p+=GetPixelComponents(image);
             }
             if (image->previous == (Image *) NULL)
               {
@@ -1196,7 +1196,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
                     bit=0;
                     byte=0;
                   }
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (bit != 0)
                 *q++=byte >> (8-bit);
@@ -1223,7 +1223,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 *q++=(unsigned char) GetPixelIntensity(image,p);
-                p+=GetPixelChannels(image);
+                p+=GetPixelComponents(image);
               }
               if (image->previous == (Image *) NULL)
                 {
index 5330f5f2df3052f597465fb0da1f3bf5972a92ce..4464c19cecd71620e3b94ce4fc1f83704bceaaa2 100644 (file)
@@ -203,7 +203,7 @@ static Image *ReadWBMPImage(const ImageInfo *image_info,
       bit++;
       if (bit == 8)
         bit=0;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -401,7 +401,7 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info,
           bit=0;
           byte=0;
         }
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     if (bit != 0)
       (void) WriteBlobByte(image,byte);
index 57b07a2c43b478857e478722f9bf0018259cd9b0..dc4d595230c2cb7235ba40e873ddedd7098fce2d 100644 (file)
@@ -177,7 +177,7 @@ static Image *ReadWEBPImage(const ImageInfo *image_info,
       SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
       if (GetPixelAlpha(image,q) != OpaqueAlpha)
         image->matte=MagickTrue;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -378,7 +378,7 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
       if (image->matte != MagickFalse)
         *q++=ScaleQuantumToChar((Quantum) (image->matte != MagickFalse ?
           GetPixelAlpha(image,p) : OpaqueAlpha));
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
       image->rows);
index 48587e0fe622d4cb1b30550b3a8b1a1a49aac5ea..02c83da525b5d22c88d1f929496cf574d8971fdc 100644 (file)
@@ -295,7 +295,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           p++;
         }
@@ -306,7 +306,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
               index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
               SetPixelIndex(image,index,q);
               SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             p++;
           }
@@ -324,41 +324,41 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             index=ConstrainColormapIndex(image,(*p) & 0x3);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
         }
        if ((image->columns % 4) != 0)
           {
             index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             if ((image->columns % 4) >= 1)
 
               {
                 index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
                 SetPixelIndex(image,index,q);
                 SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-                q+=GetPixelChannels(image);
+                q+=GetPixelComponents(image);
                 if ((image->columns % 4) >= 2)
 
                   {
                     index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
                     SetPixelIndex(image,index,q);
                     SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-                    q+=GetPixelChannels(image);
+                    q+=GetPixelComponents(image);
                   }
               }
             p++;
@@ -378,12 +378,12 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             index=ConstrainColormapIndex(image,(*p) & 0x0f);
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         if ((image->columns % 2) != 0)
           {
@@ -391,7 +391,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -408,7 +408,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
             p++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -424,7 +424,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
           SetPixelRed(image,ScaleCharToQuantum(*p++),q);
           SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
           SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
-          q+=GetPixelChannels(image);
+          q+=GetPixelComponents(image);
         }
       if (!SyncAuthenticPixels(image,exception))
         break;
index 8e0c5fe93cc8a74c5a8f6af53643c1b2babf6ae4..93a939f11a4677d8601702988514fae176466265 100644 (file)
@@ -366,7 +366,7 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
       byte>>=1;
       if (bit == 8)
         bit=0;
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -562,7 +562,7 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image)
           bit=0;
           byte=0;
         }
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     if (bit != 0)
       {
index 82a6483d01b8fd5625c935048b10dba89fcaac90..15ca73dffdf574ff04e42c23b7a2c2f6e1adbe78 100644 (file)
@@ -147,7 +147,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
       SetPixelPacket(image,&pixel,q);
       if (image->colorspace == CMYKColorspace)
         SetPixelBlack(image,pixel.black,q);
-      q+=GetPixelChannels(image);
+      q+=GetPixelComponents(image);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
index 26bc193f0ca0081758d201475f7c22169ed97cf7..562bb077bc09be61deb2ed8889c9e265716ffa3b 100644 (file)
@@ -381,7 +381,7 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image,
           SetPixelAlpha(tile_image,ScaleCharToQuantum((unsigned char)
             inLayerInfo->alpha),q);
           graydata++;
-          q+=GetPixelChannels(tile_image);
+          q+=GetPixelComponents(tile_image);
         }
       }
     else
@@ -395,7 +395,7 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image,
             SetPixelAlpha(tile_image,xcfdata->alpha == 0U ? OpaqueAlpha :
               ScaleCharToQuantum((unsigned char) inLayerInfo->alpha),q);
             xcfdata++;
-            q+=GetPixelChannels(tile_image);
+            q+=GetPixelComponents(tile_image);
           }
         }
      if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
@@ -509,7 +509,7 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image,
                   break;
                 }
               }
-              q+=GetPixelChannels(tile_image);
+              q+=GetPixelComponents(tile_image);
             }
           }
         else
@@ -569,7 +569,7 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image,
                   break;
                 }
               }
-              q+=GetPixelChannels(tile_image);
+              q+=GetPixelComponents(tile_image);
             }
           }
       }
index d13703ce577a7734946f04bcf4b883748ed7395b..a4011b1f5ccfeead459e5ead98b224594abd20ca 100644 (file)
@@ -407,7 +407,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             SetPixelIndex(image,j,r);
           SetPixelPacket(image,image->colormap+j,r);
           p+=width;
-          r+=GetPixelChannels(image);
+          r+=GetPixelComponents(image);
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
@@ -683,7 +683,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
                 transparent=MagickTrue;
               else
                 SetPixelAlpha(picon,OpaqueAlpha,q);
-              q+=GetPixelChannels(picon);
+              q+=GetPixelComponents(picon);
             }
             if (SyncAuthenticPixels(picon,exception) == MagickFalse)
               break;
@@ -708,7 +708,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
         {
           if (GetPixelAlpha(image,q) == (Quantum) TransparentAlpha)
             SetPixelIndex(picon,picon->colors,q);
-          q+=GetPixelChannels(picon);
+          q+=GetPixelComponents(picon);
         }
         if (SyncAuthenticPixels(picon,exception) == MagickFalse)
           break;
@@ -787,7 +787,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
       symbol[j]='\0';
       (void) CopyMagickString(buffer,symbol,MaxTextExtent);
       (void) WriteBlobString(image,buffer);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
       y == (ssize_t) (picon->rows-1) ? "" : ",");
@@ -1015,7 +1015,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image)
       symbol[j]='\0';
       (void) CopyMagickString(buffer,symbol,MaxTextExtent);
       (void) WriteBlobString(image,buffer);
-      p+=GetPixelChannels(image);
+      p+=GetPixelComponents(image);
     }
     (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
       (y == (ssize_t) (image->rows-1) ? "" : ","));
index 3223e46df199c88de630c857ef10e6183d6a772f..48776be5d1cf6faf1d4a5a056cafb028c974f8ef 100644 (file)
@@ -412,7 +412,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
               index=(Quantum) ((pixel >> blue_shift) & blue_mask);
               SetPixelBlue(image,ScaleShortToQuantum(
                 colors[(ssize_t) index].blue),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -442,7 +442,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
               color=(color*65535UL)/blue_mask;
               SetPixelBlue(image,ScaleShortToQuantum((unsigned short)
                 color),q);
-              q+=GetPixelChannels(image);
+              q+=GetPixelComponents(image);
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
@@ -477,7 +477,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
               (int) y));
             SetPixelIndex(image,index,q);
             SetPixelPacket(image,image->colormap+(ssize_t) index,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
@@ -765,7 +765,7 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           *q++=(unsigned char) GetPixelIndex(image,p);
-          p+=GetPixelChannels(image);
+          p+=GetPixelComponents(image);
         }
       }
     else
@@ -774,7 +774,7 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image)
         *q++=ScaleQuantumToChar(GetPixelRed(image,p));
         *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
         *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     for (x=0; x < (ssize_t) scanline_pad; x++)
       *q++='\0';
index 305291da2336338e672e30843aaed1f4a15dd698..f156d371ca06b8898c2b991c63c9be9d85bcb717 100644 (file)
@@ -249,8 +249,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
                 if (image->matte != MagickFalse)
                   SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -341,8 +341,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                     default:
                       break;
                   }
-                  p+=GetPixelChannels(canvas_image);
-                  q+=GetPixelChannels(image);
+                  p+=GetPixelComponents(canvas_image);
+                  q+=GetPixelComponents(image);
                 }
                 if (SyncAuthenticPixels(image,exception) == MagickFalse)
                   break;
@@ -398,8 +398,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -441,8 +441,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -484,8 +484,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -530,8 +530,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
@@ -608,8 +608,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelRed(image,GetPixelRed(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -670,8 +670,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -732,8 +732,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
-                p+=GetPixelChannels(canvas_image);
-                q+=GetPixelChannels(image);
+                p+=GetPixelComponents(canvas_image);
+                q+=GetPixelComponents(image);
               }
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
@@ -797,8 +797,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
                     SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
-                    p+=GetPixelChannels(canvas_image);
-                    q+=GetPixelChannels(image);
+                    p+=GetPixelComponents(canvas_image);
+                    q+=GetPixelComponents(image);
                   }
                   if (SyncAuthenticPixels(image,exception) == MagickFalse)
                     break;
index 5776b9434cc1c872e0b64dbaf5320574e7f35248..c9177dcfa3e8f77bb2e2b4429f17d42972f16920 100644 (file)
@@ -257,7 +257,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
               }
             SetPixelGreen(image,0,q);
             SetPixelBlue(image,0,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
             SetPixelGreen(image,0,q);
             SetPixelBlue(image,0,q);
             if (quantum == 1)
@@ -276,7 +276,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 p+=2;
               }
             chroma_pixels++;
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         }
       else
@@ -298,7 +298,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
               }
             SetPixelGreen(image,0,q);
             SetPixelBlue(image,0,q);
-            q+=GetPixelChannels(image);
+            q+=GetPixelComponents(image);
           }
         }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -347,7 +347,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 p+=2;
               }
             SetPixelBlue(chroma_image,0,q);
-            q+=GetPixelChannels(chroma_image);
+            q+=GetPixelComponents(chroma_image);
           }
           if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
             break;
@@ -381,7 +381,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 *(p+1)),q);
               p+=2;
             }
-          q+=GetPixelChannels(chroma_image);
+          q+=GetPixelComponents(chroma_image);
         }
         if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
           break;
@@ -408,7 +408,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         SetPixelGreen(image,GetPixelGreen(image,chroma_pixels),q);
         SetPixelBlue(image,GetPixelBlue(image,chroma_pixels),q);
         chroma_pixels++;
-        q+=GetPixelChannels(image);
+        q+=GetPixelComponents(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)
         break;
@@ -673,7 +673,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
                   GetPixelGreen(yuv_image,s)));
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
                   GetPixelRed(yuv_image,p)));
-                p+=GetPixelChannels(yuv_image);
+                p+=GetPixelComponents(yuv_image);
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
                   GetPixelBlue(yuv_image,s)));
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
@@ -685,13 +685,13 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
                   GetPixelGreen(yuv_image,s)));
                 (void) WriteBlobShort(image,ScaleQuantumToShort(
                   GetPixelRed(yuv_image,p)));
-                p+=GetPixelChannels(yuv_image);
+                p+=GetPixelComponents(yuv_image);
                 (void) WriteBlobByte(image,ScaleQuantumToChar(
                   GetPixelBlue(yuv_image,s)));
                 (void) WriteBlobShort(image,ScaleQuantumToShort(
                   GetPixelRed(yuv_image,p)));
               }
-            p+=GetPixelChannels(yuv_image);
+            p+=GetPixelComponents(yuv_image);
             s++;
             x++;
           }
@@ -724,7 +724,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
             else
               (void) WriteBlobShort(image,ScaleQuantumToShort(
                 GetPixelRed(yuv_image,p)));
-            p+=GetPixelChannels(yuv_image);
+            p+=GetPixelComponents(yuv_image);
           }
           if (image->previous == (Image *) NULL)
             {
@@ -767,7 +767,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
             else
               (void) WriteBlobShort(image,ScaleQuantumToShort(
                 GetPixelGreen(chroma_image,p)));
-            p+=GetPixelChannels(chroma_image);
+            p+=GetPixelComponents(chroma_image);
           }
         }
         if (image->previous == (Image *) NULL)
@@ -802,7 +802,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
             else
               (void) WriteBlobShort(image,ScaleQuantumToShort(
                 GetPixelBlue(chroma_image,p)));
-            p+=GetPixelChannels(chroma_image);
+            p+=GetPixelComponents(chroma_image);
           }
         }
         if (image->previous == (Image *) NULL)
index 4ff40f32e1619fbe4326798a25e5e9eda7ab95ca..445eac4a5a2df1b107de9a5c047cef348d01d55e 100644 (file)
@@ -178,7 +178,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         saturation_sum_x3+=saturation*saturation*saturation;
         saturation_sum_x4+=saturation*saturation*saturation*saturation;
         area++;
-        p+=GetPixelChannels(image);
+        p+=GetPixelComponents(image);
       }
     }
     image_view=DestroyCacheView(image_view);