texlive[55353] Build/source/texk/web2c/pdftexdir:

[commits+hironobu at tug.org]

Revision: 55353
          http://tug.org/svn/texlive?view=revision&revision=55353
Author:   hironobu
Date:     2020-05-31 09:31:26 +0200 (Sun, 31 May 2020)
Log Message:
-----------
pdftexdir/writepng.c: suppress a compiler warning

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
    trunk/Build/source/texk/web2c/pdftexdir/writepng.c

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2020-05-30 22:53:06 UTC (rev 55352)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2020-05-31 07:31:26 UTC (rev 55353)
@@ -1,3 +1,7 @@
+2020-05-31  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* writepng.c: Suppress a compiler warning: '&&' within '||'
+
 2020-05-15  Akira Kakuto  <kakuto at w32tex.org>
 
 	* pdftoepdf.cc, pdftosrc.cc, NEWS: remove support of poppler.

Modified: trunk/Build/source/texk/web2c/pdftexdir/writepng.c
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/writepng.c	2020-05-30 22:53:06 UTC (rev 55352)
+++ trunk/Build/source/texk/web2c/pdftexdir/writepng.c	2020-05-31 07:31:26 UTC (rev 55353)
@@ -71,7 +71,7 @@
         pdftex_fail("unsupported type of color_type <%i>",
                     png_get_color_type(png_ptr(img), png_info(img)));
     }
-    if (fixedpdfmajorversion > 1 || fixedpdfminorversion >= 4
+    if ((fixedpdfmajorversion > 1 || fixedpdfminorversion >= 4)
         && (png_get_color_type(png_ptr(img), png_info(img)) == PNG_COLOR_TYPE_GRAY_ALPHA
             || png_get_color_type(png_ptr(img), png_info(img)) == PNG_COLOR_TYPE_RGB_ALPHA)) {
         /* png with alpha channel in device colours; we have to add a Page