From 6a6731af6475cc6ae3615f750df753454bdcc61c Mon Sep 17 00:00:00 2001 From: Mike Edwards Date: Thu, 7 Dec 2017 13:19:55 -0500 Subject: [PATCH 1/2] use more portable _stricmp --- src/txt/AttributedString.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/txt/AttributedString.cpp b/src/txt/AttributedString.cpp index 583673e..c1d0224 100644 --- a/src/txt/AttributedString.cpp +++ b/src/txt/AttributedString.cpp @@ -178,7 +178,7 @@ namespace txt if( node->value_size() != 0 ) { mSubstrings.push_back( AttributedString::Substring( node->value(), mAttributesStack.top() ) ); } - else if( stricmp( node->name(), ATTR_LINE_BREAK ) == 0 ) { + else if( _stricmp( node->name(), ATTR_LINE_BREAK ) == 0 ) { if( !mSubstrings.size() ) { mSubstrings.push_back( AttributedString::Substring( "\n", mAttributesStack.top() ) ); } From 37d627617a3b4449ed4827812d46129bb73932ac Mon Sep 17 00:00:00 2001 From: Mike Edwards Date: Fri, 8 Dec 2017 16:48:40 -0500 Subject: [PATCH 2/2] comment out logging --- src/txt/TextLayout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/txt/TextLayout.cpp b/src/txt/TextLayout.cpp index f6447c6..7ec28f3 100644 --- a/src/txt/TextLayout.cpp +++ b/src/txt/TextLayout.cpp @@ -263,7 +263,7 @@ namespace txt for( auto& index : shapedGlyphs[i].textIndices ) { - ci::app::console() << lineBreaks[index] << std::endl; + //ci::app::console() << lineBreaks[index] << std::endl; if( lineBreaks[index] == ci::UNICODE_MUST_BREAK ) { // Add the current run then move to next line @@ -362,4 +362,4 @@ namespace txt mLineHeight = 0.f; mAscender = 0.f; } -} \ No newline at end of file +}