From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 23 Oct 2011 23:40:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6753
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=146a62b25d7466cceec79975894ce812e11f4625;p=imagemagick

---

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index d90c2990b..83c5332e9 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -68,6 +68,86 @@
 #include "MagickCore/transform.h"
 #include "MagickCore/utility.h"
 
+/*
+  Define declarations.
+*/
+#define LogPixelChannels(image) \
+{ \
+  register ssize_t \
+    i; \
+ \
+  (void) LogMagickEvent(PixelEvent,GetMagickModule(),"%s[%.20g]", \
+    image->filename,(double) image->number_channels); \
+  for (i=0; i < (ssize_t) image->number_channels; i++) \
+  { \
+    char \
+      traits[MaxTextExtent]; \
+ \
+    const char \
+      *channel; \
+ \
+    switch (image->channel_map[i].channel) \
+    { \
+      case RedPixelChannel: \
+      { \
+        channel="red"; \
+        if (image->colorspace == CMYKColorspace) \
+          channel="cyan"; \
+        if (image->colorspace == GRAYColorspace) \
+          channel="gray"; \
+        break; \
+      } \
+      case GreenPixelChannel: \
+      { \
+        channel="green"; \
+        if (image->colorspace == CMYKColorspace) \
+          channel="magenta"; \
+        break; \
+      } \
+      case BluePixelChannel: \
+      { \
+        channel="blue"; \
+        if (image->colorspace == CMYKColorspace) \
+          channel="yellow"; \
+        break; \
+      } \
+      case BlackPixelChannel: \
+      { \
+        channel="black"; \
+        if (image->storage_class == PseudoClass) \
+          channel="index"; \
+        break; \
+      } \
+      case AlphaPixelChannel: \
+      { \
+        channel="alpha"; \
+        break; \
+      } \
+      case MaskPixelChannel: \
+      { \
+        channel="mask"; \
+        break; \
+      } \
+      default: \
+      { \
+        channel="undefined"; \
+      } \
+    } \
+    *traits='\0'; \
+    if ((image->channel_map[i].traits & UpdatePixelTrait) != 0) \
+      (void) ConcatenateMagickString(traits,"update,",MaxTextExtent); \
+    if ((image->channel_map[i].traits & BlendPixelTrait) != 0) \
+      (void) ConcatenateMagickString(traits,"blend,",MaxTextExtent); \
+    if ((image->channel_map[i].traits & CopyPixelTrait) != 0) \
+      (void) ConcatenateMagickString(traits,"copy,",MaxTextExtent); \
+    if (*traits == '\0') \
+      (void) ConcatenateMagickString(traits,"undefined,",MaxTextExtent); \
+    traits[strlen(traits)-1]='\0'; \
+    (void) LogMagickEvent(PixelEvent,GetMagickModule(),"  %.20g: %s (%s)", \
+      (double) i,channel,traits); \
+  } \
+}
+
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -3560,84 +3640,6 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
 %    o image: the image.
 %
 */
-
-static void LogPixelChannels(const Image *image)
-{
-  register ssize_t
-    i;
-
-  (void) LogMagickEvent(PixelEvent,GetMagickModule(),"%s[%.20g]",
-    image->filename,(double) image->number_channels);
-  for (i=0; i < (ssize_t) image->number_channels; i++)
-  {
-    char
-      traits[MaxTextExtent];
-
-    const char
-      *channel;
-
-    switch (image->channel_map[i].channel)
-    {
-      case RedPixelChannel:
-      {
-        channel="red";
-        if (image->colorspace == CMYKColorspace)
-          channel="cyan";
-        if (image->colorspace == GRAYColorspace)
-          channel="gray";
-        break;
-      }
-      case GreenPixelChannel:
-      {
-        channel="green";
-        if (image->colorspace == CMYKColorspace)
-          channel="magenta";
-        break;
-      }
-      case BluePixelChannel:
-      {
-        channel="blue";
-        if (image->colorspace == CMYKColorspace)
-          channel="yellow";
-        break;
-      }
-      case BlackPixelChannel:
-      {
-        channel="black";
-        if (image->storage_class == PseudoClass)
-          channel="index";
-        break;
-      }
-      case AlphaPixelChannel:
-      {
-        channel="alpha";
-        break;
-      }
-      case MaskPixelChannel:
-      {
-        channel="mask";
-        break;
-      }
-      default:
-      {
-        channel="undefined";
-      }
-    }
-    *traits='\0';
-    if ((image->channel_map[i].traits & UpdatePixelTrait) != 0)
-      (void) ConcatenateMagickString(traits,"update,",MaxTextExtent);
-    if ((image->channel_map[i].traits & BlendPixelTrait) != 0)
-      (void) ConcatenateMagickString(traits,"blend,",MaxTextExtent);
-    if ((image->channel_map[i].traits & CopyPixelTrait) != 0)
-      (void) ConcatenateMagickString(traits,"copy,",MaxTextExtent);
-    if (*traits == '\0')
-      (void) ConcatenateMagickString(traits,"undefined,",MaxTextExtent);
-    traits[strlen(traits)-1]='\0';
-    (void) LogMagickEvent(PixelEvent,GetMagickModule(),"  %.20g: %s (%s)",
-      (double) i,channel,traits);
-  }
-}
-
 MagickExport void InitializePixelChannelMap(Image *image)
 {
   PixelChannel