fontconfig: Branch 'master'

View: New views
1 Messages — Rating Filter:   Alert me  

fontconfig: Branch 'master'

by Behdad Esfahbod-6 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

 src/fcdir.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5e544b32d8dc98737c7a268a6a5f877207284e9a
Author: Behdad Esfahbod <behdad@...>
Date:   Sun Sep 6 22:10:22 2009 -0400

    Use default config in FcFileScan() and FcDirScan()
   
    Before a NULL config was passed down adn essentially FcFileScan was
    equivalent to FcFreeTypeQuery.  Now fc-scan tool correctly applies
    the configuration to the scanned patterns.

diff --git a/src/fcdir.c b/src/fcdir.c
index b43c3c6..f927c0b 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -117,7 +117,7 @@ FcFileScan (FcFontSet    *set,
     const FcChar8   *file,
     FcBool    force)
 {
-    return FcFileScanConfig (set, dirs, blanks, file, NULL);
+    return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ());
 }
 
 /*
@@ -225,7 +225,7 @@ FcDirScan (FcFontSet    *set,
     if (cache || !force)
  return FcFalse;
 
-    return FcDirScanConfig (set, dirs, blanks, dir, force, NULL);
+    return FcDirScanConfig (set, dirs, blanks, dir, force, FcConfigGetCurrent ());
 }
 
 /*
_______________________________________________
Fontconfig mailing list
Fontconfig@...
http://lists.freedesktop.org/mailman/listinfo/fontconfig