summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-05-10 11:54:55 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-05-10 11:54:55 +0000
commita81286f0b586d24c412e01cb993dd57175d55566 (patch)
tree8cf92ddf913c38376d702f76e0d8a24afc8f648e /Build
parent5e579a880bc5172b07f33efef465abf3c7291682 (diff)
update bmpimage.c in dvipdfm-x and in XeTeX
git-svn-id: svn://tug.org/texlive/trunk@33957 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog2
-rw-r--r--Build/source/texk/dvipdfm-x/bmpimage.c4
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog2
-rw-r--r--Build/source/texk/web2c/xetexdir/image/bmpimage.c4
4 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index a8e9b211122..2fc1e37b2b1 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,4 +1,4 @@
-2014-05-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+2014-05-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* bmpimage.c: Error exit instead of crashing for unsupported
bmp inclusion in bmp_include_image().
diff --git a/Build/source/texk/dvipdfm-x/bmpimage.c b/Build/source/texk/dvipdfm-x/bmpimage.c
index 5e3297713d7..97410936253 100644
--- a/Build/source/texk/dvipdfm-x/bmpimage.c
+++ b/Build/source/texk/dvipdfm-x/bmpimage.c
@@ -37,8 +37,9 @@
#include "bmpimage.h"
#define DIB_FILE_HEADER_SIZE 14
-#define DIB_CORE_HEADER_SIZE 14
+#define DIB_CORE_HEADER_SIZE 12
#define DIB_INFO_HEADER_SIZE 40
+#define DIB_INFO_HEADER_SIZE2 64
#define DIB_INFO_HEADER_SIZE4 108
#define DIB_INFO_HEADER_SIZE5 124
@@ -133,6 +134,7 @@ bmp_include_image (pdf_ximage *ximage, FILE *fp)
compression = DIB_COMPRESS_NONE;
psize = 3;
} else if (hsize == DIB_INFO_HEADER_SIZE ||
+ hsize == DIB_INFO_HEADER_SIZE2 ||
hsize == DIB_INFO_HEADER_SIZE4 ||
hsize == DIB_INFO_HEADER_SIZE5) {
info.width = ULONG_LE(p); p += 4;
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index a0df113359d..83e31ca1a51 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,4 +1,4 @@
-2014-05-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+2014-05-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* image/bmpimage.c: Error exit instead of crashing for unsupported
bmp inclusion in bmp_include_image().
diff --git a/Build/source/texk/web2c/xetexdir/image/bmpimage.c b/Build/source/texk/web2c/xetexdir/image/bmpimage.c
index 90355198caf..3506eb8991c 100644
--- a/Build/source/texk/web2c/xetexdir/image/bmpimage.c
+++ b/Build/source/texk/web2c/xetexdir/image/bmpimage.c
@@ -57,8 +57,9 @@
#include "bmpimage.h"
#define DIB_FILE_HEADER_SIZE 14
-#define DIB_CORE_HEADER_SIZE 14
+#define DIB_CORE_HEADER_SIZE 12
#define DIB_INFO_HEADER_SIZE 40
+#define DIB_INFO_HEADER_SIZE2 64
#define DIB_INFO_HEADER_SIZE4 108
#define DIB_INFO_HEADER_SIZE5 124
@@ -155,6 +156,7 @@ bmp_scan_file(struct bmp_info *info, FILE *fp)
compression = DIB_COMPRESS_NONE;
psize = 3;
} else if (hsize == DIB_INFO_HEADER_SIZE ||
+ hsize == DIB_INFO_HEADER_SIZE2 ||
hsize == DIB_INFO_HEADER_SIZE4 ||
hsize == DIB_INFO_HEADER_SIZE5) {
info->width = ULONG_LE(p); p += 4;