mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

Bugfix for X11 font loading when NULL pointer encountered.

Browse Source
This commit is contained in:
Mark Vejvoda
2010-04-01 20:42:07 +00:00
parent c678d35bdb
commit 2391d025ac
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -94,23 +94,51 @@ void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
throw std::runtime_error("Font not found."); throw std::runtime_error("Font not found.");
} }
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
// we need the height of 'a' which sould ~ be half ascent+descent // we need the height of 'a' which sould ~ be half ascent+descent
metrics.setHeight(static_cast<float> metrics.setHeight(static_cast<float>
(fontInfo->ascent + fontInfo->descent) / 2); (fontInfo->ascent + fontInfo->descent) / 2);
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
for(unsigned int i = 0; i < static_cast<unsigned int> (charCount); ++i) { for(unsigned int i = 0; i < static_cast<unsigned int> (charCount); ++i) {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(i < fontInfo->min_char_or_byte2 || if(i < fontInfo->min_char_or_byte2 ||
i > fontInfo->max_char_or_byte2) { i > fontInfo->max_char_or_byte2) {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
metrics.setWidth(i, static_cast<float>(6)); metrics.setWidth(i, static_cast<float>(6));
} else { } else {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
int p = i - fontInfo->min_char_or_byte2; int p = i - fontInfo->min_char_or_byte2;
metrics.setWidth(i, static_cast<float> ( //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] p = %d fontInfo->per_char = %p\n",__FILE__,__FUNCTION__,__LINE__,p,fontInfo->per_char);
if(fontInfo->per_char == NULL) {
XCharStruct *charinfo = &(fontInfo->min_bounds);
int charWidth = charinfo->rbearing - charinfo->lbearing;
int charHeight = charinfo->ascent + charinfo->descent;
int spanLength = (charWidth + 7) / 8;
metrics.setWidth(i, static_cast<float> (charWidth));
}
else {
metrics.setWidth(i, static_cast<float> (
fontInfo->per_char[p].rbearing fontInfo->per_char[p].rbearing
- fontInfo->per_char[p].lbearing)); - fontInfo->per_char[p].lbearing));
}
} }
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
glXUseXFont(fontInfo->fid, 0, charCount, base); glXUseXFont(fontInfo->fid, 0, charCount, base);
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
XFreeFont(display, fontInfo); XFreeFont(display, fontInfo);
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
#else #else
// we badly need a solution portable to more than just glx // we badly need a solution portable to more than just glx
//NOIMPL; //NOIMPL;