diff options
| author | Karl Berry <karl@freefriends.org> | 2014-12-12 19:09:33 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-12-12 19:09:33 +0000 |
| commit | 4c2022010167e1391d1a79128ca5f7679e6d5fdb (patch) | |
| tree | fb8038187452d777403c4c48454e8f6bc0477331 /Build | |
| parent | 893de2901cb8497570125a5857e768afbf3e0f99 (diff) | |
not even warning if \pdfinclusionerrorlevel < 0; (pdftex r720)
git-svn-id: svn://tug.org/texlive/trunk@35803 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/pdftoepdf.cc | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index c7bebe0b6f5..e49070fdf80 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,9 @@ +2014-12-12 Karl Berry <karl@gnu.org> + + * pdftoepdf.cc (read_pdf_info): do not even warn if + pdf_inclusion_errorlevel (aka \pdfinclusionerrorlevel) is negative. + Discussed with Thanh, 31 May 2011 10:17:35. + 2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de> * regex/regcomp.c [WIN64]: Use __int64 (not long) as intptr_t. diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc index b51fe0ec17c..be54069d7bc 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc @@ -742,7 +742,9 @@ read_pdf_info(char *image_name, char *page_name, int page_num, "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, minor_pdf_version_wanted); - } else { + } 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); } } @@ -754,7 +756,9 @@ read_pdf_info(char *image_name, char *page_name, int page_num, "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; if (pdf_inclusion_errorlevel > 0) { pdftex_fail(msg, pdf_version_found, pdf_version_wanted); - } else { + } else if (pdf_inclusion_errorlevel < 0) { + ; /* do nothing */ + } else { /* = 0, give warning */ pdftex_warn(msg, pdf_version_found, pdf_version_wanted); } } |