Commit 28baf727 authored by Tilman Sauerbeck's avatar Tilman Sauerbeck Committed by Keith Packard
Browse files

Store FcVendorFoundries in read-only memory.

Create fixed size strings for vendor and foundry.
parent 481f6c23
...@@ -886,38 +886,38 @@ FcVendorMatch(const FT_Char vendor[4], const FT_Char *vendor_string) ...@@ -886,38 +886,38 @@ FcVendorMatch(const FT_Char vendor[4], const FT_Char *vendor_string)
entries for padding both with spaces and NULs. */ entries for padding both with spaces and NULs. */
static const struct { static const struct {
const FT_Char *vendor; const FT_Char vendor[5];
const FcChar8 *foundry; const FcChar8 foundry[13];
} FcVendorFoundries[] = { } FcVendorFoundries[] = {
{ (const FT_Char *) "ADBE", (const FcChar8 *) "adobe"}, { "ADBE", "adobe"},
{ (const FT_Char *) "AGFA", (const FcChar8 *) "agfa"}, { "AGFA", "agfa"},
{ (const FT_Char *) "ALTS", (const FcChar8 *) "altsys"}, { "ALTS", "altsys"},
{ (const FT_Char *) "APPL", (const FcChar8 *) "apple"}, { "APPL", "apple"},
{ (const FT_Char *) "ARPH", (const FcChar8 *) "arphic"}, { "ARPH", "arphic"},
{ (const FT_Char *) "ATEC", (const FcChar8 *) "alltype"}, { "ATEC", "alltype"},
{ (const FT_Char *) "B&H", (const FcChar8 *) "b&h"}, { "B&H", "b&h"},
{ (const FT_Char *) "BITS", (const FcChar8 *) "bitstream"}, { "BITS", "bitstream"},
{ (const FT_Char *) "CANO", (const FcChar8 *) "cannon"}, { "CANO", "cannon"},
{ (const FT_Char *) "DYNA", (const FcChar8 *) "dynalab"}, { "DYNA", "dynalab"},
{ (const FT_Char *) "EPSN", (const FcChar8 *) "epson"}, { "EPSN", "epson"},
{ (const FT_Char *) "FJ", (const FcChar8 *) "fujitsu"}, { "FJ", "fujitsu"},
{ (const FT_Char *) "IBM", (const FcChar8 *) "ibm"}, { "IBM", "ibm"},
{ (const FT_Char *) "ITC", (const FcChar8 *) "itc"}, { "ITC", "itc"},
{ (const FT_Char *) "IMPR", (const FcChar8 *) "impress"}, { "IMPR", "impress"},
{ (const FT_Char *) "LARA", (const FcChar8 *) "larabiefonts"}, { "LARA", "larabiefonts"},
{ (const FT_Char *) "LEAF", (const FcChar8 *) "interleaf"}, { "LEAF", "interleaf"},
{ (const FT_Char *) "LETR", (const FcChar8 *) "letraset"}, { "LETR", "letraset"},
{ (const FT_Char *) "LINO", (const FcChar8 *) "linotype"}, { "LINO", "linotype"},
{ (const FT_Char *) "MACR", (const FcChar8 *) "macromedia"}, { "MACR", "macromedia"},
{ (const FT_Char *) "MONO", (const FcChar8 *) "monotype"}, { "MONO", "monotype"},
{ (const FT_Char *) "MS", (const FcChar8 *) "microsoft"}, { "MS", "microsoft"},
{ (const FT_Char *) "MT", (const FcChar8 *) "monotype"}, { "MT", "monotype"},
{ (const FT_Char *) "NEC", (const FcChar8 *) "nec"}, { "NEC", "nec"},
{ (const FT_Char *) "PARA", (const FcChar8 *) "paratype"}, { "PARA", "paratype"},
{ (const FT_Char *) "QMSI", (const FcChar8 *) "qms"}, { "QMSI", "qms"},
{ (const FT_Char *) "RICO", (const FcChar8 *) "ricoh"}, { "RICO", "ricoh"},
{ (const FT_Char *) "URW", (const FcChar8 *) "urw"}, { "URW", "urw"},
{ (const FT_Char *) "Y&Y", (const FcChar8 *) "y&y"} { "Y&Y", "y&y"}
}; };
#define NUM_VENDOR_FOUNDRIES (int) (sizeof (FcVendorFoundries) / sizeof (FcVendorFoundries[0])) #define NUM_VENDOR_FOUNDRIES (int) (sizeof (FcVendorFoundries) / sizeof (FcVendorFoundries[0]))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment