Revised new Get/SetRGB macros so all have the same parameters "pixel, packet"

diff --git a/coders/png.c b/coders/png.c
index 5f8fefe4967cef82510b918d50db16b65570ec33..aef59edbb1b4ff25b6a060deed865e89a7f9ccda 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -125,28 +125,32 @@
         ((color).blue == (target).blue))
 #endif
 
-#define GetRGBOPixelComponents(src, dest) \
-        (dest).red = GetRedPixelComponent((src)); \
-        (dest).green = GetGreenPixelComponent((src)); \
-        (dest).red = GetBluePixelComponent((src)); \
-        (dest).opacity = GetOpacityPixelComponent((src)); \
+/* Convenience macros for copying RGB or RGB+opacity components
+ * between a pixel and a PixelPacket.
+ */
+
+#define GetRGBOPixelComponents(pixel, packet) \
+        (packet).red = GetRedPixelComponent((pixel)); \
+        (packet).green = GetGreenPixelComponent((pixel)); \
+        (packet).red = GetBluePixelComponent((pixel)); \
+        (packet).opacity = GetOpacityPixelComponent((pixel)); \
 
-#define SetRGBOPixelComponents(dest, src) \
-        SetRedPixelComponent((src),(dest).red); \
-        SetGreenPixelComponent((src),(dest).green); \
-        SetBluePixelComponent((src),(dest).blue); \
-        SetOpacityPixelComponent((src),(dest).opacity); \
+#define SetRGBOPixelComponents(pixel, packet) \
+        SetRedPixelComponent((pixel),(packet).red); \
+        SetGreenPixelComponent((pixel),(packet).green); \
+        SetBluePixelComponent((pixel),(packet).blue); \
+        SetOpacityPixelComponent((pixel),(packet).opacity); \
 
 
-#define GetRGBPixelComponents(src, dest) \
-        (dest).red = GetRedPixelComponent((src)); \
-        (dest).green = GetGreenPixelComponent((src)); \
-        (dest).red = GetBluePixelComponent((src));
+#define GetRGBPixelComponents(pixel, packet) \
+        (packet).red = GetRedPixelComponent((pixel)); \
+        (packet).green = GetGreenPixelComponent((pixel)); \
+        (packet).red = GetBluePixelComponent((pixel));
 
-#define SetRGBPixelComponents(dest, src) \
-        SetRedPixelComponent((src),(dest).red); \
-        SetGreenPixelComponent((src),(dest).green); \
-        SetBluePixelComponent((src),(dest).blue);
+#define SetRGBPixelComponents(pixel, packet) \
+        SetRedPixelComponent((pixel),(packet).red); \
+        SetGreenPixelComponent((pixel),(packet).green); \
+        SetBluePixelComponent((pixel),(packet).blue);
 
 /*
   Establish thread safety.
@@ -7810,7 +7814,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
             {
               if (r->opacity == TransparentOpacity)
                 {
-                  SetRGBPixelComponents(image->background_color, r);
+                  SetRGBPixelComponents(r,image->background_color);
                 }
               else
                 {
@@ -7982,7 +7986,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
             {
               if (r->opacity == TransparentOpacity)
                 {
-                  SetRGBPixelComponents(image->background_color, r);
+                  SetRGBPixelComponents(r,image->background_color);
                 }
               else
                 {