summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/jpegimage.c11
2 files changed, 12 insertions, 3 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 6a6ffdfe079..302117d85b6 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-12 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * jpegimage.c: Fix a bug introduced by me on 2015-02-16.
+
2015-03-01 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* spc_tpic.c: Make tpic "ar" command dvips compatible to fix the problem
diff --git a/Build/source/texk/dvipdfm-x/jpegimage.c b/Build/source/texk/dvipdfm-x/jpegimage.c
index 2e154ddc367..113967a1124 100644
--- a/Build/source/texk/dvipdfm-x/jpegimage.c
+++ b/Build/source/texk/dvipdfm-x/jpegimage.c
@@ -669,9 +669,14 @@ read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length)
}
}
}
-
- j_info->xdpi = xres * res_unit;
- j_info->ydpi = yres * res_unit;
+/*
+ Do not overwrite if j_info->xdpi and j_info->ydpi are
+ already determined as JFIF
+*/
+ if (j_info->xdpi < 0.1 && j_info->ydpi < 0.1) {
+ j_info->xdpi = xres * res_unit;
+ j_info->ydpi = yres * res_unit;
+ }
err:
RELEASE(buffer);