fc-list/fc-list.c | 5 -----
fc-match/fc-match.c | 5 -----
fc-pattern/fc-pattern.c | 5 -----
fc-query/fc-query.c | 10 +---------
fc-scan/fc-scan.c | 6 ------
5 files changed, 1 insertion(+), 30 deletions(-)
New commits:
commit 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087
Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
Date: Thu Jan 3 20:33:34 2013 -0600
Remove FcInit() calls from tools
Library is supposed to automatically initialize itself. If it doesn't,
it's a bug.
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index eb7b688..5ad1333 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -136,11 +136,6 @@ main (int argc, char **argv)
i = 1;
#endif
- if (!FcInit ())
- {
- fprintf (stderr, "Can't init font config library\n");
- return 1;
- }
if (argv[i])
{
pat = FcNameParse ((FcChar8 *) argv[i]);
diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 8ae8ee9..260f404 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -143,11 +143,6 @@ main (int argc, char **argv)
i = 1;
#endif
- if (!FcInit ())
- {
- fprintf (stderr, "Can't init font config library\n");
- return 1;
- }
if (argv[i])
{
pat = FcNameParse ((FcChar8 *) argv[i]);
diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
index 84eb1ee..3f066c1 100644
--- a/fc-pattern/fc-pattern.c
+++ b/fc-pattern/fc-pattern.c
@@ -134,11 +134,6 @@ main (int argc, char **argv)
i = 1;
#endif
- if (!FcInit ())
- {
- fprintf (stderr, "Can't init font config library\n");
- return 1;
- }
if (argv[i])
{
pat = FcNameParse ((FcChar8 *) argv[i]);
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 50bef40..883e303 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -136,12 +136,6 @@ main (int argc, char **argv)
if (i == argc)
usage (argv[0], 1);
- if (!FcInit ())
- {
- fprintf (stderr, "Can't init font config library\n");
- return 1;
- }
-
for (; i < argc; i++)
{
int index;
diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
index c852e0d..5638b51 100644
--- a/fc-scan/fc-scan.c
+++ b/fc-scan/fc-scan.c
@@ -126,12 +126,6 @@ main (int argc, char **argv)
if (i == argc)
usage (argv[0], 1);
- if (!FcInit ())
- {
- fprintf (stderr, "Can't init font config library\n");
- return 1;
- }
-
fs = FcFontSetCreate ();
for (; i < argc; i++)
commit 102a4344dd7f668cf03b9665c718505050e0ae78
Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
Date: Thu Jan 3 20:31:22 2013 -0600
Don't use blanks for fc-query
fc-query is supposed to be config-independent.
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 2ed18a2..50bef40 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -142,8 +142,6 @@ main (int argc, char **argv)
return 1;
}
- blanks = FcConfigGetBlanks (NULL);
-
for (; i < argc; i++)
{
int index;
@@ -154,7 +152,7 @@ main (int argc, char **argv)
do {
FcPattern *pat;
- pat = FcFreeTypeQuery ((FcChar8 *) argv[i], index, blanks, &count);
+ pat = FcFreeTypeQuery ((FcChar8 *) argv[i], index, NULL, &count);
if (pat)
{
if (format)
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
