diff options
| author | Karl Berry <karl@freefriends.org> | 2021-05-10 16:06:29 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-05-10 16:06:29 +0000 |
| commit | 36e408020a45d0bfe67eb3f524f4fdf0f4d9aefa (patch) | |
| tree | b2a97e95d8a3da902eaea4451a622c951a08d1ef /Build/source/libs/xpdf | |
| parent | 4293f40bcee7e9f0bf77669379e5c923f725adfa (diff) | |
label error messages as coming from libxpdf
git-svn-id: svn://tug.org/texlive/trunk@59160 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf')
| -rw-r--r-- | Build/source/libs/xpdf/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/xpdf/TLpatches/patch-bunched | 20 | ||||
| -rw-r--r-- | Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc | 7 |
3 files changed, 30 insertions, 2 deletions
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index 153f0b61cdc..981ef4a53cf 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,8 @@ +2021-05-10 Karl Berry <karl@freefriends.org> + + * xpdf-src/xpdf/Error.cc (error): label error messages + as coming from libxpdf. + 2021-02-01 Akira Kakuto <kakuto@w32tex.org> * Import xpdf-4.03. diff --git a/Build/source/libs/xpdf/TLpatches/patch-bunched b/Build/source/libs/xpdf/TLpatches/patch-bunched index f5e182fe9ee..07b3f05a983 100644 --- a/Build/source/libs/xpdf/TLpatches/patch-bunched +++ b/Build/source/libs/xpdf/TLpatches/patch-bunched @@ -312,3 +312,23 @@ diff -ur xpdf-4.03/xpdf/config.h xpdf-src/xpdf/config.h #if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) #define POPEN_READ_MODE "rb" #else +diff -ur xpdf-4.03/xpdf/Error.cc xpdf-src/xpdf/Error.cc +--- xpdf-4.03/xpdf/Error.cc Thu Jan 28 07:23:52 2021 ++++ xpdf-src/xpdf/Error.cc Mon Feb 01 12:34:28 2021 +@@ -77,11 +77,14 @@ + (*errorCbk)(errorCbkData, category, (int)pos, sanitized->getCString()); + } else { + fflush(stdout); ++ /* Label the error messages for pdftex's use as libxpdf. ++ It would be cleaner to use the callback feature, but seems ++ like too much trouble at this late date. */ + if (pos >= 0) { +- fprintf(stderr, "%s (%d): %s\n", ++ fprintf(stderr, "\nlibxpdf: %s (%d): %s\n", + errorCategoryNames[category], (int)pos, sanitized->getCString()); + } else { +- fprintf(stderr, "%s: %s\n", ++ fprintf(stderr, "\nlibxpdf: %s: %s\n", + errorCategoryNames[category], sanitized->getCString()); + } + fflush(stderr); diff --git a/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc b/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc index 5a97505ed84..aec27dc5099 100644 --- a/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc +++ b/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc @@ -77,11 +77,14 @@ void CDECL error(ErrorCategory category, GFileOffset pos, (*errorCbk)(errorCbkData, category, (int)pos, sanitized->getCString()); } else { fflush(stdout); + /* Label the error messages for pdftex's use as libxpdf. + It would be cleaner to use the callback feature, but seems + like too much trouble at this late date. */ if (pos >= 0) { - fprintf(stderr, "%s (%d): %s\n", + fprintf(stderr, "\nlibxpdf: %s (%d): %s\n", errorCategoryNames[category], (int)pos, sanitized->getCString()); } else { - fprintf(stderr, "%s: %s\n", + fprintf(stderr, "\nlibxpdf: %s: %s\n", errorCategoryNames[category], sanitized->getCString()); } fflush(stderr); |