summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2011-05-11 05:54:26 +0000
committerTaco Hoekwater <taco@elvenkind.com>2011-05-11 05:54:26 +0000
commit15bc7ad72b79abb63db7107be1cb4dd466a1ab52 (patch)
tree303cccd934873e95a582b8d58074c0f636bce126 /Build/source/texk
parent3d2558b609131434d2e113c6e39ced72fbe3b82d (diff)
fix from Hartmut for png images (luatex)
git-svn-id: svn://tug.org/texlive/trunk@22414 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writepng.w12
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
3 files changed, 11 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 0ed797a6f71..100326d6d70 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-11 Taco Hoekwater <taco@luatex.org>
+ * image/writepmg.w: fix for 16bit images in pdf 1.4 (8bit) mode.
+ * luatex_svnversion.h: updated to reflect latest luatex revision (4258)
+
2011-05-09 Taco Hoekwater <taco@luatex.org>
* tex/texfileio.[hw]: file relative filenames in synctex output.
* luatex_svnversion.h: updated to reflect latest luatex revision (4256)
diff --git a/Build/source/texk/web2c/luatexdir/image/writepng.w b/Build/source/texk/web2c/luatexdir/image/writepng.w
index 0ca7b35137c..65347bc53c4 100644
--- a/Build/source/texk/web2c/luatexdir/image/writepng.w
+++ b/Build/source/texk/web2c/luatexdir/image/writepng.w
@@ -20,7 +20,7 @@
@ @c
static const char _svn_version[] =
- "$Id: writepng.w 4240 2011-05-01 20:52:01Z hhenkel $ "
+ "$Id: writepng.w 4258 2011-05-11 05:36:13Z taco $ "
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.70.x/source/texk/web2c/luatexdir/image/writepng.w $";
#include <assert.h>
@@ -536,11 +536,6 @@ void write_png(PDF pdf, image_dict * idict)
pdf_puts(pdf, "/Type /XObject\n/Subtype /Image\n");
if (img_attr(idict) != NULL && strlen(img_attr(idict)) > 0)
pdf_printf(pdf, "%s\n", img_attr(idict));
- pdf_printf(pdf, "/Width %i\n/Height %i\n/BitsPerComponent %i\n",
- (int) png_get_image_width(png_p, info_p),
- (int) png_get_image_height(png_p, info_p),
- (int) png_get_bit_depth(png_p, info_p));
- pdf_puts(pdf, "/ColorSpace ");
/* simple transparency support */
if (png_get_valid(png_p, info_p, PNG_INFO_tRNS)) {
png_set_tRNS_to_alpha(png_p);
@@ -576,6 +571,11 @@ void write_png(PDF pdf, image_dict * idict)
(void) png_set_interlace_handling(png_p);
png_read_update_info(png_p, info_p);
+ pdf_printf(pdf, "/Width %i\n/Height %i\n/BitsPerComponent %i\n",
+ (int) png_get_image_width(png_p, info_p),
+ (int) png_get_image_height(png_p, info_p),
+ (int) png_get_bit_depth(png_p, info_p));
+ pdf_puts(pdf, "/ColorSpace ");
if (png_copy && pdf->minor_version > 1
&& png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE
&& (png_get_color_type(png_p, info_p) == PNG_COLOR_TYPE_GRAY
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index c7224ad40a2..c2eab35cbad 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 4256
+#define luatex_svn_revision 4258