web2c/xetexdir: Discard the changes on 2015-02-09

git-svn-id: svn://tug.org/texlive/trunk@36280 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 7 insertions, 24 deletions

diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 7a379ce27b9..fd0112cea8a 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-15  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* XeTeX_pic.c and image/jpegimage.c: Revert. The changes in 2015-02-09
+	are discarded. The picture sizes obtained by the previous XeTeX are
+	correct. Problems may be in xdvipdfmx or maybe cmyk colors are not
+	supported.
+
 2015-02-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* XeTeX_pic.c and image/jpegimage.c: Fix a bug to include jpeg images
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_pic.c b/Build/source/texk/web2c/xetexdir/XeTeX_pic.c
index 353b87831d9..92233654232 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_pic.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_pic.c
@@ -104,16 +104,8 @@ find_pic_file(char** path, realrect* bounds, int pdfBoxType, int page)
 		struct JPEG_info	info;
 		err = JPEG_scan_file(&info, fp);
 		if (err == 0) {
-/*
 			bounds->wd = (info.width * 72.27) / info.xdpi;
 			bounds->ht = (info.height * 72.27) / info.ydpi;
-*/
-/*
-  In the new jpegimage.c, info.width and info.height are correct
-  width and height in bp unit
-*/
-			bounds->wd = (info.width * 72.27) / 72.0;
-			bounds->ht = (info.height * 72.27) / 72.0;
 		}
 		goto done;
 	}
diff --git a/Build/source/texk/web2c/xetexdir/image/jpegimage.c b/Build/source/texk/web2c/xetexdir/image/jpegimage.c
index fb72b1a8630..2bff54548a4 100644
--- a/Build/source/texk/web2c/xetexdir/image/jpegimage.c
+++ b/Build/source/texk/web2c/xetexdir/image/jpegimage.c
@@ -83,7 +83,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include "kpathsea/lib.h" /* for xmalloc/xrealloc prototypes */
 
@@ -431,8 +430,6 @@ JPEG_scan_file (struct JPEG_info *j_info, FILE *fp)
   unsigned short length;
   int  found_SOFn, count;
   char app_sig[128];
-  double xdensity, ydensity;
-  double image_w, image_h;
 
   JPEG_info_init(j_info);
 
@@ -528,18 +525,5 @@ JPEG_scan_file (struct JPEG_info *j_info, FILE *fp)
     count++;
   }
 
-  jpeg_get_density (j_info, &xdensity, &ydensity);
-
-  image_w = floor((j_info->width * xdensity) + 0.5);
-  image_h = floor((j_info->height * ydensity) + 0.5);
-
-  j_info->width = (unsigned short)(image_w);
-  j_info->height = (unsigned short)(image_h);
-
-/*
-  Now, j_info->width and j_info->height are correct width and
-  height in bp unit
-*/
-
   return (found_SOFn ? 0 : -1);
 }