haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle space character in OPENGL_GAL::BitmapText() 

Fixes: lp:1668455
* https://bugs.launchpad.net/kicad/+bug/1668455
This commit is contained in:
Maciej Suminski 2017-12-07 17:58:21 +01:00
parent 602ecf7502
commit ef8f5db024
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/gal/opengl/opengl_gal.cpp
View File

@ -945,8 +945,6 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
for( UTF8::uni_iter chIt = text.ubegin(), end = text.uend(); chIt < end; ++chIt ) for( UTF8::uni_iter chIt = text.ubegin(), end = text.uend(); chIt < end; ++chIt )
{ {
unsigned int c = *chIt; unsigned int c = *chIt;
wxASSERT_MSG( LookupGlyph(c) != nullptr, wxT( "Missing character in bitmap font atlas." ) );
wxASSERT_MSG( c != '\n' && c != '\r', wxT( "No support for multiline bitmap text yet" ) ); wxASSERT_MSG( c != '\n' && c != '\r', wxT( "No support for multiline bitmap text yet" ) );
// Handle overbar // Handle overbar
@ -1577,10 +1575,19 @@ int OPENGL_GAL::drawBitmapChar( unsigned long aChar )
const float TEX_X = font_image.width; const float TEX_X = font_image.width;
const float TEX_Y = font_image.height; const float TEX_Y = font_image.height;
const FONT_GLYPH_TYPE* glyph = LookupGlyph(aChar); // handle space
if( aChar == ' ' )
{
const FONT_GLYPH_TYPE* g = LookupGlyph( 'x' );
Translate( VECTOR2D( g->advance, 0 ) );
return g->advance;
}
const FONT_GLYPH_TYPE* glyph = LookupGlyph( aChar );
wxASSERT( glyph ); wxASSERT( glyph );
if( !glyph ) return 0; if( !glyph )
return 0;
const float X = glyph->atlas_x + font_information.smooth_pixels; const float X = glyph->atlas_x + font_information.smooth_pixels;
const float Y = glyph->atlas_y + font_information.smooth_pixels; const float Y = glyph->atlas_y + font_information.smooth_pixels;
@ -1634,10 +1641,7 @@ void OPENGL_GAL::drawBitmapOverbar( double aLength, double aHeight )
{ {
// To draw an overbar, simply draw an overbar // To draw an overbar, simply draw an overbar
const FONT_GLYPH_TYPE* glyph = LookupGlyph( '_' ); const FONT_GLYPH_TYPE* glyph = LookupGlyph( '_' );
wxASSERT( glyph ); wxCHECK( glyph, /* void */ );
if( !glyph )
return;
const float H = glyph->maxy - glyph->miny; const float H = glyph->maxy - glyph->miny;
@ -1672,7 +1676,7 @@ std::pair<VECTOR2D, float> OPENGL_GAL::computeBitmapTextSize( const UTF8& aText
unsigned int c = *chIt; unsigned int c = *chIt;
const FONT_GLYPH_TYPE* glyph = LookupGlyph( c ); const FONT_GLYPH_TYPE* glyph = LookupGlyph( c );
wxASSERT( glyph ); wxASSERT( c == ' ' || glyph ); // space is not in the atlas
// a few chars // a few chars
if( !glyph || // Not coded in font if( !glyph || // Not coded in font