Imported from libpng-0.99j.tar

pngrutil.c

diff --git a/pngrutil.c b/pngrutil.c
index 2a2bbd8..b275e7e 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1704,7 +1704,7 @@
          case 1:
          {
             png_bytep sp, dp;
-            png_uint_32 sshift, dshift;
+            int sshift, dshift;
             int s_start, s_end, s_inc;
             png_byte v;
             png_uint_32 i;
@@ -1715,8 +1715,8 @@
 #if defined(PNG_READ_PACKSWAP_SUPPORTED)
             if (transformations & PNG_PACKSWAP)
             {
-                sshift = (png_uint_32)((row_info->width + 7) & 7);
-                dshift = (png_uint_32)((final_width + 7) & 7);
+                sshift = (int)((row_info->width + 7) & 7);
+                dshift = (int)((final_width + 7) & 7);
                 s_start = 7;
                 s_end = 0;
                 s_inc = -1;
@@ -1724,8 +1724,8 @@
             else
 #endif
             {
-                sshift = 7 - (png_uint_32)((row_info->width + 7) & 7);
-                dshift = 7 - (png_uint_32)((final_width + 7) & 7);
+                sshift = 7 - (int)((row_info->width + 7) & 7);
+                dshift = 7 - (int)((final_width + 7) & 7);
                 s_start = 0;
                 s_end = 7;
                 s_inc = 1;
@@ -1759,7 +1759,7 @@
          case 2:
          {
             png_bytep sp, dp;
-            png_uint_32 sshift, dshift;
+            int sshift, dshift;
             int s_start, s_end, s_inc;
             png_uint_32 i;
 
@@ -1768,8 +1768,8 @@
 #if defined(PNG_READ_PACKSWAP_SUPPORTED)
             if (transformations & PNG_PACKSWAP)
             {
-               sshift = (png_uint_32)(((row_info->width + 3) & 3) << 1);
-               dshift = (png_uint_32)(((final_width + 3) & 3) << 1);
+               sshift = (int)(((row_info->width + 3) & 3) << 1);
+               dshift = (int)(((final_width + 3) & 3) << 1);
                s_start = 6;
                s_end = 0;
                s_inc = -2;
@@ -1777,8 +1777,8 @@
             else
 #endif
             {
-               sshift = (png_uint_32)((3 - ((row_info->width + 3) & 3)) << 1);
-               dshift = (png_uint_32)((3 - ((final_width + 3) & 3)) << 1);
+               sshift = (int)((3 - ((row_info->width + 3) & 3)) << 1);
+               dshift = (int)((3 - ((final_width + 3) & 3)) << 1);
                s_start = 0;
                s_end = 6;
                s_inc = 2;
@@ -1815,7 +1815,7 @@
          case 4:
          {
             png_bytep sp, dp;
-            png_uint_32 sshift, dshift;
+            int sshift, dshift;
             int s_start, s_end, s_inc;
             png_uint_32 i;
 
@@ -1824,8 +1824,8 @@
 #if defined(PNG_READ_PACKSWAP_SUPPORTED)
             if (transformations & PNG_PACKSWAP)
             {
-               sshift = (png_uint_32)(((row_info->width + 1) & 1) << 2);
-               dshift = (png_uint_32)(((final_width + 1) & 1) << 2);
+               sshift = (int)(((row_info->width + 1) & 1) << 2);
+               dshift = (int)(((final_width + 1) & 1) << 2);
                s_start = 4;
                s_end = 0;
                s_inc = -4;
@@ -1833,8 +1833,8 @@
             else
 #endif
             {
-               sshift = (png_uint_32)((1 - ((row_info->width + 1) & 1)) << 2);
-               dshift = (png_uint_32)((1 - ((final_width + 1) & 1)) << 2);
+               sshift = (int)((1 - ((row_info->width + 1) & 1)) << 2);
+               dshift = (int)((1 - ((final_width + 1) & 1)) << 2);
                s_start = 0;
                s_end = 4;
                s_inc = 4;