diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-01-02 15:03:51 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-01-02 15:03:51 +0000 |
commit | 75d06e67ba1f1e96903b8d80ac3d0847687d2aba (patch) | |
tree | aa16e45bc14d6b0a9757bc55d13b2c84554e85ab /Build/source/texk/dvipdfm-x | |
parent | fa4f992c25c38ef0dec164173d7b2665f72881d4 (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/dvipdfm-x')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/pngimage.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index ab8af0f0854..247955b2343 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2014-01-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pngimage.c: Allow libpng >= 1.6.3 to read images with + incorrect CMF bytes. + 2013-12-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (dvipdfmx_SOURCES): Move cidtype0.c to here. diff --git a/Build/source/texk/dvipdfm-x/pngimage.c b/Build/source/texk/dvipdfm-x/pngimage.c index d15809527fe..14f9998bed9 100644 --- a/Build/source/texk/dvipdfm-x/pngimage.c +++ b/Build/source/texk/dvipdfm-x/pngimage.c @@ -185,6 +185,11 @@ png_include_image (pdf_ximage *ximage, FILE *png_file) return -1; } +#if PNG_LIBPNG_VER >= 10603 + /* ignore possibly incorrect CMF bytes */ + png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW, PNG_OPTION_ON); +#endif + /* Inititializing file IO. */ png_init_io (png_ptr, png_file); |