summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY')
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY79
1 files changed, 61 insertions, 18 deletions
diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY
index 162a72225eb..d321a6561a8 100644
--- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY
+++ b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY
@@ -1,6 +1,6 @@
diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/GlobalParams.cc
--- poppler-0.12.4.orig/poppler/GlobalParams.cc 2010-01-17 01:06:58.000000000 +0100
-+++ poppler-0.12.4/poppler/GlobalParams.cc 2011-04-12 16:17:47.000000000 +0200
++++ poppler-0.12.4/poppler/GlobalParams.cc 2011-04-14 10:34:35.000000000 +0200
@@ -140,6 +140,7 @@
}
}
@@ -26,7 +26,32 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/Glob
FcInit();
FCcfg = FcConfigGetCurrent();
#endif
-@@ -944,6 +946,7 @@
+@@ -641,10 +643,12 @@
+ unicodeMapCache = new UnicodeMapCache();
+ cMapCache = new CMapCache();
+
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ baseFontsInitialized = gFalse;
+ winFontList = NULL;
+ #endif
++#endif
+
+ #ifdef ENABLE_PLUGINS
+ plugins = new GooList();
+@@ -806,9 +810,11 @@
+ deleteGooHash(unicodeMaps, GooString);
+ deleteGooList(toUnicodeDirs, GooString);
+ deleteGooHash(displayFonts, DisplayFontParam);
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ delete winFontList;
+ #endif
++#endif
+ deleteGooHash(psFonts, PSFontParam);
+ deleteGooList(psNamedFonts16, PSFontParam);
+ deleteGooList(psFonts16, PSFontParam);
+@@ -944,6 +950,7 @@
return NULL;
}
@@ -34,7 +59,7 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/Glob
static GBool findModifier(const char *name, const char *modifier, const char **start)
{
const char *match;
-@@ -962,7 +965,6 @@
+@@ -962,7 +969,6 @@
}
}
@@ -42,29 +67,22 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/Glob
static FcPattern *buildFcPattern(GfxFont *font)
{
int weight = -1,
-@@ -1110,6 +1112,11 @@
+@@ -1110,7 +1116,11 @@
/* if you can't or don't want to use Fontconfig, you need to implement
this function for your platform. For Windows, it's in GlobalParamsWin.cc
*/
+-#ifndef _MSC_VER
+#ifdef PDF_PARSER_ONLY
+DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
-+ return (DisplayFontParam * )NULL;
++ return NULL;
+}
-+#else
- #ifndef _MSC_VER
++#elif !defined(_MSC_VER)
DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
DisplayFontParam *dfp;
-@@ -1170,6 +1177,7 @@
- return dfp;
- }
- #endif
-+#endif
-
- GBool GlobalParams::getPSExpandSmaller() {
- GBool f;
+ FcPattern *p=0;
diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/GlobalParams.h
--- poppler-0.12.4.orig/poppler/GlobalParams.h 2010-01-17 01:06:58.000000000 +0100
-+++ poppler-0.12.4/poppler/GlobalParams.h 2011-04-12 16:17:47.000000000 +0200
++++ poppler-0.12.4/poppler/GlobalParams.h 2011-04-14 10:32:41.000000000 +0200
@@ -37,7 +37,7 @@
#include <assert.h>
#include "poppler-config.h"
@@ -74,7 +92,19 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/Globa
#include <fontconfig/fontconfig.h>
#endif
#include "goo/gtypes.h"
-@@ -169,7 +169,7 @@
+@@ -61,9 +61,11 @@
+ class GlobalParams;
+ class GfxFont;
+ class Stream;
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ class WinFontList;
+ #endif
++#endif
+
+ //------------------------------------------------------------------------
+
+@@ -169,7 +171,7 @@
void setBaseDir(char *dir);
@@ -83,7 +113,20 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/Globa
void setupBaseFonts(char *dir);
#endif
-@@ -352,7 +352,7 @@
+@@ -303,10 +305,12 @@
+ GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString]
+ GooHash *displayFonts; // display font info, indexed by font name
+ // [DisplayFontParam]
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ GBool baseFontsInitialized;
+ WinFontList *winFontList; // system TrueType fonts
+ #endif
++#endif
+ GBool psExpandSmaller; // expand smaller pages to fill paper
+ GBool psShrinkLarger; // shrink larger pages to fit paper
+ GBool psCenter; // center pages on the paper
+@@ -352,7 +356,7 @@
UnicodeMapCache *unicodeMapCache;
CMapCache *cMapCache;