commit c5370ede959521e9a46e0e0fde53c921ff45895c
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Mar 21 11:54:32 2015 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Mar 21 11:54:32 2015 -0500
tree 1e35221cbd4ae02d1720d03af35e0057659e433b
parent 2b66107abb9452354da0980ea9d566667f1ba75f

[libpng16] Reverted "& 0xff" additions of version 1.6.17beta01. Libpng passes

the Coverity scan without them.

pngwtran.c

diff --git a/pngwtran.c b/pngwtran.c
index c822fe6..d34ad88 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -56,14 +56,14 @@
                else
                {
                   mask = 0x80;
-                  *dp = (png_byte)(v & 0xff);
+                  *dp = (png_byte)v;
                   dp++;
                   v = 0;
                }
             }
 
             if (mask != 0x80)
-               *dp = (png_byte)(v & 0xff);
+               *dp = (png_byte)v;
 
             break;
          }
@@ -90,7 +90,7 @@
                if (shift == 0)
                {
                   shift = 6;
-                  *dp = (png_byte)(v & 0xff);
+                  *dp = (png_byte)v;
                   dp++;
                   v = 0;
                }
@@ -102,7 +102,7 @@
             }
 
             if (shift != 6)
-               *dp = (png_byte)(v & 0xff);
+               *dp = (png_byte)v;
 
             break;
          }
@@ -129,7 +129,7 @@
                if (shift == 0)
                {
                   shift = 4;
-                  *dp = (png_byte)(v & 0xff);
+                  *dp = (png_byte)v;
                   dp++;
                   v = 0;
                }
@@ -141,7 +141,7 @@
             }
 
             if (shift != 4)
-               *dp = (png_byte)(v & 0xff);
+               *dp = (png_byte)v;
 
             break;
          }
@@ -150,9 +150,8 @@
             break;
       }
 
-      row_info->bit_depth = (png_byte)(bit_depth & 0xff);
-      row_info->pixel_depth =
-          (png_byte)((bit_depth * row_info->channels) & 0xff);
+      row_info->bit_depth = (png_byte)bit_depth;
+      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
       row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
           row_info->width);
    }
@@ -423,7 +422,7 @@
                *(dp++) = *(sp++);
                */
                sp+=3; dp = sp;
-               *(dp++) = (png_byte)((255 - *(sp++)) & 0xff);
+               *(dp++) = (png_byte)(255 - *(sp++));
             }
          }
 
@@ -446,8 +445,8 @@
                *(dp++) = *(sp++);
                */
                sp+=6; dp = sp;
-               *(dp++) = (png_byte)((255 - *(sp++)) & 0xff);
-               *(dp++) = (png_byte)((255 - *(sp++)) & 0xff);
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
             }
          }
 #endif /* WRITE_16BIT */
@@ -465,7 +464,7 @@
             for (i = 0, sp = dp = row; i < row_width; i++)
             {
                *(dp++) = *(sp++);
-               *(dp++) = (png_byte)((255 - *(sp++)) & 0xff);
+               *(dp++) = (png_byte)(255 - *(sp++));
             }
          }
 
@@ -484,8 +483,8 @@
                *(dp++) = *(sp++);
                */
                sp+=2; dp = sp;
-               *(dp++) = (png_byte)((255 - *(sp++)) & 0xff);
-               *(dp++) = (png_byte)((255 - *(sp++)) & 0xff);
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
             }
          }
 #endif /* WRITE_16BIT */