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

Fix compilation error

This commit is contained in:
Marek Roszko 2022-01-28 20:19:42 -05:00
parent c01e2dcfec
commit 7ec326c003
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/font/font.cpp
View File

@ -236,7 +236,7 @@ VECTOR2I FONT::drawMarkup( BOX2I* aBoundingBox, std::vector<std::unique_ptr<GLYP
const EDA_ANGLE& aAngle, bool aMirror, const VECTOR2I& aOrigin, const EDA_ANGLE& aAngle, bool aMirror, const VECTOR2I& aOrigin,
TEXT_STYLE_FLAGS aTextStyle ) const TEXT_STYLE_FLAGS aTextStyle ) const
{ {
MARKUP::MARKUP_PARSER markupParser( aText ); MARKUP::MARKUP_PARSER markupParser( aText.ToStdString() );
std::unique_ptr<MARKUP::NODE> root = markupParser.Parse(); std::unique_ptr<MARKUP::NODE> root = markupParser.Parse();
return ::drawMarkup( aBoundingBox, aGlyphs, root, aPosition, this, aSize, aAngle, aMirror, return ::drawMarkup( aBoundingBox, aGlyphs, root, aPosition, this, aSize, aAngle, aMirror,
@ -401,7 +401,7 @@ void wordbreakMarkup( std::vector<std::pair<wxString, int>>* aWords,
void FONT::wordbreakMarkup( std::vector<std::pair<wxString, int>>* aWords, const wxString& aText, void FONT::wordbreakMarkup( std::vector<std::pair<wxString, int>>* aWords, const wxString& aText,
const VECTOR2I& aSize, TEXT_STYLE_FLAGS aTextStyle ) const const VECTOR2I& aSize, TEXT_STYLE_FLAGS aTextStyle ) const
{ {
MARKUP::MARKUP_PARSER markupParser( aText ); MARKUP::MARKUP_PARSER markupParser( aText.ToStdString() );
std::unique_ptr<MARKUP::NODE> root = markupParser.Parse(); std::unique_ptr<MARKUP::NODE> root = markupParser.Parse();
::wordbreakMarkup( aWords, root, this, aSize, aTextStyle ); ::wordbreakMarkup( aWords, root, this, aSize, aTextStyle );