FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #786 from rhabacker/OpenSceneGraph-3.6

Browse Source 
Fix 'Incorrect default location for true type fonts on openSUSE'
This commit is contained in:
OpenSceneGraph git repository 2019-07-15 11:14:47 +01:00 committed by GitHub
commit 3f9ab5689c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgText/CMakeLists.txt
View File

@ -1,3 +1,4 @@
find_package(Fontconfig MODULE)
IF(DYNAMIC_OPENSCENEGRAPH)
ADD_DEFINITIONS(-DOSGTEXT_LIBRARY)
@ -47,5 +48,10 @@ SET(TARGET_LIBRARIES
OpenThreads
)
if(Fontconfig_FOUND)
list(APPEND TARGET_LIBRARIES Fontconfig::Fontconfig)
ADD_DEFINITIONS(-DWITH_FONTCONFIG)
endif()
SETUP_LIBRARY(${LIB_NAME})

40
src/osgText/Font.cpp
View File

@ -27,6 +27,10 @@
#include <OpenThreads/ReentrantMutex>
#ifdef WITH_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif
#include "DefaultFont.h"
using namespace osgText;
@ -47,6 +51,34 @@ static OpenThreads::ReentrantMutex& getFontFileMutex()
return s_FontFileMutex;
}
#ifdef WITH_FONTCONFIG
static FcConfig* getFontConfig()
{
static FcConfig* s_fontConfig = FcInitLoadConfigAndFonts();
return s_fontConfig;
}
static bool getFilePathFromFontconfig(const std::string &fontName, std::string &fontPath)
{
FcPattern* pat = FcNameParse((FcChar8*)fontName.c_str());
FcConfigSubstitute(getFontConfig(), pat, FcMatchPattern);
FcDefaultSubstitute(pat);
FcResult result = FcResultNoMatch;
FcPattern* font = FcFontMatch(getFontConfig(), pat, &result);
if (font)
{
FcChar8* file = NULL;
if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch)
{
fontPath = (char *)file;
}
FcPatternDestroy(font);
}
FcPatternDestroy(pat);
return result == FcResultMatch;
}
#endif
std::string osgText::findFontFile(const std::string& str)
{
// try looking in OSGFILEPATH etc first for fonts.
@ -78,11 +110,17 @@ std::string osgText::findFontFile(const std::string& str)
s_FontFilePath);
#else
osgDB::convertStringPathIntoFilePathList(
".:/usr/share/fonts/ttf:/usr/share/fonts/ttf/western:/usr/share/fonts/ttf/decoratives",
".:/usr/share/fonts/ttf:/usr/share/fonts/truetype:/usr/share/fonts/ttf/western:/usr/share/fonts/ttf/decoratives",
s_FontFilePath);
#endif
}
#ifdef WITH_FONTCONFIG
std::string fontPath;
if (getFilePathFromFontconfig(str, fontPath))
return fontPath;
#endif
filename = osgDB::findFileInPath(str,s_FontFilePath);
if (!filename.empty()) return filename;