dvipdfm-x: Try to embed a PDF image, even if the PDF version is newer than the setting.

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

3 files changed, 15 insertions, 1 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 8a773a6e203..ce432aec0cc 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-18  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* epdf.c, pdfobj.c: Try to embed a PDF image, even if the PDF version
+	is newer than the setting.
+
 2015-07-08  Simon Cozens  <simon@simon-cozens.org>
 
 	* pngimage.c: Fixed a typo "XObjcect" => "XObject".
diff --git a/Build/source/texk/dvipdfm-x/epdf.c b/Build/source/texk/dvipdfm-x/epdf.c
index 21f8af18329..ca0999ab31e 100644
--- a/Build/source/texk/dvipdfm-x/epdf.c
+++ b/Build/source/texk/dvipdfm-x/epdf.c
@@ -404,8 +404,13 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file, const char *filename)
   if (!pf)
     return -1;
 
+  /*
+   * Try to embed the PDF, even if the PDF version is newer than the setting.
+   */
+#if 0
   if (pdf_file_get_version(pf) > pdf_get_version())
     goto too_recent;
+#endif
 
   pdf_ximage_init_form_info(&info);
 
@@ -965,4 +970,4 @@ concat_stream (pdf_obj *dst, pdf_obj *src)
 
   return -1;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index bb038f900e4..9db06c539db 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -3238,7 +3238,11 @@ pdf_open (const char *ident, FILE *file)
 
     if (version < 1 || version > pdf_version) {
       WARN("pdf_open: Not a PDF 1.[1-%u] file.", pdf_version);
+/*
+  Try to embed the PDF image, even if the PDF version is newer than
+  the setting.
       return NULL;
+*/
     }
 
     pf = pdf_file_new(file);