diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2012-06-13 10:52:34 +0200 |
|---|---|---|
| committer | Carlos Garcia Campos <cgarcia@igalia.com> | 2012-06-15 10:09:42 +0200 |
| commit | 95e50ef4f77454800c090b9f317d1599f89a91aa (patch) | |
| tree | 9c500311d88a9c3dde65ba47a0fa96578b588446 | |
| parent | 69e921c91e861f84b08629a85752176e2fba6902 (diff) | |
Use the poppler GlobalParams when building with poppler
| -rw-r--r-- | lib/pdf/CharOutputDev.cc | 2 | ||||
| -rw-r--r-- | lib/pdf/CharOutputDev.h | 2 | ||||
| -rw-r--r-- | lib/pdf/pdf.cc | 1 | ||||
| -rw-r--r-- | lib/pdf/popplercompat.h | 4 |
4 files changed, 9 insertions, 0 deletions
diff --git a/lib/pdf/CharOutputDev.cc b/lib/pdf/CharOutputDev.cc index e3b91157..2e6fd1ab 100644 --- a/lib/pdf/CharOutputDev.cc +++ b/lib/pdf/CharOutputDev.cc @@ -197,6 +197,7 @@ void unlinkfont(char* filename) } } +#ifndef HAVE_POPPLER static int config_use_fontconfig = 1; static int fcinitcalled = 0; @@ -481,6 +482,7 @@ GString *GFXGlobalParams::findFontFile(GString *fontName) return GlobalParams::findFontFile(fontName); } } +#endif // HAVE_POPPLER CharOutputDev::CharOutputDev(InfoOutputDev*info, PDFDoc*doc, int*page2page, int num_pages, int x, int y, int x1, int y1, int x2, int y2) :CommonOutputDev(info, doc, page2page, num_pages, x, y, x1, y1, x2, y2) diff --git a/lib/pdf/CharOutputDev.h b/lib/pdf/CharOutputDev.h index 10b4b91a..86124db3 100644 --- a/lib/pdf/CharOutputDev.h +++ b/lib/pdf/CharOutputDev.h @@ -108,11 +108,13 @@ class GFXLink { ~GFXLink(); }; +#ifndef HAVE_POPPLER class GFXGlobalParams: public GlobalParams { public: GFXGlobalParams(); ~GFXGlobalParams(); virtual GString *findFontFile(GString *fontName); }; +#endif #endif //__charoutputdev_h__ diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc index 0523ed8c..61165fbb 100644 --- a/lib/pdf/pdf.cc +++ b/lib/pdf/pdf.cc @@ -16,6 +16,7 @@ #include "FullBitmapOutputDev.h" #include "BitmapOutputDev.h" #include "VectorGraphicOutputDev.h" +#include "popplercompat.h" #include "../mem.h" #include "pdf.h" #define NO_ARGPARSER diff --git a/lib/pdf/popplercompat.h b/lib/pdf/popplercompat.h index 0078a2c7..06c6e5ef 100644 --- a/lib/pdf/popplercompat.h +++ b/lib/pdf/popplercompat.h @@ -92,6 +92,10 @@ char* mktmpname(char*ptr); #endif #ifdef HAVE_POPPLER + #define GFXGlobalParams GlobalParams +#endif + +#ifdef HAVE_POPPLER #include <goo/GooString.h> #include <goo/gfile.h> #else |