]> granicus.if.org Git - imagemagick/commitdiff
Added some needed parentheses in the PNG8 encoder.
authorglennrp <glennrp@git.imagemagick.org>
Fri, 29 Apr 2011 14:05:58 +0000 (14:05 +0000)
committerglennrp <glennrp@git.imagemagick.org>
Fri, 29 Apr 2011 14:05:58 +0000 (14:05 +0000)
coders/png.c

index 63d9c9967fd99662e3ae04eb862f575ba5b7a14d..2f1b32f2aad6d29ea0e7deeba6471ead3c8e6e79 100644 (file)
@@ -7822,14 +7822,16 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               else
                 {
                   SetRedPixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetRedPixelComponent(r) & 0xf0) |
-                    ScaleQuantumToChar(GetRedPixelComponent(r) & 0xf0) >> 4));
+                    (ScaleQuantumToChar(GetRedPixelComponent(r)) & 0xf0) |
+                    (ScaleQuantumToChar(GetRedPixelComponent(r)) & 0xf0) >> 4));
                   SetGreenPixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetGreenPixelComponent(r) & 0xf0) |
-                    ScaleQuantumToChar(GetGreenPixelComponent(r) & 0xf0) >> 4));
+                    (ScaleQuantumToChar(GetGreenPixelComponent(r)) & 0xf0) |
+                    (ScaleQuantumToChar(GetGreenPixelComponent(r)) & 0xf0) >>
+                    4));
                   SetBluePixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xf0) |
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xf0) >> 4));
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xf0) |
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xf0) >>
+                    4));
                 }
               r++;
             }
@@ -7908,17 +7910,21 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               else
                 {
                   SetRedPixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetRedPixelComponent(r) & 0xe0) |
-                    ScaleQuantumToChar(GetRedPixelComponent(r) & 0xe0) >> 3 |
-                    ScaleQuantumToChar(GetRedPixelComponent(r) & 0xc0) >> 6));
+                    (ScaleQuantumToChar(GetRedPixelComponent(r)) & 0xe0) |
+                    (ScaleQuantumToChar(GetRedPixelComponent(r)) & 0xe0) >> 3 |
+                    (ScaleQuantumToChar(GetRedPixelComponent(r)) & 0xc0) >>
+                    6));
                   SetGreenPixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetGreenPixelComponent(r) & 0xe0) |
-                    ScaleQuantumToChar(GetGreenPixelComponent(r) & 0xe0) >> 3 |
-                    ScaleQuantumToChar(GetGreenPixelComponent(r) & 0xc0) >> 6));
+                    (ScaleQuantumToChar(GetGreenPixelComponent(r)) & 0xe0) |
+                    (ScaleQuantumToChar(GetGreenPixelComponent(r)) & 0xe0) >>
+                    3 |
+                    (ScaleQuantumToChar(GetGreenPixelComponent(r)) & 0xc0) >>
+                    6));
                   SetBluePixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xe0) |
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xe0) >> 3 |
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xc0) >> 6));
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xe0) |
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xe0) >> 3 |
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xc0) >>
+                    6));
                 }
               r++;
             }
@@ -7992,10 +7998,11 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               else
                 {
                   SetBluePixelComponent(r,ScaleCharToQuantum(
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xc0) |
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xc0) >> 2 |
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xc0) >> 4 |
-                    ScaleQuantumToChar(GetBluePixelComponent(r) & 0xc0) >> 6));
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xc0) |
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xc0) >> 2 |
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xc0) >> 4 |
+                    (ScaleQuantumToChar(GetBluePixelComponent(r)) & 0xc0) >>
+                    6));
                 }
               r++;
             }