summaryrefslogtreecommitdiff
path: root/Build/source/libs/xpdf/TLpatches/patch-bunched
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/xpdf/TLpatches/patch-bunched')
-rw-r--r--Build/source/libs/xpdf/TLpatches/patch-bunched91
1 files changed, 45 insertions, 46 deletions
diff --git a/Build/source/libs/xpdf/TLpatches/patch-bunched b/Build/source/libs/xpdf/TLpatches/patch-bunched
index 10885d1ad33..b842eb4d2ef 100644
--- a/Build/source/libs/xpdf/TLpatches/patch-bunched
+++ b/Build/source/libs/xpdf/TLpatches/patch-bunched
@@ -1,6 +1,6 @@
-diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
---- xpdf-4.01.01/goo/gfile.cc Fri Mar 15 06:01:02 2019
-+++ xpdf-src/goo/gfile.cc Mon Feb 25 11:09:32 2019
+diff -ur xpdf-4.02/goo/gfile.cc xpdf-src/goo/gfile.cc
+--- xpdf-4.02/goo/gfile.cc Thu Sep 26 04:54:33 2019
++++ xpdf-src/goo/gfile.cc Sun Sep 29 11:23:53 2019
@@ -7,6 +7,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
@@ -11,7 +11,7 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
#include <aconf.h>
-@@ -52,7 +55,11 @@
+@@ -54,7 +57,11 @@
char *s;
GString *ret;
@@ -23,7 +23,7 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
ret = new GString(s);
else
ret = new GString(".");
-@@ -401,6 +408,7 @@
+@@ -403,6 +410,7 @@
#endif
}
@@ -31,7 +31,7 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
GBool openTempFile(GString **name, FILE **f,
const char *mode, const char *ext) {
#if defined(_WIN32)
-@@ -515,10 +523,11 @@
+@@ -517,10 +525,11 @@
return gTrue;
#endif
}
@@ -44,7 +44,7 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
#else
return !mkdir(path, mode);
#endif
-@@ -572,6 +581,8 @@
+@@ -574,6 +583,8 @@
FILE *openFile(const char *path, const char *mode) {
#if defined(_WIN32)
@@ -53,7 +53,7 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
OSVERSIONINFO version;
wchar_t wPath[_MAX_PATH + 1];
char nPath[_MAX_PATH + 1];
-@@ -628,6 +639,7 @@
+@@ -630,6 +641,7 @@
nPath[i] = '\0';
return fopen(nPath, mode);
}
@@ -61,7 +61,7 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
#elif defined(VMS)
return fopen(path, mode, "ctx=stm");
#else
-@@ -688,6 +700,7 @@
+@@ -690,6 +702,7 @@
#endif
}
@@ -69,15 +69,15 @@ diff -ur xpdf-4.01.01/goo/gfile.cc xpdf-src/goo/gfile.cc
void fixCommandLine(int *argc, char **argv[]) {
#ifdef _WIN32
int argcw;
-@@ -713,3 +726,4 @@
+@@ -715,3 +728,4 @@
LocalFree(argvw);
#endif
}
+#endif /* !PDF_PARSER_ONLY */
-diff -ur xpdf-4.01.01/goo/gfile.h xpdf-src/goo/gfile.h
---- xpdf-4.01.01/goo/gfile.h Fri Mar 15 06:01:02 2019
-+++ xpdf-src/goo/gfile.h Mon Feb 25 11:07:26 2019
-@@ -114,6 +114,8 @@
+diff -ur xpdf-4.02/goo/gfile.h xpdf-src/goo/gfile.h
+--- xpdf-4.02/goo/gfile.h Thu Sep 26 04:54:33 2019
++++ xpdf-src/goo/gfile.h Sun Sep 29 11:25:19 2019
+@@ -115,6 +115,8 @@
// On Windows, this gets the Unicode command line and converts it to
// UTF-8. On other systems, this is a nop.
@@ -86,9 +86,9 @@ diff -ur xpdf-4.01.01/goo/gfile.h xpdf-src/goo/gfile.h
+#endif /* !PDF_PARSER_ONLY */
#endif
-diff -ur xpdf-4.01.01/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
---- xpdf-4.01.01/xpdf/GlobalParams.cc Fri Mar 15 06:01:02 2019
-+++ xpdf-src/xpdf/GlobalParams.cc Mon Feb 25 08:01:11 2019
+diff -ur xpdf-4.02/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
+--- xpdf-4.02/xpdf/GlobalParams.cc Thu Sep 26 04:54:33 2019
++++ xpdf-src/xpdf/GlobalParams.cc Sun Sep 29 11:32:58 2019
@@ -5,6 +5,9 @@
// Copyright 2001-2003 Glyph & Cog, LLC
//
@@ -99,7 +99,7 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
#include <aconf.h>
-@@ -39,8 +42,12 @@
+@@ -44,8 +47,12 @@
#include "GlobalParams.h"
#ifdef _WIN32
@@ -114,7 +114,7 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
#endif
#if MULTITHREADED
-@@ -684,6 +691,7 @@
+@@ -803,6 +810,7 @@
f = NULL;
fileName = NULL;
if (cfgFileName && cfgFileName[0]) {
@@ -122,7 +122,7 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
fileName = new GString(cfgFileName);
if (!(f = fopen(fileName->getCString(), "r"))) {
delete fileName;
-@@ -716,6 +724,7 @@
+@@ -835,6 +843,7 @@
parseFile(fileName, f);
delete fileName;
fclose(f);
@@ -130,7 +130,7 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
}
}
-@@ -2092,8 +2101,11 @@
+@@ -2265,8 +2274,11 @@
base14->fontNum,
displayFontTab[i].obliqueFactor));
} else {
@@ -142,9 +142,9 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
}
}
}
-diff -ur xpdf-4.01.01/xpdf/GlobalParams.h xpdf-src/xpdf/GlobalParams.h
---- xpdf-4.01.01/xpdf/GlobalParams.h Fri Mar 15 06:01:02 2019
-+++ xpdf-src/xpdf/GlobalParams.h Mon Feb 25 08:02:36 2019
+diff -ur xpdf-4.02/xpdf/GlobalParams.h xpdf-src/xpdf/GlobalParams.h
+--- xpdf-4.02/xpdf/GlobalParams.h Thu Sep 26 04:54:33 2019
++++ xpdf-src/xpdf/GlobalParams.h Sun Sep 29 11:34:12 2019
@@ -5,6 +5,9 @@
// Copyright 2001-2003 Glyph & Cog, LLC
//
@@ -155,7 +155,7 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.h xpdf-src/xpdf/GlobalParams.h
#ifndef GLOBALPARAMS_H
#define GLOBALPARAMS_H
-@@ -218,7 +221,7 @@
+@@ -219,7 +222,7 @@
// Initialize the global parameters by attempting to read a config
// file.
@@ -164,10 +164,10 @@ diff -ur xpdf-4.01.01/xpdf/GlobalParams.h xpdf-src/xpdf/GlobalParams.h
~GlobalParams();
-diff -ur xpdf-4.01.01/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc
---- xpdf-4.01.01/xpdf/PDFDoc.cc Fri Mar 15 06:01:02 2019
-+++ xpdf-src/xpdf/PDFDoc.cc Sun Mar 17 08:59:43 2019
-@@ -147,20 +147,25 @@
+diff -ur xpdf-4.02/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc
+--- xpdf-4.02/xpdf/PDFDoc.cc Thu Sep 26 04:54:33 2019
++++ xpdf-src/xpdf/PDFDoc.cc Sun Sep 29 11:41:09 2019
+@@ -156,20 +156,25 @@
PDFDoc::PDFDoc(char *fileNameA, GString *ownerPassword,
GString *userPassword, PDFCore *coreA) {
@@ -193,20 +193,19 @@ diff -ur xpdf-4.01.01/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc
n = 0;
i = 0;
while (getUTF8(fileName, &i, &u)) {
-@@ -178,8 +183,12 @@
+@@ -187,8 +192,11 @@
if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
- file = _wfopen(fileNameU, L"rb");
+ file = _wfopen(fileNameU, wfopenReadMode);
} else {
+#endif /* 0 */
- file = fopen(fileName->getCString(), "rb");
+ file = fopen(fileName->getCString(), fopenReadMode);
+#if 0
}
+#endif /* 0 */
-+
#elif defined(VMS)
- file = fopen(fileName->getCString(), "rb", "ctx=stm");
+ file = fopen(fileName->getCString(), fopenReadMode, "ctx=stm");
#else
-@@ -572,6 +581,7 @@
+@@ -581,6 +589,7 @@
GBool ret;
// NB: _wfopen is only available in NT
@@ -214,7 +213,7 @@ diff -ur xpdf-4.01.01/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc
version.dwOSVersionInfoSize = sizeof(version);
GetVersionEx(&version);
if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
-@@ -581,12 +591,15 @@
+@@ -590,12 +599,15 @@
path2w[i] = 0;
f = _wfopen(path2w, L"wb");
} else {
@@ -230,9 +229,9 @@ diff -ur xpdf-4.01.01/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc
if (!f) {
return gFalse;
}
-diff -ur xpdf-4.01.01/xpdf/Page.cc xpdf-src/xpdf/Page.cc
---- xpdf-4.01.01/xpdf/Page.cc Fri Mar 15 06:01:02 2019
-+++ xpdf-src/xpdf/Page.cc Mon Feb 25 08:19:00 2019
+diff -ur xpdf-4.02/xpdf/Page.cc xpdf-src/xpdf/Page.cc
+--- xpdf-4.02/xpdf/Page.cc Thu Sep 26 04:54:33 2019
++++ xpdf-src/xpdf/Page.cc Sun Sep 29 11:43:12 2019
@@ -480,9 +480,9 @@
delete links;
}
@@ -251,10 +250,10 @@ diff -ur xpdf-4.01.01/xpdf/Page.cc xpdf-src/xpdf/Page.cc
-}
#endif
+}
-diff -ur xpdf-4.01.01/xpdf/XFAForm.cc xpdf-src/xpdf/XFAForm.cc
---- xpdf-4.01.01/xpdf/XFAForm.cc Fri Mar 15 06:01:02 2019
-+++ xpdf-src/xpdf/XFAForm.cc Mon Feb 25 08:20:00 2019
-@@ -28,8 +28,10 @@
+diff -ur xpdf-4.02/xpdf/XFAForm.cc xpdf-src/xpdf/XFAForm.cc
+--- xpdf-4.02/xpdf/XFAForm.cc Thu Sep 26 04:54:33 2019
++++ xpdf-src/xpdf/XFAForm.cc Sun Sep 29 11:44:10 2019
+@@ -29,8 +29,10 @@
#include "XFAForm.h"
#ifdef _WIN32
@@ -267,9 +266,9 @@ diff -ur xpdf-4.01.01/xpdf/XFAForm.cc xpdf-src/xpdf/XFAForm.cc
#endif
//------------------------------------------------------------------------
-diff -ur xpdf-4.01.01/xpdf/config.h xpdf-src/xpdf/config.h
---- xpdf-4.01.01/xpdf/config.h Fri Mar 15 06:01:02 2019
-+++ xpdf-src/xpdf/config.h Sun Mar 17 16:09:03 2019
+diff -ur xpdf-4.02/xpdf/config.h xpdf-src/xpdf/config.h
+--- xpdf-4.02/xpdf/config.h Thu Sep 26 04:54:33 2019
++++ xpdf-src/xpdf/config.h Sun Sep 29 11:45:39 2019
@@ -78,11 +78,6 @@
// popen
//------------------------------------------------------------------------