summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-09-29 11:59:24 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-09-29 11:59:24 +0000
commit91a0c7ebbe244b1a0a10fab808ff7ac956274875 (patch)
tree1e2a87024e5961395b249077766d7e6388f5285a /Build/source
parent27eace56919ea8139bf4884431f200263b122768 (diff)
replace some deprecated libpng stuff
git-svn-id: svn://tug.org/texlive/trunk@19948 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writeimg.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index e5b9a75cf80..4f3928b2d75 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * writeimg.c: Use png_get_*() instead of directly accessing
+ fields of the png_info and png_ptr structs.
+
2010-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdftex.test (new): Just testing 'pdftex -version'.
diff --git a/Build/source/texk/web2c/pdftexdir/writeimg.c b/Build/source/texk/web2c/pdftexdir/writeimg.c
index c9772135c24..4a1e5d65ac1 100644
--- a/Build/source/texk/web2c/pdftexdir/writeimg.c
+++ b/Build/source/texk/web2c/pdftexdir/writeimg.c
@@ -137,7 +137,7 @@ integer imagecolordepth(integer img)
{
switch (img_type(img)) {
case IMAGE_TYPE_PNG:
- return png_info(img)->bit_depth;
+ return png_get_bit_depth(png_ptr(img), png_info(img));
case IMAGE_TYPE_JPG:
return jpg_ptr(img)->bits_per_component;
case IMAGE_TYPE_JBIG2:
@@ -389,7 +389,7 @@ void deleteimage(integer img)
epdf_delete();
break;
case IMAGE_TYPE_PNG:
- xfclose((FILE *) png_ptr(img)->io_ptr, cur_file_name);
+ xfclose((FILE *) png_get_io_ptr(png_ptr(img)), cur_file_name);
png_destroy_read_struct(&(png_ptr(img)), &(png_info(img)), NULL);
break;
case IMAGE_TYPE_JPG: