summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-05-06 10:14:56 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-05-06 10:14:56 +0000
commitdf882156fe1a3c78598d3d2ee50ad9329f435419 (patch)
tree8fe3d394d9ed19c6f9712c9bf08d3b8508e8da96 /Build
parentfe097ccadc082c0313af73c5eb985b54dd443d92 (diff)
luatexdir: Sync with the upstream.
git-svn-id: svn://tug.org/texlive/trunk@37229 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writejpg.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/luatexdir/image/writejpg.w b/Build/source/texk/web2c/luatexdir/image/writejpg.w
index cb4cd673ae8..bfb218fdc46 100644
--- a/Build/source/texk/web2c/luatexdir/image/writejpg.w
+++ b/Build/source/texk/web2c/luatexdir/image/writejpg.w
@@ -291,6 +291,10 @@ void read_jpg_info(PDF pdf, image_dict * idict, img_readtype_e readtype)
img_yres(idict) = (int) read2bytes(img_file(idict));
switch (units) {
case 1:
+ if ((img_xres(idict) == 1) || (img_yres(idict) == 1)) {
+ luatex_warn("The image specifies an unusual resolution of %ddpi by %ddpi. ",
+ img_xres(idict), img_yres(idict));
+ }
break; /* pixels per inch */
case 2:
img_xres(idict) = (int) ((double) img_xres(idict) * 2.54);
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 90c6da86ac5..9f6b1d34e85 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -26,7 +26,7 @@
#define TeX
-int luatex_svn = 5228;
+int luatex_svn = 5231;
int luatex_version = 80; /* \.{\\luatexversion} */
int luatex_revision = '0'; /* \.{\\luatexrevision} */
int luatex_date_info = 2015042200; /* the compile date is now hardwired */