This file is part of MXE.
See index.html for further information.

From f084359f36e68aaaede8fed598933156e03ac442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
Date: Sat, 21 Apr 2012 09:29:25 +0200
Subject: [PATCH 1/4] Fix Standard-14 fallback fonts

wingding.ttf is totally different from ZapfDingbats. symbol.ttf is only a lousy fallback for Symbol.
Based on patch provided by Jonathan Kew.
---
 poppler/GlobalParamsWin.cc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index f989fb8..b15773f 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -73,13 +73,17 @@ static struct {
     {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf"},
     {"Helvetica-Oblique",     "n019023l.pfb", "ariali.ttf"},
     // TODO: not sure if "symbol.ttf" is right
+    // "symbol.ttf" can be used as a fallback, but some symbols are differently
+    // encoded (e.g., the glyphs for 'f', 'j', 'v'), while most other glyphs
+    // have a fairly different appearance
     {"Symbol",                "s050000l.pfb", "symbol.ttf"},
     {"Times-Bold",            "n021004l.pfb", "timesbd.ttf"},
     {"Times-BoldItalic",      "n021024l.pfb", "timesbi.ttf"},
     {"Times-Italic",          "n021023l.pfb", "timesi.ttf"},
     {"Times-Roman",           "n021003l.pfb", "times.ttf"},
     // TODO: not sure if "wingding.ttf" is right
-    {"ZapfDingbats",          "d050000l.pfb", "wingding.ttf"},
+    // No, the symbol sets are totally different
+    {"ZapfDingbats",          "d050000l.pfb", NULL},
 
     // those seem to be frequently accessed by PDF files and I kind of guess
     // which font file do the refer to
-- 
1.7.5.4


From 81dd27ef8bd213d8edc3e7983986bc17b6ef1d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
Date: Sat, 21 Apr 2012 09:34:46 +0200
Subject: [PATCH 2/4] Only check for Type1 fonts in custom directory if path
 is non-NULL

Otherwise, programs using poppler may crash
---
 poppler/GlobalParamsWin.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index b15773f..f68577f 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -243,7 +243,7 @@ void GlobalParams::setupBaseFonts(char * dir)
         if (displayFonts->lookup(fontName))
             continue;
 
-        if (dir) {
+        if (dir && displayFontTab[i].t1FileName) {
             GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName);
             if (FileExists(fontPath->getCString())) {
                 AddFont(displayFonts, fontName, fontPath, displayFontT1);
-- 
1.7.5.4


From 3ee566eef0bc1e45807de257ea9b914ead61d205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
Date: Sat, 21 Apr 2012 11:57:02 +0200
Subject: [PATCH 3/4] Allow custom substitution fonts on Windows

Standard-compliant PDF viewers must be able to handle 14 standard fonts even if they are not embedded. For the Symbol and ZapfDingbats fonts, there is no suitable alternative available on Windows by default, so they must be provided separately (and poppler must find them).

The search path is share/fonts/type1/gsfonts (relative to poppler) similar to *nix systems and the search path for poppler-data.
---
 poppler/GlobalParams.cc    |   31 +++++++++++++++++++++++++++++++
 poppler/GlobalParamsWin.cc |    2 +-
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 687fd25..eea60be 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -214,6 +214,37 @@ get_poppler_datadir (void)
 
 #ifdef _WIN32
 
+static char *
+get_poppler_fontdir (void)
+{
+#if !ENABLE_RELOCATABLE
+  static HMODULE hmodule = 0;
+#endif
+  static char retval[MAX_PATH];
+  static int beenhere = 0;
+
+  unsigned char *p;
+
+  if (beenhere)
+    return retval;
+
+  if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 32))
+    return NULL;
+
+  p = _mbsrchr ((unsigned char *) retval, '\\');
+  *p = '\0';
+  p = _mbsrchr ((unsigned char *) retval, '\\');
+  if (p) {
+    if (stricmp ((const char *) (p+1), "bin") == 0)
+      *p = '\0';
+  }
+  strcat (retval, "\\share\\fonts\\type1\\gsfonts");
+
+  beenhere = 1;
+
+  return retval;
+}
+
 //------------------------------------------------------------------------
 // WinFontInfo
 //------------------------------------------------------------------------
diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index f68577f..3ee75e4 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -281,7 +281,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
 
     if (!fontName) return NULL;
     lockGlobalParams;
-    setupBaseFonts(NULL);
+    setupBaseFonts(get_poppler_fontdir());
     dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
     if (!dfp) {
         substFontName = findSubstituteName(fontName->getCString());
-- 
1.7.5.4


From 51130351c64db0137795a4f253732a2aac8a4ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
Date: Sat, 21 Apr 2012 13:19:54 +0200
Subject: [PATCH 4/4] Don't use dllimport/dllexport

Otherwise static linking fails
---
 cpp/poppler-global.h     |    5 -----
 poppler/XpdfPluginAPI.h  |   18 ------------------
 qt4/src/poppler-export.h |    5 -----
 3 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
index 5650182..6c3e01b 100644
--- a/cpp/poppler-global.h
+++ b/cpp/poppler-global.h
@@ -20,13 +20,8 @@
 #ifndef POPPLER_GLOBAL_H
 #define POPPLER_GLOBAL_H
 
-#if defined(_WIN32)
-#  define LIB_EXPORT __declspec(dllexport)
-#  define LIB_IMPORT __declspec(dllimport)
-#else
 #  define LIB_EXPORT
 #  define LIB_IMPORT
-#endif
 
 #if defined(poppler_cpp_EXPORTS)
 #  define POPPLER_CPP_EXPORT LIB_EXPORT
diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h
index 22540f7..290aa63 100644
--- a/poppler/XpdfPluginAPI.h
+++ b/poppler/XpdfPluginAPI.h
@@ -28,19 +28,11 @@ extern "C" {
  */
 #define xpdfPluginAPIVersion 1
 
-#ifdef _WIN32
-#  ifdef __cplusplus
-#    define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType
-#  else
-#    define PLUGINFUNC(retType) extern __declspec(dllexport) retType
-#  endif
-#else
 #  ifdef __cplusplus
 #    define PLUGINFUNC(retType) extern "C" retType
 #  else
 #    define PLUGINFUNC(retType) extern retType
 #  endif
-#endif
 
 /*------------------------------------------------------------------------
  * Plugin setup/cleanup
@@ -285,22 +277,12 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler);
 
 } XpdfPluginVecTable;
 
-#ifdef _WIN32
-
-extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable;
-
-#define xpdfPluginSetup \
-  extern __declspec(dllexport) \
-  XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
-
-#else
 
 extern XpdfPluginVecTable xpdfPluginVecTable;
 
 #define xpdfPluginSetup \
   XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
 
-#endif
 
 #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict)
 #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog)
diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
index 7661fe9..ebb1e18 100644
--- a/qt4/src/poppler-export.h
+++ b/qt4/src/poppler-export.h
@@ -2,13 +2,8 @@
 * 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)
-# define LIB_EXPORT __declspec(dllexport)
-# define LIB_IMPORT __declspec(dllimport)
-#else
 # define LIB_EXPORT
 # define LIB_IMPORT
-#endif
 
 #ifdef poppler_qt4_EXPORTS
 # define POPPLER_QT4_EXPORT LIB_EXPORT
-- 
1.7.5.4