Supplied by: mfabian@suse.de (Mike FABIAN)

Bug #260 fc-cache generates wrong spacing values for bitmap fonts Was using
    (strcmp (a,b)) instead of (!strcmp(a,b)).

diff --git a/ChangeLog b/ChangeLog
index 2087cca29bf4b49dfe19317e2707bae1a7831ad5..27c0658b83fe9f630a74499de0e96390283bf653 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-02  Keith Packard  <keithp@keithp.com>
+
+       Supplied by: mfabian@suse.de (Mike FABIAN)
+
+       * src/fcfreetype.c: (FcFreeTypeQuery):
+       Bug #260 fc-cache generates wrong spacing values for bitmap fonts
+       Was using (strcmp (a,b)) instead of (!strcmp(a,b)).
+
 2004-02-21  Manish Singh  <yosh@gimp.org>
 
        * fc-glyphname/fc-glyphname.c: (main):

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 78fe20ca56037e319933d7c397f6538e87c4efe1..2574b15fdf0791f4dd0cf40e43ff43abbe0ca7e8 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -970,11 +970,11 @@ FcFreeTypeQuery (const FcChar8    *file,
        the property */
     if(MY_Get_BDF_Property(face, "SPACING", &prop) == 0 &&
        prop.type == BDF_PROPERTY_TYPE_ATOM) {
-        if(strcmp(prop.u.atom, "c") || strcmp(prop.u.atom, "C"))
+        if(!strcmp(prop.u.atom, "c") || !strcmp(prop.u.atom, "C"))
             spacing = FC_CHARCELL;
-        else if(strcmp(prop.u.atom, "m") || strcmp(prop.u.atom, "M"))
+        else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M"))
             spacing = FC_MONO;
-        else if(strcmp(prop.u.atom, "p") || strcmp(prop.u.atom, "P"))
+        else if(!strcmp(prop.u.atom, "p") || !strcmp(prop.u.atom, "P"))
             spacing = FC_PROPORTIONAL;
     }
 #endif