commit 191802073ec58d0b80cc5216ed8cf87d09ae25fd
author glennrp <glennrp@git.imagemagick.org> Fri Apr 29 14:05:58 2011 +0000
committer glennrp <glennrp@git.imagemagick.org> Fri Apr 29 14:05:58 2011 +0000
tree b3c75f82984bc0986f0cf533d4a3c0fc23932648
parent fc729b3c315c220e576b86979b5566d4dc900e40

Added some needed parentheses in the PNG8 encoder.

coders/png.c

diff --git a/coders/png.c b/coders/png.c
index 63d9c99..2f1b32f 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -7822,14 +7822,16 @@
               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 @@
               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 @@
               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++;
             }