From 1852d490352fdc05891b778a8769000816b907b0 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 2 Oct 2002 07:11:30 +0000 Subject: [PATCH] Add FC_RGBA_UNKNOWN --- fontconfig/fontconfig.h | 5 +++-- src/fcname.c | 5 +++-- src/fontconfig.man | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h index 069150e..de82f28 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.28 2002/08/24 20:08:53 keithp Exp $ + * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.30 2002/09/26 00:17:27 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -108,11 +108,12 @@ typedef int FcBool; #define FC_CHARCELL 110 /* sub-pixel order */ -#define FC_RGBA_NONE 0 +#define FC_RGBA_UNKNOWN 0 #define FC_RGBA_RGB 1 #define FC_RGBA_BGR 2 #define FC_RGBA_VRGB 3 #define FC_RGBA_VBGR 4 +#define FC_RGBA_NONE 5 typedef enum _FcType { FcTypeVoid, diff --git a/src/fcname.c b/src/fcname.c index 0c853da..1d1ba05 100644 --- a/src/fcname.c +++ b/src/fcname.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/fontconfig/src/fcname.c,v 1.14 2002/08/31 22:17:32 keithp Exp $ + * $XFree86: xc/lib/fontconfig/src/fcname.c,v 1.15 2002/09/26 00:17:28 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -151,11 +151,12 @@ static const FcConstant _FcBaseConstants[] = { { (FcChar8 *) "mono", "spacing", FC_MONO, }, { (FcChar8 *) "charcell", "spacing", FC_CHARCELL, }, - { (FcChar8 *) "none", "rgba", FC_RGBA_NONE }, + { (FcChar8 *) "unknown", "rgba", FC_RGBA_UNKNOWN }, { (FcChar8 *) "rgb", "rgba", FC_RGBA_RGB, }, { (FcChar8 *) "bgr", "rgba", FC_RGBA_BGR, }, { (FcChar8 *) "vrgb", "rgba", FC_RGBA_VRGB }, { (FcChar8 *) "vbgr", "rgba", FC_RGBA_VBGR }, + { (FcChar8 *) "none", "rgba", FC_RGBA_NONE }, }; #define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0]) diff --git a/src/fontconfig.man b/src/fontconfig.man index d9694d1..fc1803c 100644 --- a/src/fontconfig.man +++ b/src/fontconfig.man @@ -105,7 +105,7 @@ outline FC_OUTLINE Bool Whether the glyphs are outlines scalable FC_SCALABLE Bool Whether glyphs can be scaled scale FC_SCALE Double Scale factor for point->pixel conversions dpi FC_DPI Double Target dots per inch -rgba FC_RGBA Int rgb, bgr, vrgb, vbgr - subpixel geometry +rgba FC_RGBA Int unknown, rgb, bgr, vrgb, vbgr, none - subpixel geometry minspace FC_MINSPACE Bool Eliminate leading from line spacing charset FC_CHARSET CharSet Unicode chars encoded by the font lang FC_LANG String List of RFC-3066-style languages this font supports @@ -1296,10 +1296,12 @@ oblique slant FC_SLANT_OBLIQUE proportional spacing FC_PROPORTIONAL mono spacing FC_MONO charcell spacing FC_CHARCELL +unknown rgba FC_RGBA_UNKNOWN rgb rgba FC_RGBA_RGB bgr rgba FC_RGBA_BGR vrgb rgba FC_RGBA_VRGB vbgr rgba FC_RGBA_VBGR +none rgba FC_RGBA_NONE .DT .fi .RE -- 2.39.5