walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass the FcObjectPtr to FcCompareValueList, not the char * (perf). 

reviewed by: plam
This commit is contained in:
Patrick Lam 2005-11-25 15:54:24 +00:00
parent 61571f3f2e
commit d854eaf8a9
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-25 Dirk Mueller <dmueller@suse.com>
reviewed by: plam
* src/fcmatch.c:
Pass the FcObjectPtr to FcCompareValueList, not the char * (perf).
2005-11-25 Patrick Lam <plam@mit.edu> 2005-11-25 Patrick Lam <plam@mit.edu>
* src/fcint.h: * src/fcint.h:
* src/fccache.c (FcDirCacheConsume): * src/fccache.c (FcDirCacheConsume):

35
src/fcmatch.c
View File

@ -245,7 +245,7 @@ static FcMatcher _FcMatchers [] = {
#define NUM_MATCH_VALUES 15 #define NUM_MATCH_VALUES 15
static FcBool static FcBool
FcCompareValueList (const char *object, FcCompareValueList (FcObjectPtr o,
FcValueListPtr v1orig, /* pattern */ FcValueListPtr v1orig, /* pattern */
FcValueListPtr v2orig, /* target */ FcValueListPtr v2orig, /* target */
FcValue *bestValue, FcValue *bestValue,
@ -257,17 +257,18 @@ FcCompareValueList (const char *object,
double v, best, bestStrong, bestWeak; double v, best, bestStrong, bestWeak;
int i; int i;
int j; int j;
const char* object = FcObjectPtrU(o);
/* /*
* Locate the possible matching entry by examining the * Locate the possible matching entry by examining the
* first few characters in object * first few characters in object
*/ */
i = -1; i = -1;
switch (FcToLower (object[0])) { switch (object[0]) {
case 'f': case 'f':
switch (FcToLower (object[1])) { switch (object[1]) {
case 'o': case 'o':
switch (FcToLower (object[2])) { switch (object[2]) {
case 'u': case 'u':
i = MATCH_FOUNDRY; break; i = MATCH_FOUNDRY; break;
case 'n': case 'n':
@ -285,7 +286,7 @@ FcCompareValueList (const char *object,
case 'l': case 'l':
i = MATCH_LANG; break; i = MATCH_LANG; break;
case 's': case 's':
switch (FcToLower (object[1])) { switch (object[1]) {
case 'p': case 'p':
i = MATCH_SPACING; break; i = MATCH_SPACING; break;
case 't': case 't':
@ -297,7 +298,7 @@ FcCompareValueList (const char *object,
case 'p': case 'p':
i = MATCH_PIXEL_SIZE; break; i = MATCH_PIXEL_SIZE; break;
case 'w': case 'w':
switch (FcToLower (object[1])) { switch (object[1]) {
case 'i': case 'i':
i = MATCH_WIDTH; break; i = MATCH_WIDTH; break;
case 'e': case 'e':
@ -317,20 +318,6 @@ FcCompareValueList (const char *object,
*bestValue = FcValueCanonicalize(&FcValueListPtrU(v2orig)->value); *bestValue = FcValueCanonicalize(&FcValueListPtrU(v2orig)->value);
return FcTrue; return FcTrue;
} }
#if 0
for (i = 0; i < NUM_MATCHER; i++)
{
if (!FcStrCmpIgnoreCase ((FcChar8 *) _FcMatchers[i].object,
(FcChar8 *) object))
break;
}
if (i == NUM_MATCHER)
{
if (bestValue)
*bestValue = v2orig->value;
return FcTrue;
}
#endif
best = 1e99; best = 1e99;
bestStrong = 1e99; bestStrong = 1e99;
bestWeak = 1e99; bestWeak = 1e99;
@ -348,8 +335,6 @@ FcCompareValueList (const char *object,
*result = FcResultTypeMismatch; *result = FcResultTypeMismatch;
return FcFalse; return FcFalse;
} }
if (FcDebug () & FC_DBG_MATCHV)
printf (" v %g j %d ", v, j);
v = v * 100 + j; v = v * 100 + j;
if (v < best) if (v < best)
{ {
@ -423,7 +408,7 @@ FcCompare (FcPattern *pat,
i1++; i1++;
else else
{ {
if (!FcCompareValueList (FcObjectPtrU(elt_i1->object), if (!FcCompareValueList (elt_i1->object,
elt_i1->values, elt_i2->values, elt_i1->values, elt_i2->values,
0, value, result)) 0, value, result))
return FcFalse; return FcFalse;
@ -454,7 +439,7 @@ FcFontRenderPrepare (FcConfig *config,
pe = FcPatternFindElt (pat, FcObjectPtrU(fe->object)); pe = FcPatternFindElt (pat, FcObjectPtrU(fe->object));
if (pe) if (pe)
{ {
if (!FcCompareValueList (FcObjectPtrU(pe->object), pe->values, if (!FcCompareValueList (pe->object, pe->values,
fe->values, &v, 0, &result)) fe->values, &v, 0, &result))
{ {
FcPatternDestroy (new); FcPatternDestroy (new);