(no commit message)

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 5efc446950d7341ed3fddf561c543d1dc30b91da..f04822370f42189b0b7fd35a496e129a3de022ff 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -62,17 +62,35 @@ static inline Quantum GetPixelCb(const Image *image,const Quantum *pixel)
   return(pixel[image->component_map[image->map][CbPixelComponent].component]);
 }
 
+static inline Quantum GetPixelComponent(const Image *image,
+  const PixelComponent component,const Quantum *pixel)
+{
+  return(pixel[image->component_map[image->map][component].component]);
+}
+
+static inline PixelTrait GetPixelComponentTraits(const Image *image,
+  const PixelComponent component)
+{
+  return(image->component_map[image->map][component].traits);
+}
+
 static inline PixelTrait GetPixelCbTraits(const Image *image)
 {
   return(image->component_map[image->map][CbPixelComponent].traits);
 }
 
-static inline Quantum GetPixelComponent(const Image *image,
+static inline Quantum GetPixelComponentMapComponent(const Image *image,
   const PixelComponent component)
 {
   return(image->component_map[image->map][component].component);
 }
 
+static inline PixelTrait GetPixelComponentMapTraits(const Image *image,
+  const PixelComponent component)
+{
+  return(image->component_map[image->map][component].traits);
+}
+
 static inline size_t GetPixelComponents(const Image *image)
 {
   return(image->pixel_components);
@@ -454,6 +472,12 @@ static inline void SetPixelCbTraits(Image *image,const PixelTrait traits)
 }
 
 static inline void SetPixelComponent(const Image *image,
+  const PixelComponent component,const Quantum quantum,Quantum *pixel)
+{
+  pixel[image->component_map[image->map][component].component]=quantum;
+}
+
+static inline void SetPixelComponentMapComponent(const Image *image,
   const PixelComponent component,const PixelComponent components)
 {
   image->component_map[image->map][component].component=components;
@@ -470,6 +494,12 @@ static inline void SetPixelComponentTraits(Image *image,
   image->component_map[image->map][component].traits=traits;
 }
 
+static inline void SetPixelComponentMapTraits(Image *image,
+  const PixelComponent component,const PixelTrait traits)
+{
+  image->component_map[image->map][component].traits=traits;
+}
+
 static inline void SetPixelCr(const Image *image,const Quantum cr,
   Quantum *pixel)
 {
@@ -562,7 +592,8 @@ static inline void SetPixelInfoPacket(const Image *image,
 static inline void SetPixelMagenta(const Image *image,const Quantum magenta,
   Quantum *pixel)
 {
-  pixel[image->component_map[image->map][MagentaPixelComponent].component]=magenta;
+  pixel[image->component_map[image->map][MagentaPixelComponent].component]=
+    magenta;
 }
 
 static inline void SetPixelMagentaTraits(Image *image,const PixelTrait traits)
@@ -609,7 +640,8 @@ static inline void SetPixelPixelInfo(const Image *image,
 static inline void SetPixelYellow(const Image *image,const Quantum yellow,
   Quantum *pixel)
 {
-  pixel[image->component_map[image->map][YellowPixelComponent].component]=yellow;
+  pixel[image->component_map[image->map][YellowPixelComponent].component]=
+    yellow;
 }
 
 static inline void SetPixelYellowTraits(Image *image,const PixelTrait traits)
@@ -617,8 +649,7 @@ static inline void SetPixelYellowTraits(Image *image,const PixelTrait traits)
   image->component_map[image->map][YellowPixelComponent].traits=traits;
 }
 
-static inline void SetPixelY(const Image *image,const Quantum y,
-  Quantum *pixel)
+static inline void SetPixelY(const Image *image,const Quantum y,Quantum *pixel)
 {
   pixel[image->component_map[image->map][YPixelComponent].component]=y;
 }

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 49c2f35691e169b3ab46ebc38d02b0d5428f7102..881ca1a4b4a41fe4f20a822464397e7fced096e5 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4539,7 +4539,7 @@ MagickExport void SetPixelComponentMap(Image *image,
     i;
 
   for (i=0; i < MaxPixelComponents; i++)
-    SetPixelComponentTraits(image,(PixelComponent) i,UndefinedPixelTrait);
+    SetPixelComponentMapTraits(image,(PixelComponent) i,UndefinedPixelTrait);
   image->sync=(channel_mask & SyncChannels) != 0 ? MagickTrue : MagickFalse;
   if ((channel_mask & RedChannel) != 0)
     SetPixelRedTraits(image,ActivePixelTrait);
@@ -4578,28 +4578,28 @@ MagickExport void SetPixelComponentMap(Image *image,
 MagickExport void StandardPixelComponentMap(Image *image)
 {
   image->pixel_components=4;
-  SetPixelComponent(image,RedPixelComponent,RedPixelComponent);
-  SetPixelComponentTraits(image,RedPixelComponent,ActivePixelTrait |
+  SetPixelComponentMapComponent(image,RedPixelComponent,RedPixelComponent);
+  SetPixelComponentMapTraits(image,RedPixelComponent,ActivePixelTrait |
     BlendPixelTrait);
-  SetPixelComponent(image,GreenPixelComponent,GreenPixelComponent);
-  SetPixelComponentTraits(image,GreenPixelComponent,ActivePixelTrait |
+  SetPixelComponentMapComponent(image,GreenPixelComponent,GreenPixelComponent);
+  SetPixelComponentMapTraits(image,GreenPixelComponent,ActivePixelTrait |
     BlendPixelTrait);
-  SetPixelComponent(image,BluePixelComponent,BluePixelComponent);
-  SetPixelComponentTraits(image,BluePixelComponent,ActivePixelTrait |
+  SetPixelComponentMapComponent(image,BluePixelComponent,BluePixelComponent);
+  SetPixelComponentMapTraits(image,BluePixelComponent,ActivePixelTrait |
     BlendPixelTrait);
-  SetPixelComponent(image,AlphaPixelComponent,AlphaPixelComponent);
-  SetPixelComponentTraits(image,AlphaPixelComponent,ActivePixelTrait);
+  SetPixelComponentMapComponent(image,AlphaPixelComponent,AlphaPixelComponent);
+  SetPixelComponentMapTraits(image,AlphaPixelComponent,ActivePixelTrait);
   if (image->colorspace == CMYKColorspace)
     {
       image->pixel_components++;
-      SetPixelComponent(image,BlackPixelComponent,BlackPixelComponent);
-      SetPixelComponentTraits(image,BlackPixelComponent,ActivePixelTrait |
+      SetPixelComponentMapComponent(image,BlackPixelComponent,BlackPixelComponent);
+      SetPixelComponentMapTraits(image,BlackPixelComponent,ActivePixelTrait |
         BlendPixelTrait);
     }
   if (image->storage_class == PseudoClass)
     {
       image->pixel_components++;
-      SetPixelComponent(image,IndexPixelComponent,IndexPixelComponent);
-      SetPixelComponentTraits(image,IndexPixelComponent,UndefinedPixelTrait);
+      SetPixelComponentMapComponent(image,IndexPixelComponent,IndexPixelComponent);
+      SetPixelComponentMapTraits(image,IndexPixelComponent,UndefinedPixelTrait);
     }
 }