summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-05-09 11:03:09 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-05-09 11:03:09 +0000
commitb395c588ae1d4719067d8984f60d722726dd4a71 (patch)
treeb79bd10d3c7b04507a751769bc84af8f4d27da04 /Build
parent1e26ccb8e12f0c829fc5cfb28aade7ac2f193fe1 (diff)
update bmpimage.c in dvipdfm-x and XeTeX
git-svn-id: svn://tug.org/texlive/trunk@33931 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/bmpimage.c4
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/xetexdir/image/bmpimage.c5
4 files changed, 15 insertions, 4 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index c9dd8ba69e1..9d29f1fc446 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * bmpimage.c: Error exit instead of crashing for unsupported
+ OS2 bmp inclusion in bmp_include_image().
+
2014-05-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* dvipdfmx.c: Move special-case single option --help or --version
diff --git a/Build/source/texk/dvipdfm-x/bmpimage.c b/Build/source/texk/dvipdfm-x/bmpimage.c
index 8bbc7684245..d51638074d4 100644
--- a/Build/source/texk/dvipdfm-x/bmpimage.c
+++ b/Build/source/texk/dvipdfm-x/bmpimage.c
@@ -151,8 +151,8 @@ bmp_include_image (pdf_ximage *ximage, FILE *fp)
}
psize = 4;
} else {
- WARN("Unknown BMP header type.");
- return -1;
+ ERROR("Unknown BMP header type (OS2 BMP is not supported).");
+ return -1; /* never reaches here */
}
if (bit_count < 24) {
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index d255d4f7444..fab902ec132 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * image/bmpimage.c: Error exit instead of crashing for unsupported
+ OS2 bmp inclusion in bmp_include_image().
+
2014-04-28 TANAKA Takuji <KXD02663@nifty.ne.jp>
* XeTeX_ext.c: Accept Ctrl+Z as EOF in console (keyboard).
diff --git a/Build/source/texk/web2c/xetexdir/image/bmpimage.c b/Build/source/texk/web2c/xetexdir/image/bmpimage.c
index 8900f5299b5..6d8fdfc2c74 100644
--- a/Build/source/texk/web2c/xetexdir/image/bmpimage.c
+++ b/Build/source/texk/web2c/xetexdir/image/bmpimage.c
@@ -173,8 +173,9 @@ bmp_scan_file(struct bmp_info *info, FILE *fp)
}
psize = 4;
} else {
- WARN("Unknown BMP header type.");
- return -1;
+ fprintf (stderr, "Unknown BMP header type (OS2 BMP is not supported).\n");
+ exit (1);
+ return -1; /* never reaches here */
}
if (bit_count < 24) {