[poppler] poppler/GlobalParams.cc poppler/GlobalParams.h

[Albert Astals Cid]

 poppler/GlobalParams.cc |   11 +++--------
 poppler/GlobalParams.h  |    6 +-----
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 5c66c775bcd686c61ea136bcd8f261fb631c5e71
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Feb 16 20:52:15 2010 +0000

    We don't need to pass anything to FontConfig
    
    Makes it much easier to manage and also fixes bug 26544

diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 493159d..4e84573 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -12,7 +12,7 @@
 //
 // Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005, 2007-2009 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2007-2010 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
@@ -615,11 +615,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
   UnicodeMap *map;
   int i;
 
-#if WITH_FONTCONFIGURATION_FONTCONFIG
-  FcInit();
-  FCcfg = FcConfigGetCurrent();
-#endif
-
 #if MULTITHREADED
   gInitMutex(&mutex);
   gInitMutex(&unicodeMapCacheMutex);
@@ -1189,9 +1184,9 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
 
     if (!p)
       goto fin;
-    FcConfigSubstitute(FCcfg, p, FcMatchPattern);
+    FcConfigSubstitute(NULL, p, FcMatchPattern);
     FcDefaultSubstitute(p);
-    set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);
+    set = FcFontSort(NULL, p, FcFalse, NULL, &res);
     if (!set)
       goto fin;
     for (i = 0; i < set->nfont; ++i)
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index 37539a6..941a536 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2007-2009 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2007-2010 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh at redhat.com>
@@ -353,10 +353,6 @@ private:
   UnicodeMapCache *unicodeMapCache;
   CMapCache *cMapCache;
   
-#if WITH_FONTCONFIGURATION_FONTCONFIG
-  FcConfig *FCcfg;
-#endif
-
 #ifdef ENABLE_PLUGINS
   GList *plugins;		// list of plugins [Plugin]
   GList *securityHandlers;	// list of loaded security handlers