diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc index 346a33da5a..00d82436a9 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc @@ -710,7 +710,7 @@ static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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 diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc index 26e38d1d89..ed97c506b7 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc @@ -710,7 +710,7 @@ static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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 diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc index 4812a3c93b..903dcb4055 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc @@ -710,7 +710,7 @@ static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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 diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc index 72628b417f..5bd88346ce 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc @@ -710,7 +710,7 @@ static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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 diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc index 6617cfe8bc..d3c4db1764 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc @@ -711,7 +711,7 @@ static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -739,16 +739,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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 diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc index 30f8fed589..1d099c361d 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc @@ -710,7 +710,7 @@ static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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 diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc index e7614aa5c7..87178221d6 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc @@ -710,7 +710,7 @@ static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) int 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) { PdfDocument *pdf_doc; @@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *page_name, int page_num, #ifdef POPPLER_VERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); 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)) { 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 <%d.%d> allowed"; 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) { ; /* do nothing */ } 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