summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-29 12:44:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-29 12:44:20 +0000
commitc847979c767d8f239f476d823523e77346cb38ce (patch)
tree81ca9df4cd6caacb5c344302fec095bd3753ee4d /Build/source
parentde569c5d3871e3aea62a0d01e2f86d50f1202591 (diff)
dvipdfm-x: Bugfix (from xdvipdfmx r108)
git-svn-id: svn://tug.org/texlive/trunk@31303 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog2
-rw-r--r--Build/source/texk/dvipdfm-x/jpegimage.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index c4be0aef5cc..3d839adbcdc 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -7,6 +7,8 @@
tt_cmap.c, type1c.c, xbb.c.
* Makefile.am: Adapted.
+ * jpegimage.c (jpeg_get_density): Bugfix (from xdvipdfmx r108).
+
2013-07-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* tt_aux.c, tt_post.c: Try to avoid a segfault for some broken
diff --git a/Build/source/texk/dvipdfm-x/jpegimage.c b/Build/source/texk/dvipdfm-x/jpegimage.c
index c57182cb0d9..af657e7a5ca 100644
--- a/Build/source/texk/dvipdfm-x/jpegimage.c
+++ b/Build/source/texk/dvipdfm-x/jpegimage.c
@@ -362,7 +362,7 @@ jpeg_get_density (struct JPEG_info *j_info,
struct JPEG_APPn_JFIF *app_data;
int i;
for (i = 0; i < j_info->num_appn; i++) {
- if (j_info->appn[i].marker == JM_APP0 ||
+ if (j_info->appn[i].marker == JM_APP0 &&
j_info->appn[i].app_sig == JS_APPn_JFIF)
break;
}