[libpng16] Removed more redundant tests (suggested by "irwir" in Github issue #180).

ANNOUNCE

@@ -58,6 +58,7 @@ Version 1.6.33rc01 [September 20, 2017]
 Version 1.6.33rc02 [September 22, 2017]
   Added an interlaced version of each file in contrib/pngsuite.
   Relocate new memset() call in pngrutil.c.
+  Removed more redundant tests (suggested by "irwir" in Github issue #180).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -6028,6 +6028,7 @@ Version 1.6.33rc01 [September 20, 2017]
 Version 1.6.33rc02 [September 22, 2017]
   Added an interlaced version of each file in contrib/pngsuite.
   Relocate new memset() call in pngrutil.c.
+  Removed more redundant tests (suggested by "irwir" in Github issue #180).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

pngrutil.c

@@ -1585,11 +1585,9 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                     }
                                  }
 
-                                 else if (size > 0)
-                                    errmsg = "truncated";
-
+                                 errmsg = "truncated";
 #ifndef __COVERITY__
-                                 else
+                                 if (size == 0)
                                     errmsg = png_ptr->zstream.msg;
 #endif
                               }

pngwrite.c

@@ -1940,7 +1940,7 @@ png_image_write_main(png_voidp argument)
    int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);
    int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */
    int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);
-   int write_16bit = linear && !colormap && (display->convert_to_8bit == 0);
+   int write_16bit = linear && (display->convert_to_8bit == 0);
 
 #   ifdef PNG_BENIGN_ERRORS_SUPPORTED
       /* Make sure we error out on any bad situation */