summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-08-14 10:45:22 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-08-14 10:45:22 +0000
commitbf39c2f62b38b7f440461c1e5ebb664ff2617a62 (patch)
treed08515aaf11e28f75d3df22d3dfc29c9a4778337
parente5a04f538929427aa1ca7a7ab866ac7a81c97a85 (diff)
Return 1 even if the PDF version of included file is newer than the assumed version in check_for_pdf()
git-svn-id: svn://tug.org/texlive/trunk@34931 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog8
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index d66a4274219..ee877f865d0 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * pdfobj.c: Return 1 even if the PDF version of included file is
+ newer than the assumed version in check_for_pdf(), because
+ load_image() in pdfximage.c needs very long time if format ==
+ IMAGE_TYPE_UNKNOWN and the file size is very large.
+ Anyway the inclusion of the PDF file fails.
+
2014-08-14 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* epdf.c, pdfobj.c: Support streams with DecodeParms.
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index 93ae0589de9..cfd4a4e68bd 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -3325,7 +3325,7 @@ check_for_pdf (FILE *file)
WARN("Version of PDF file (1.%d) is newer than version limit specification.",
version);
- return 0;
+ return 1;
}
static int CDECL