Various config changes plus a couple of optimizations from Owen

[fontconfig.git] / src / fcpat.c

diff --git a/src/fcpat.c b/src/fcpat.c
index a12414b25006ec94ffc22b35b83436fba9a7e542..bf527a40fccdba593725cb05b35cb3ba2cd91072 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcpat.c,v 1.12 2002/08/07 01:45:59 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcpat.c,v 1.13 2002/08/11 18:10:42 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -55,9 +55,6 @@ FcValueDestroy (FcValue v)
     case FcTypeCharSet:
        FcCharSetDestroy ((FcCharSet *) v.u.c);
        break;
-    case FcTypePattern:
-       FcPatternDestroy ((FcPattern *) v.u.p);
-       break;
     default:
        break;
     }
@@ -82,9 +79,6 @@ FcValueSave (FcValue v)
        if (!v.u.c)
            v.type = FcTypeVoid;
        break;
-    case FcTypePattern:
-       FcPatternReference ((FcPattern *) v.u.p);
-       break;
     default:
        break;
     }
@@ -107,9 +101,6 @@ FcValueListDestroy (FcValueList *l)
        case FcTypeCharSet:
            FcCharSetDestroy ((FcCharSet *) l->value.u.c);
            break;
-       case FcTypePattern:
-           FcPatternDestroy ((FcPattern *) l->value.u.p);
-           break;
        default:
            break;
        }
@@ -154,8 +145,6 @@ FcValueEqual (FcValue va, FcValue vb)
        return FcCharSetEqual (va.u.c, vb.u.c);
     case FcTypeFTFace:
        return va.u.f == vb.u.f;
-    case FcTypePattern:
-       return FcPatternEqual (va.u.p, vb.u.p);
     }
     return FcFalse;
 }
@@ -206,8 +195,6 @@ FcValueHash (FcValue v)
     case FcTypeFTFace:
        return FcStringHash ((const FcChar8 *) ((FT_Face) v.u.f)->family_name) ^
               FcStringHash ((const FcChar8 *) ((FT_Face) v.u.f)->style_name);
-    case FcTypePattern:
-       return (FcChar32) v.u.p->num;
     }
     return FcFalse;
 }
@@ -459,9 +446,6 @@ bail2:
     case FcTypeCharSet:
        FcCharSetDestroy ((FcCharSet *) value.u.c);
        break;
-    case FcTypePattern:
-       FcPatternDestroy ((FcPattern *) value.u.p);
-       break;
     default:
        break;
     }
@@ -579,16 +563,6 @@ FcPatternAddFTFace (FcPattern *p, const char *object, const FT_Face f)
     return FcPatternAdd (p, object, v, FcTrue);
 }
 
-FcBool
-FcPatternAddPattern (FcPattern *p, const char *object, const FcPattern *pp)
-{
-    FcValue    v;
-
-    v.type = FcTypePattern;
-    v.u.p = pp;
-    return FcPatternAdd (p, object, v, FcTrue);
-}
-
 FcResult
 FcPatternGet (FcPattern *p, const char *object, int id, FcValue *v)
 {
@@ -730,21 +704,6 @@ FcPatternGetFTFace (FcPattern *p, const char *object, int id, FT_Face *f)
     return FcResultMatch;
 }
 
-FcResult
-FcPatternGetPattern (FcPattern *p, const char *object, int id, FcPattern **pp)
-{
-    FcValue    v;
-    FcResult   r;
-
-    r = FcPatternGet (p, object, id, &v);
-    if (r != FcResultMatch)
-       return r;
-    if (v.type != FcTypePattern)
-        return FcResultTypeMismatch;
-    *pp = (FcPattern *) v.u.p;
-    return FcResultMatch;
-}
-
 FcPattern *
 FcPatternDuplicate (FcPattern *orig)
 {