diff -ur xpdf-4.00/goo/gfile.cc xpdf-src/goo/gfile.cc --- xpdf-4.00/goo/gfile.cc Wed Aug 09 08:22:50 2017 +++ xpdf-src/goo/gfile.cc Wed Oct 03 00:39:16 2018 @@ -7,6 +7,9 @@ // Copyright 1996-2003 Glyph & Cog, LLC // //======================================================================== +// Modified for TeX Live by Peter Breitenlohner +// See top-level ChangeLog for a list of all modifications +//======================================================================== #include @@ -51,7 +54,11 @@ char *s; GString *ret; +#ifdef _WIN32 + if ((s = getenv("USERPROFILE"))) +#else if ((s = getenv("HOME"))) +#endif ret = new GString(s); else ret = new GString("."); @@ -400,6 +407,7 @@ #endif } +#ifndef PDF_PARSER_ONLY GBool openTempFile(GString **name, FILE **f, const char *mode, const char *ext) { #if defined(_WIN32) @@ -514,10 +522,11 @@ return gTrue; #endif } +#endif GBool createDir(char *path, int mode) { #ifdef _WIN32 - return !mkdir(path); + return !_mkdir(path); #else return !mkdir(path, mode); #endif @@ -571,6 +580,8 @@ FILE *openFile(const char *path, const char *mode) { #ifdef _WIN32 + return fopen(path, mode); +#if 0 OSVERSIONINFO version; wchar_t wPath[_MAX_PATH + 1]; char nPath[_MAX_PATH + 1]; @@ -627,6 +638,7 @@ nPath[i] = '\0'; return fopen(nPath, mode); } +#endif /* 0 */ #else return fopen(path, mode); #endif diff -ur xpdf-4.00/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc --- xpdf-4.00/xpdf/GlobalParams.cc Wed Aug 09 08:22:50 2017 +++ xpdf-src/xpdf/GlobalParams.cc Sun Aug 13 13:51:38 2017 @@ -5,6 +5,9 @@ // Copyright 2001-2003 Glyph & Cog, LLC // //======================================================================== +// Modified for TeX Live by Peter Breitenlohner +// See top-level ChangeLog for a list of all modifications +//======================================================================== #include @@ -38,8 +41,12 @@ #include "GlobalParams.h" #ifdef _WIN32 -# define strcasecmp stricmp -# define strncasecmp strnicmp +# undef strcasecmp +# undef strncasecmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp +#else +# include #endif #if MULTITHREADED @@ -677,6 +684,7 @@ f = NULL; fileName = NULL; if (cfgFileName && cfgFileName[0]) { +#ifndef PDF_PARSER_ONLY fileName = new GString(cfgFileName); if (!(f = fopen(fileName->getCString(), "r"))) { delete fileName; @@ -709,6 +717,7 @@ parseFile(fileName, f); delete fileName; fclose(f); +#endif /* !PDF_PARSER_ONLY */ } } @@ -2105,8 +2114,11 @@ base14->fontNum, displayFontTab[i].obliqueFactor)); } else { +// Do not display unnecessary looking message on W32 +#ifndef _WIN32 error(errConfig, -1, "No display font for '{0:s}'", displayFontTab[i].name); +#endif } } } diff -ur xpdf-4.00/xpdf/GlobalParams.h xpdf-src/xpdf/GlobalParams.h --- xpdf-4.00/xpdf/GlobalParams.h Wed Aug 09 08:22:50 2017 +++ xpdf-src/xpdf/GlobalParams.h Sun Aug 13 16:14:54 2017 @@ -5,6 +5,9 @@ // Copyright 2001-2003 Glyph & Cog, LLC // //======================================================================== +// Modified for TeX Live by Peter Breitenlohner +// See top-level ChangeLog for a list of all modifications +//======================================================================== #ifndef GLOBALPARAMS_H #define GLOBALPARAMS_H @@ -217,7 +220,7 @@ // Initialize the global parameters by attempting to read a config // file. - GlobalParams(const char *cfgFileName); + GlobalParams(const char *cfgFileName = NULL); ~GlobalParams(); diff -ur xpdf-4.00/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc --- xpdf-4.00/xpdf/PDFDoc.cc Wed Aug 09 08:22:50 2017 +++ xpdf-src/xpdf/PDFDoc.cc Wed Oct 03 00:39:16 2018 @@ -147,13 +147,17 @@ // try to open file // NB: _wfopen is only available in NT +/* version.dwOSVersionInfoSize = sizeof(version); GetVersionEx(&version); if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) { file = _wfopen(fileNameU, L"rb"); } else { +*/ file = fopen(fileName->getCString(), "rb"); +/* } +*/ if (!file) { error(errIO, -1, "Couldn't open file '{0:t}'", fileName); errCode = errOpenFile; @@ -535,6 +539,7 @@ GBool ret; // NB: _wfopen is only available in NT +/* version.dwOSVersionInfoSize = sizeof(version); GetVersionEx(&version); if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) { @@ -544,12 +549,15 @@ path2w[i] = 0; f = _wfopen(path2w, L"wb"); } else { +*/ for (i = 0; i < pathLen && i < _MAX_PATH; ++i) { path2c[i] = (char)path[i]; } path2c[i] = 0; f = fopen(path2c, "wb"); +/* } +*/ if (!f) { return gFalse; } diff -ur xpdf-4.00/xpdf/Page.cc xpdf-src/xpdf/Page.cc --- xpdf-4.00/xpdf/Page.cc Wed Aug 09 08:22:50 2017 +++ xpdf-src/xpdf/Page.cc Sun Aug 13 13:24:08 2017 @@ -480,9 +480,9 @@ delete links; } -#ifndef PDF_PARSER_ONLY void Page::getDefaultCTM(double *ctm, double hDPI, double vDPI, int rotate, GBool useMediaBox, GBool upsideDown) { +#ifndef PDF_PARSER_ONLY GfxState *state; int i; @@ -499,5 +499,5 @@ ctm[i] = state->getCTM()[i]; } delete state; -} #endif +} diff -ur xpdf-4.00/xpdf/XFAForm.cc xpdf-src/xpdf/XFAForm.cc --- xpdf-4.00/xpdf/XFAForm.cc Wed Aug 09 08:22:50 2017 +++ xpdf-src/xpdf/XFAForm.cc Sun Aug 13 14:28:34 2017 @@ -27,8 +27,10 @@ #include "XFAForm.h" #ifdef _WIN32 -# define strcasecmp stricmp -# define strncasecmp strnicmp +# undef strcasecmp +# undef strncasecmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp #endif //------------------------------------------------------------------------ diff -ur xpdf-4.00/xpdf/config.h xpdf-src/xpdf/config.h --- xpdf-4.00/xpdf/config.h Wed Aug 09 08:22:50 2017 +++ xpdf-src/xpdf/config.h Sun Aug 13 16:14:54 2017 @@ -78,11 +78,6 @@ // popen //------------------------------------------------------------------------ -#if defined(_MSC_VER) || defined(__BORLANDC__) -#define popen _popen -#define pclose _pclose -#endif - #if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) #define POPEN_READ_MODE "rb" #else