[libpng16] Removed more redundant tests (suggested by "irwir" in Github issue #180).
diff --git a/ANNOUNCE b/ANNOUNCE
index 4d2f50b..72411ab 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -58,6 +58,7 @@
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
diff --git a/CHANGES b/CHANGES
index 65e4cb3..f6ba9dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6028,6 +6028,7 @@
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
diff --git a/pngrutil.c b/pngrutil.c
index fb6d6b7..5f0fe5b 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1585,11 +1585,9 @@
}
}
- else if (size > 0)
- errmsg = "truncated";
-
+ errmsg = "truncated";
#ifndef __COVERITY__
- else
+ if (size == 0)
errmsg = png_ptr->zstream.msg;
#endif
}
diff --git a/pngwrite.c b/pngwrite.c
index a7662ac..a16d77c 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1940,7 +1940,7 @@
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 */
