summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-02 15:03:51 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-02 15:03:51 +0000
commit75d06e67ba1f1e96903b8d80ac3d0847687d2aba (patch)
treeaa16e45bc14d6b0a9757bc55d13b2c84554e85ab /Build/source/texk/web2c
parentfa4f992c25c38ef0dec164173d7b2665f72881d4 (diff)
libpng 1.6.8
git-svn-id: svn://tug.org/texlive/trunk@32548 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writepng.w4
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writepng.c4
4 files changed, 18 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index d63f8574bb2..e03d5494bc9 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * image/writepng.w: Allow libpng >= 1.6.3 to read images with
+ incorrect CMF bytes.
+
2013-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdf/pdfgen.w (pdf_end_stream): Always write "\nendstream" for
diff --git a/Build/source/texk/web2c/luatexdir/image/writepng.w b/Build/source/texk/web2c/luatexdir/image/writepng.w
index 57079f5c5fc..9447ed62ad3 100644
--- a/Build/source/texk/web2c/luatexdir/image/writepng.w
+++ b/Build/source/texk/web2c/luatexdir/image/writepng.w
@@ -67,6 +67,10 @@ void read_png_info(image_dict * idict, img_readtype_e readtype)
img_png_info_ptr(idict) = info_p;
if (setjmp(png_jmpbuf(png_p)))
pdftex_fail("libpng: internal error");
+#if PNG_LIBPNG_VER >= 10603
+ /* ignore possibly incorrect CMF bytes */
+ png_set_option(png_p, PNG_MAXIMUM_INFLATE_WINDOW, PNG_OPTION_ON);
+#endif
png_init_io(png_p, img_file(idict));
png_read_info(png_p, info_p);
/* resolution support */
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index f5a0626fe1f..cad59d4029d 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * writepng.c: Allow libpng >= 1.6.3 to read images with
+ incorrect CMF bytes.
+
2014-01-01 Karl Berry <karl@tug.org>
* All source files: update copyright years to include 2014.
diff --git a/Build/source/texk/web2c/pdftexdir/writepng.c b/Build/source/texk/web2c/pdftexdir/writepng.c
index 0cd6aae0653..6371e934089 100644
--- a/Build/source/texk/web2c/pdftexdir/writepng.c
+++ b/Build/source/texk/web2c/pdftexdir/writepng.c
@@ -33,6 +33,10 @@ void read_png_info(integer img)
pdftex_fail("libpng: png_create_info_struct() failed");
if (setjmp(png_jmpbuf(png_ptr(img))))
pdftex_fail("libpng: internal error");
+#if PNG_LIBPNG_VER >= 10603
+ /* ignore possibly incorrect CMF bytes */
+ png_set_option(png_ptr(img), PNG_MAXIMUM_INFLATE_WINDOW, PNG_OPTION_ON);
+#endif
png_init_io(png_ptr(img), png_file);
png_read_info(png_ptr(img), png_info(img));
/* resolution support */