Dr. Werner Fink 2020-04-22 10:28:27 +00:00 committed by Git OBS Bridge
parent 79939e25c5
commit e309c11cdc
2 changed files with 9 additions and 4 deletions

View File

@ -717,7 +717,7 @@
+ +
+int +int
+read_pdf_info(char *image_name, char *page_name, int page_num, +read_pdf_info(char *image_name, char *page_name, int page_num,
+ int pagebox_spec, int minor_pdf_version_wanted, + int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
+ int pdf_inclusion_errorlevel) + int pdf_inclusion_errorlevel)
+{ +{
+ PdfDocument *pdf_doc; + PdfDocument *pdf_doc;
@ -745,16 +745,16 @@
+#ifdef POPPLER_VERSION +#ifdef POPPLER_VERSION
+ pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); + pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
+ pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion(); + pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
+ if ((pdf_major_version_found > 1) + if ((pdf_major_version_found > major_pdf_version_wanted)
+ || (pdf_minor_version_found > minor_pdf_version_wanted)) { + || (pdf_minor_version_found > minor_pdf_version_wanted)) {
+ const char *msg = + const char *msg =
+ "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed"; + "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+ if (pdf_inclusion_errorlevel > 0) { + if (pdf_inclusion_errorlevel > 0) {
+ pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); + pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
+ } else if (pdf_inclusion_errorlevel < 0) { + } else if (pdf_inclusion_errorlevel < 0) {
+ ; /* do nothing */ + ; /* do nothing */
+ } else { /* = 0, give warning */ + } else { /* = 0, give warning */
+ pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); + pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
+ } + }
+ } + }
+#else +#else

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 22 10:27:33 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Adopt patch source-poppler0.59.0.patch to latest use of read_pdf_info()
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 22 09:49:08 UTC 2020 - Dr. Werner Fink <werner@suse.de> Wed Apr 22 09:49:08 UTC 2020 - Dr. Werner Fink <werner@suse.de>