This file is part of MXE. See index.html for further information. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= Date: Mon, 15 Sep 2014 19:53:04 -0700 Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path is non-NULL Otherwise, programs using poppler may crash Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc index 1111111..2222222 100644 --- a/poppler/GlobalParamsWin.cc +++ b/poppler/GlobalParamsWin.cc @@ -423,7 +423,7 @@ void GlobalParams::setupBaseFonts(char * dir) if (fontFiles->lookup(fontName)) continue; - if (dir) { + if (dir && displayFontTab[i].t1FileName) { GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName); if (FileExists(fontPath->getCString()) || FileExists(replaceSuffix(fontPath, ".pfb", ".pfa")->getCString())) { From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Thu, 14 Jul 2016 13:21:26 +0200 Subject: [PATCH 2/2] enable cross-building DLLs diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h index 1111111..2222222 100644 --- a/cpp/poppler-global.h +++ b/cpp/poppler-global.h @@ -21,7 +21,7 @@ #ifndef POPPLER_GLOBAL_H #define POPPLER_GLOBAL_H -#if defined(_WIN32) +#if defined(_WIN32) && defined(DLL_EXPORT) # define LIB_EXPORT __declspec(dllexport) # define LIB_IMPORT __declspec(dllimport) #else diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 1111111..2222222 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -150,6 +150,7 @@ PSFontParam16::~PSFontParam16() { static HMODULE hmodule; +#ifdef DLL_EXPORT extern "C" { BOOL WINAPI DllMain (HINSTANCE hinstDLL, @@ -166,6 +167,7 @@ DllMain (HINSTANCE hinstDLL, return TRUE; } } +#endif static const char * get_poppler_datadir (void) diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h index 1111111..2222222 100644 --- a/poppler/XpdfPluginAPI.h +++ b/poppler/XpdfPluginAPI.h @@ -47,7 +47,7 @@ extern "C" { */ #define xpdfPluginAPIVersion 1 -#ifdef _WIN32 +#if defined(_WIN32) && defined(DLL_EXPORT) # ifdef __cplusplus # define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType # else @@ -286,7 +286,7 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler); } XpdfPluginVecTable; -#ifdef _WIN32 +#if defined(_WIN32) && defined(DLL_EXPORT) extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable; diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h index 1111111..2222222 100644 --- a/qt4/src/poppler-export.h +++ b/qt4/src/poppler-export.h @@ -2,7 +2,7 @@ * This file is used to set the poppler_qt4_EXPORT macros right. * This is needed for setting the visibility on windows, it will have no effect on other platforms. */ -#if defined(_WIN32) +#if defined(_WIN32) && defined(DLL_EXPORT) # define _POPPLER_QT4_LIB_EXPORT __declspec(dllexport) # define _POPPLER_QT4_LIB_IMPORT __declspec(dllimport) #elif defined(__GNUC__)