diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2015-02-15 23:28:49 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2015-02-15 23:28:49 +0000 |
| commit | 4fbae73de6522a02cfdff0520889bc3d85918c92 (patch) | |
| tree | 16c0cdb4511e8eba2a64fb2171bd587126e39ce1 /Build | |
| parent | da23ccc7059c553b77b9f1a43cd936860f9c4c19 (diff) | |
texk/dvipdfm-x: Fix jpeg_get_density() in jpegimage.c.
git-svn-id: svn://tug.org/texlive/trunk@36287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/jpegimage.c | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 28537cec960..48d811eb868 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * jpegimage.c: Fix jpeg_get_density(). + 2015-01-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * bmpimage.c, dpxcrypt.c, dvi.c: Avoid compiler warnings. diff --git a/Build/source/texk/dvipdfm-x/jpegimage.c b/Build/source/texk/dvipdfm-x/jpegimage.c index 7ec4dcfda54..2e154ddc367 100644 --- a/Build/source/texk/dvipdfm-x/jpegimage.c +++ b/Build/source/texk/dvipdfm-x/jpegimage.c @@ -354,8 +354,17 @@ jpeg_get_density (struct JPEG_info *j_info, return; } - *xdensity = *ydensity = 1.0; +/* + j_info->xdpi and j_info->ydpi are already determined + because jpeg_get_density() is always called after + JPEG_scan_file(). +*/ + *xdensity = 72.0 / j_info->xdpi; + *ydensity = 72.0 / j_info->ydpi; + return; +#if 0 + *xdensity = *ydensity = 1.0; if (j_info->flags & HAVE_APPn_JFIF) { struct JPEG_APPn_JFIF *app_data; int i; @@ -380,6 +389,7 @@ jpeg_get_density (struct JPEG_info *j_info, } } } +#endif } static void |