summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2020-05-31 07:31:26 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2020-05-31 07:31:26 +0000
commit95c14a5d348da8ebb71776916f72483adf8e9537 (patch)
tree99ee8218f26de2ac22e0a5c9aa0e00d36ea61473
parent307f0e9891f7402400cac5287cdfaec42dadc6b2 (diff)
pdftexdir/writepng.c: suppress a compiler warning
git-svn-id: svn://tug.org/texlive/trunk@55353 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/pdftexdir/writepng.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 725290cec70..a578a2a6917 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-31 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * writepng.c: Suppress a compiler warning: '&&' within '||'
+
2020-05-15 Akira Kakuto <kakuto@w32tex.org>
* pdftoepdf.cc, pdftosrc.cc, NEWS: remove support of poppler.
diff --git a/Build/source/texk/web2c/pdftexdir/writepng.c b/Build/source/texk/web2c/pdftexdir/writepng.c
index 515ac56edb6..5079fc3f3d3 100644
--- a/Build/source/texk/web2c/pdftexdir/writepng.c
+++ b/Build/source/texk/web2c/pdftexdir/writepng.c
@@ -71,7 +71,7 @@ void read_png_info(integer img)
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