projects
/
platform
/
upstream
/
fontconfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25436fd
)
Use default config in FcFileScan() and FcDirScan()
author
Behdad Esfahbod
<behdad@behdad.org>
Mon, 7 Sep 2009 02:10:22 +0000
(22:10 -0400)
committer
Behdad Esfahbod
<behdad@behdad.org>
Mon, 7 Sep 2009 02:10:22 +0000
(22:10 -0400)
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.
src/fcdir.c
patch
|
blob
|
history
diff --git
a/src/fcdir.c
b/src/fcdir.c
index
b43c3c6
..
f927c0b
100644
(file)
--- 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 ()
);
}
/*