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

Don't presume all cached glyphs are outline glyphs. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15508
This commit is contained in:
Jeff Young 2023-08-26 16:12:12 +01:00
parent 468da441e5
commit 949458bbe1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/sch_field.cpp
View File

@ -94,8 +94,10 @@ SCH_FIELD::SCH_FIELD( const SCH_FIELD& aField ) :
for( const std::unique_ptr<KIFONT::GLYPH>& glyph : aField.m_renderCache ) for( const std::unique_ptr<KIFONT::GLYPH>& glyph : aField.m_renderCache )
{ {
KIFONT::OUTLINE_GLYPH* outline_glyph = static_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ); if( KIFONT::OUTLINE_GLYPH* outline = dynamic_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ) )
m_renderCache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline_glyph ) ); m_renderCache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline ) );
else if( KIFONT::STROKE_GLYPH* stroke = dynamic_cast<KIFONT::STROKE_GLYPH*>( glyph.get() ) )
m_renderCache.emplace_back( std::make_unique<KIFONT::STROKE_GLYPH>( *stroke ) );
} }
m_renderCacheValid = aField.m_renderCacheValid; m_renderCacheValid = aField.m_renderCacheValid;
@ -119,8 +121,10 @@ SCH_FIELD& SCH_FIELD::operator=( const SCH_FIELD& aField )
for( const std::unique_ptr<KIFONT::GLYPH>& glyph : aField.m_renderCache ) for( const std::unique_ptr<KIFONT::GLYPH>& glyph : aField.m_renderCache )
{ {
KIFONT::OUTLINE_GLYPH* outline_glyph = static_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ); if( KIFONT::OUTLINE_GLYPH* outline = dynamic_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ) )
m_renderCache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline_glyph ) ); m_renderCache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline ) );
else if( KIFONT::STROKE_GLYPH* stroke = dynamic_cast<KIFONT::STROKE_GLYPH*>( glyph.get() ) )
m_renderCache.emplace_back( std::make_unique<KIFONT::STROKE_GLYPH>( *stroke ) );
} }
m_renderCacheValid = aField.m_renderCacheValid; m_renderCacheValid = aField.m_renderCacheValid;