- fix grayscale case too (missing part of CAN-2002-1363 fix)

Changed files:
    libpng-16bit-overflow.patch -> 1.2

diff --git a/libpng-16bit-overflow.patch b/libpng-16bit-overflow.patch
index ed96b20ae90f7216eb63d8b4a56cbd8a305239c5..148513eed83c354fa725c1fb50c8711b3af9ba3e 100644 (file)
--- a/libpng-16bit-overflow.patch
+++ b/libpng-16bit-overflow.patch
@@ -1,5 +1,27 @@
 --- libpng-1.2.5.orig/pngrtran.c
 +++ libpng-1.2.5/pngrtran.c
+@@ -1889,8 +1889,8 @@
+          /* This changes the data from GG to GGXX */
+          if (flags & PNG_FLAG_FILLER_AFTER)
+          {
+-            png_bytep sp = row + (png_size_t)row_width;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 2;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 1; i < row_width; i++)
+             {
+                *(--dp) = hi_filler;
+@@ -1907,8 +1907,8 @@
+          /* This changes the data from GG to XXGG */
+          else
+          {
+-            png_bytep sp = row + (png_size_t)row_width;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 2;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 0; i < row_width; i++)
+             {
+                *(--dp) = *(--sp);
 @@ -1965,8 +1965,8 @@
           /* This changes the data from RRGGBB to RRGGBBXX */
           if (flags & PNG_FLAG_FILLER_AFTER)