OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027505: Visualization, Font_FontMgr - do not look for fonts.dir on OS X

Browse Source 
Font_FontMgr::InitFontDataBase() now uses the same approach on OS X as on Android
ignoring fonts.dir files which are non used on these systems.
This commit is contained in:
kgv 2016-05-16 07:39:14 +03:00 committed by bugmaster
parent e5260e1dfa
commit 264abd72f2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Font/Font_FontMgr.cxx
View File

@ -38,7 +38,7 @@ struct Font_FontMgr_FontAliasMapNode
static const Font_FontMgr_FontAliasMapNode Font_FontMgr_MapOfFontsAliases[] = static const Font_FontMgr_FontAliasMapNode Font_FontMgr_MapOfFontsAliases[] =
{ {
#ifdef _WIN32 #if defined(_WIN32) || defined(__APPLE__)
{ "Courier" , "Courier New" , Font_FA_Regular }, { "Courier" , "Courier New" , Font_FA_Regular },
{ "Times-Roman" , "Times New Roman", Font_FA_Regular }, { "Times-Roman" , "Times New Roman", Font_FA_Regular },
@ -122,15 +122,21 @@ static const Font_FontMgr_FontAliasMapNode Font_FontMgr_MapOfFontsAliases[] =
"ttc", "ttc",
"pfa", "pfa",
"pfb", "pfb",
#ifdef __APPLE__
// Datafork TrueType (OS X), obsolete
//"dfont",
#endif
NULL NULL
}; };
#if !defined(__ANDROID__) && !defined(__APPLE__)
// X11 configuration file in plain text format (obsolete - doesn't exists in modern distributives) // X11 configuration file in plain text format (obsolete - doesn't exists in modern distributives)
static Standard_CString myFontServiceConf[] = {"/etc/X11/fs/config", static Standard_CString myFontServiceConf[] = {"/etc/X11/fs/config",
"/usr/X11R6/lib/X11/fs/config", "/usr/X11R6/lib/X11/fs/config",
"/usr/X11/lib/X11/fs/config", "/usr/X11/lib/X11/fs/config",
NULL NULL
}; };
#endif
#ifdef __APPLE__ #ifdef __APPLE__
// default fonts paths in Mac OS X // default fonts paths in Mac OS X
@ -384,6 +390,7 @@ void Font_FontMgr::InitFontDataBase()
#else #else
NCollection_Map<TCollection_AsciiString> aMapOfFontsDirs; NCollection_Map<TCollection_AsciiString> aMapOfFontsDirs;
#if !defined(__ANDROID__) && !defined(__APPLE__)
const OSD_Protection aProtectRead (OSD_R, OSD_R, OSD_R, OSD_R); const OSD_Protection aProtectRead (OSD_R, OSD_R, OSD_R, OSD_R);
// read fonts directories from font service config file (obsolete) // read fonts directories from font service config file (obsolete)
@ -440,6 +447,7 @@ void Font_FontMgr::InitFontDataBase()
} }
aFile.Close(); aFile.Close();
} }
#endif
// append default directories // append default directories
for (Standard_Integer anIter = 0; myDefaultFontsDirs[anIter] != NULL; ++anIter) for (Standard_Integer anIter = 0; myDefaultFontsDirs[anIter] != NULL; ++anIter)
@ -461,7 +469,7 @@ void Font_FontMgr::InitFontDataBase()
for (NCollection_Map<TCollection_AsciiString>::Iterator anIter (aMapOfFontsDirs); for (NCollection_Map<TCollection_AsciiString>::Iterator anIter (aMapOfFontsDirs);
anIter.More(); anIter.Next()) anIter.More(); anIter.Next())
{ {
#ifdef __ANDROID__ #if defined(__ANDROID__) || defined(__APPLE__)
OSD_Path aFolderPath (anIter.Value()); OSD_Path aFolderPath (anIter.Value());
for (OSD_FileIterator aFileIter (aFolderPath, "*"); aFileIter.More(); aFileIter.Next()) for (OSD_FileIterator aFileIter (aFolderPath, "*"); aFileIter.More(); aFileIter.Next())
{ {