From b3647b2d30cde861ecdde98892da1fc81534fd1f Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sun, 12 Jan 2020 15:31:44 +0200 Subject: [PATCH] texlive-bin: revert changes that came from https://github.com/TeX-Live/texlive-source/commit/0cdb9ef127393926b9cd321d53f169e82c52848c --- packages/texlive-bin/pdftoepdf-poppler0.83.0.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/texlive-bin/pdftoepdf-poppler0.83.0.cc b/packages/texlive-bin/pdftoepdf-poppler0.83.0.cc index 32cee0ecc..d472055cc 100644 --- a/packages/texlive-bin/pdftoepdf-poppler0.83.0.cc +++ b/packages/texlive-bin/pdftoepdf-poppler0.83.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 major_pdf_version_wanted, int minor_pdf_version_wanted, + int pagebox_spec, 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 > major_pdf_version_wanted) + if ((pdf_major_version_found > 1) || (pdf_minor_version_found > minor_pdf_version_wanted)) { const char *msg = - "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed"; + "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed"; if (pdf_inclusion_errorlevel > 0) { - pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted); + pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, 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, major_pdf_version_wanted, minor_pdf_version_wanted); + pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); } } #else