summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-01 09:05:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-01 09:05:45 +0000
commitf195bce71572b59a03049c30d94ae10195d070dc (patch)
tree205f05a002a232a6b9801c0375e5b82fb7e2d8f4 /Build/source
parent9dd50aceb99dcb147777068d255414cda1e33f97 (diff)
Avoid libpng-1.5.x compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@21559 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfmx/ChangeLog.TL5
-rw-r--r--Build/source/texk/dvipdfmx/src/pngimage.c6
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL5
-rw-r--r--Build/source/texk/xdvipdfmx/src/pngimage.c6
4 files changed, 20 insertions, 2 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
index bb2af248198..b4298245e59 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/dvipdfmx/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: TeX Live (TL) changes for dvipdfmx
================================================
+2011-02-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * src/pngimage.c (create_cspace_ICCBased): Avoid libpng-1.5.x
+ compiler warning.
+
2011-02-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/Makefile.am [WIN32]: Add dvipdfmx.exe, ebb.exe, and
diff --git a/Build/source/texk/dvipdfmx/src/pngimage.c b/Build/source/texk/dvipdfmx/src/pngimage.c
index 8ed846b7c6d..994e9fd4614 100644
--- a/Build/source/texk/dvipdfmx/src/pngimage.c
+++ b/Build/source/texk/dvipdfmx/src/pngimage.c
@@ -536,7 +536,11 @@ create_cspace_ICCBased (png_structp png_ptr, png_infop info_ptr)
int compression_type; /* Manual page for libpng does not
* clarify whether profile data is inflated by libpng.
*/
- png_charp profile; /* Might be switched to png_bytep */
+#if PNG_LIBPNG_VER_MINOR < 5
+ png_charp profile;
+#else
+ png_bytep profile;
+#endif
png_uint_32 proflen;
if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP) ||
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 98eb3594ddc..a688f921aa9 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
=================================================
+2011-02-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * src/pngimage.c (create_cspace_ICCBased): Avoid libpng-1.5.x
+ compiler warning.
+
2010-06-08 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/dpxfile.c (dpx_file_apply_filter) [Solaris9]:
diff --git a/Build/source/texk/xdvipdfmx/src/pngimage.c b/Build/source/texk/xdvipdfmx/src/pngimage.c
index f4ac85c958e..25afca0fa90 100644
--- a/Build/source/texk/xdvipdfmx/src/pngimage.c
+++ b/Build/source/texk/xdvipdfmx/src/pngimage.c
@@ -529,7 +529,11 @@ create_cspace_ICCBased (png_structp png_ptr, png_infop info_ptr)
int compression_type; /* Manual page for libpng does not
* clarify whether profile data is inflated by libpng.
*/
- png_charp profile; /* Might be switched to png_bytep */
+#if PNG_LIBPNG_VER_MINOR < 5
+ png_charp profile;
+#else
+ png_bytep profile;
+#endif
png_uint_32 proflen;
if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP) ||