Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 30798, skip font start with "." and "%" for font enumeration since they are private font.

Browse Source
This commit is contained in:
ftang%netscape.com 2000-05-05 21:19:26 +00:00
parent 526ebe8d8e
commit 64c2db61bf
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gfx/src/mac/nsDeviceContextMac.cpp
View File

@ -790,46 +790,48 @@ void nsDeviceContextMac :: InitFontInfoList()
OSType resType;
Str255 fontName;
::GetResInfo(fond, &fondID, &resType, fontName);
if( (0 != fontName[0]) && ('.' != fontName[1]) && ('%' != fontName[1]))
{
#if !TARGET_CARBON
ScriptCode script = ::FontToScript(fondID);
if (script != lastscript)
{
lastscript = script;
ScriptCode script = ::FontToScript(fondID);
if (script != lastscript)
{
lastscript = script;
TextEncoding sourceEncoding;
err = ::UpgradeScriptInfoToTextEncoding(script, kTextLanguageDontCare,
kTextRegionDontCare, NULL, &sourceEncoding);
if (converter)
err = ::TECDisposeConverter(converter);
err = ::TECCreateConverter(&converter, sourceEncoding, unicodeEncoding);
if (err != noErr)
converter = nil;
}
TextEncoding sourceEncoding;
err = ::UpgradeScriptInfoToTextEncoding(script, kTextLanguageDontCare,
kTextRegionDontCare, NULL, &sourceEncoding);
if (converter)
err = ::TECDisposeConverter(converter);
{
PRUnichar unicodeFontName[sizeof(fontName)];
ByteCount actualInputLength, actualOutputLength;
err = ::TECConvertText(converter, &fontName[1], fontName[0], &actualInputLength,
(TextPtr)unicodeFontName , sizeof(unicodeFontName), &actualOutputLength);
unicodeFontName[actualOutputLength / sizeof(PRUnichar)] = '\0';
err = ::TECCreateConverter(&converter, sourceEncoding, unicodeEncoding);
if (err != noErr)
converter = nil;
}
if (converter)
{
PRUnichar unicodeFontName[sizeof(fontName)];
ByteCount actualInputLength, actualOutputLength;
err = ::TECConvertText(converter, &fontName[1], fontName[0], &actualInputLength,
(TextPtr)unicodeFontName , sizeof(unicodeFontName), &actualOutputLength);
unicodeFontName[actualOutputLength / sizeof(PRUnichar)] = '\0';
FontNameKey key(unicodeFontName);
gFontInfoList->Put(&key, (void*)fondID);
}
FontNameKey key(unicodeFontName);
gFontInfoList->Put(&key, (void*)fondID);
}
#else
// pinkerton - CreateTextEncoding() makes a carbon app exit. this is a smarmy hack
char buffer[500];
::BlockMoveData ( &fontName[1], buffer, *fontName );
buffer[*fontName] = NULL;
printf("font buffer is %s\n", buffer);
FontNameKey key(buffer);
gFontInfoList->Put(&key, (void*)fondID);
// pinkerton - CreateTextEncoding() makes a carbon app exit. this is a smarmy hack
char buffer[500];
::BlockMoveData ( &fontName[1], buffer, *fontName );
buffer[*fontName] = NULL;
printf("font buffer is %s\n", buffer);
FontNameKey key(buffer);
gFontInfoList->Put(&key, (void*)fondID);
#endif
::ReleaseResource(fond);
::ReleaseResource(fond);
}
}
}
if (converter)