[libpng15] Eliminated two warnings from the Intel C compiler.

3 files changed, 12 insertions, 6 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index b7eb25804..005950b9a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.15beta09 - March 7, 2013
+Libpng 1.5.15beta09 - March 13, 2013
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -90,7 +90,7 @@ Version 1.5.15beta08 [March 5, 2013]
     settings to depend on options and options can now set (or override) the
     defaults for settings.
 
-Version 1.5.15beta09 [March 7, 2013]
+Version 1.5.15beta09 [March 13, 2013]
   Fixed CMakelists.txt to allow building a single variant of the library
     (Claudio Bley):
   Introduced a PNG_LIB_TARGETS variable that lists all activated library
@@ -98,10 +98,13 @@ Version 1.5.15beta09 [March 7, 2013]
     to build at least one library variant.
   Made the *_COPY targets only depend on library targets actually being build.
   Use PNG_LIB_TARGETS to unify a code path.
-  Changed the CREATE_SYMLINK macro to expact the full path to a file as the
+  Changed the CREATE_SYMLINK macro to expect the full path to a file as the
     first argument. When symlinking the filename component of that path is
     determined and used as the link target.
   Use copy_if_different in the CREATE_SYMLINK macro.
+  Eliminated two warnings from the Intel C compiler. The warnings are
+    technically valid, although a reasonable treatment of division would
+    show it to be incorrect.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 4aaa7ea1d..68409b7f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4048,7 +4048,7 @@ Version 1.5.15beta08 [March 5, 2013]
     settings to depend on options and options can now set (or override) the
     defaults for settings.
 
-Version 1.5.15beta09 [March 7, 2013]
+Version 1.5.15beta09 [March 13, 2013]
   Fixed CMakelists.txt to allow building a single variant of the library
     (Claudio Bley):
   Introduced a PNG_LIB_TARGETS variable that lists all activated library
@@ -4056,10 +4056,13 @@ Version 1.5.15beta09 [March 7, 2013]
     to build at least one library variant.
   Made the *_COPY targets only depend on library targets actually being build.
   Use PNG_LIB_TARGETS to unify a code path.
-  Changed the CREATE_SYMLINK macro to expact the full path to a file as the
+  Changed the CREATE_SYMLINK macro to expect the full path to a file as the
     first argument. When symlinking the filename component of that path is
     determined and used as the link target.
   Use copy_if_different in the CREATE_SYMLINK macro.
+  Eliminated two warnings from the Intel C compiler. The warnings are
+    technically valid, although a reasonable treatment of division would
+    show it to be incorrect.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngrutil.c b/pngrutil.c
index 5ee452d57..368b63f24 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -3161,7 +3161,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                   {
                      png_uint_32p dp32 = (png_uint_32p)dp;
                      png_const_uint_32p sp32 = (png_const_uint_32p)sp;
-                     unsigned int skip = (bytes_to_jump-bytes_to_copy) /
+                     size_t skip = (bytes_to_jump-bytes_to_copy) /
                         sizeof (png_uint_32);
 
                      do