summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-09-06 22:10:22 -0400
committerBehdad Esfahbod <behdad@behdad.org>2009-09-06 22:10:22 -0400
commit5e544b32d8dc98737c7a268a6a5f877207284e9a (patch)
tree6361a7fb587eded7b70aa5f4aab3051f994967c4
parent25436fd08fa6d0825a2f7c7b5d51e34873a05187 (diff)
downloadfontconfig-5e544b32d8dc98737c7a268a6a5f877207284e9a.tar.gz
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.
-rw-r--r--src/fcdir.c4
1 files changed, 2 insertions, 2 deletions
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 ());
}
/*