diff options
| author | Hib Eris <hib@hiberis.nl> | 2010-01-13 22:17:03 +0000 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2010-01-13 22:17:03 +0000 |
| commit | 36b67b002db802bfad553720e2114b76b07bb614 (patch) | |
| tree | 146c40c75defe72dfe5a528a2a6fbdd76ca22f42 /poppler/GlobalParams.cc | |
| parent | 9c0b20ab8c104c2f5398a5a3b8409ca554f5fa39 (diff) | |
Make fontconfig optional with mingw compiler
Diffstat (limited to 'poppler/GlobalParams.cc')
| -rw-r--r-- | poppler/GlobalParams.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 2813b98d..a91ecc10 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -22,6 +22,7 @@ // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com> // Copyright (C) 2009 William Bader <williambader@hotmail.com> // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net> +// Copyright (C) 2010 Hib Eris <hib@hiberis.nl> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -557,7 +558,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir) UnicodeMap *map; int i; -#ifndef _MSC_VER +#if WITH_FONTCONFIGURATION_FONTCONFIG FcInit(); FCcfg = FcConfigGetCurrent(); #endif @@ -962,7 +963,7 @@ static GBool findModifier(const char *name, const char *modifier, const char **s } } -#ifndef _MSC_VER +#if WITH_FONTCONFIGURATION_FONTCONFIG static FcPattern *buildFcPattern(GfxFont *font) { int weight = -1, @@ -1110,7 +1111,7 @@ static FcPattern *buildFcPattern(GfxFont *font) /* 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 +#if WITH_FONTCONFIGURATION_FONTCONFIG DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) { DisplayFontParam *dfp; FcPattern *p=0; @@ -1170,6 +1171,9 @@ fin: return dfp; } #endif +#if WITH_FONTCONFIGURATION_WIN32 +#include "GlobalParamsWin.cc" +#endif GBool GlobalParams::getPSExpandSmaller() { GBool f; |