diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-05-10 11:54:55 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-05-10 11:54:55 +0000 |
commit | a81286f0b586d24c412e01cb993dd57175d55566 (patch) | |
tree | 8cf92ddf913c38376d702f76e0d8a24afc8f648e /Build/source/texk/web2c/xetexdir/image/bmpimage.c | |
parent | 5e579a880bc5172b07f33efef465abf3c7291682 (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/source/texk/web2c/xetexdir/image/bmpimage.c')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/image/bmpimage.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |