rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a small change to allow the "type1" driver to detect 

multiple master fonts and return an error code that allows
the "type1z" driver to load them after..
This commit is contained in:
David Turner 2000-05-26 02:16:06 +00:00
parent 7c388ba491
commit 936d2e072b
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/type1/t1load.c
View File

@ -1435,10 +1435,20 @@
}
break;
/* check for the presence of /BlendAxisTypes, we cannot deal with */
/* multiple master fonts, so we must return a correct error code */
/* to allow another driver to load them.. */
case tok_immediate:
if (token.kind2 == imm_BlendAxisTypes)
{
error = FT_Err_Unknown_File_Format;
goto Exit;
}
/* fallthrough */
/* A number was detected */
case tok_string:
case tok_program:
case tok_immediate:
case tok_array:
case tok_hexarray:
case tok_any:

18
src/type1/t1tokens.c
View File

@ -51,15 +51,15 @@
const char* t1_immediates[ imm_max - imm_first_ ] =
{
"-|", ".notdef", "BlueFuzz", "BlueScale", "BlueShift", "BlueValues",
"CharStrings", "Encoding", "FamilyBlues", "FamilyName", "FamilyOtherBlues",
"FID", "FontBBox", "FontID", "FontInfo", "FontMatrix", "FontName",
"FontType", "ForceBold", "FullName", "ItalicAngle", "LanguageGroup",
"Metrics", "MinFeature", "ND", "NP", "Notice", "OtherBlues", "OtherSubrs",
"PaintType", "Private", "RD", "RndStemUp", "StdHW", "StdVW", "StemSnapH",
"StemSnapV", "StrokeWidth", "Subrs", "UnderlinePosition",
"UnderlineThickness", "UniqueID", "Weight", "isFixedPitch", "lenIV",
"password", "version", "|", "|-"
"-|", ".notdef", "BlendAxisTypes", "BlueFuzz", "BlueScale", "BlueShift",
"BlueValues", "CharStrings", "Encoding", "FamilyBlues", "FamilyName",
"FamilyOtherBlues", "FID", "FontBBox", "FontID", "FontInfo", "FontMatrix",
"FontName", "FontType", "ForceBold", "FullName", "ItalicAngle",
"LanguageGroup", "Metrics", "MinFeature", "ND", "NP", "Notice",
"OtherBlues", "OtherSubrs", "PaintType", "Private", "RD", "RndStemUp",
"StdHW", "StdVW", "StemSnapH", "StemSnapV", "StrokeWidth", "Subrs",
"UnderlinePosition", "UnderlineThickness", "UniqueID", "Weight",
"isFixedPitch", "lenIV", "password", "version", "|", "|-"
};

1
src/type1/t1tokens.h
View File

@ -87,6 +87,7 @@
imm_RD_alternate = imm_first_, /* "-|" = alternate form of RD */
imm_notdef, /* "/.notdef" immediate */
imm_BlendAxisTypes,
imm_BlueFuzz,
imm_BlueScale,
imm_BlueShift,