Skip to content

use more portable _stricmp #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikeedwards wants to merge 2 commits into
base: master
Choose a base branch
from
Open

use more portable _stricmp #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6731a
use more portable _stricmp
mikeedwards Dec 7, 2017
37d6276
comment out logging
mikeedwards Dec 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/txt/AttributedString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) );
}
Expand Down
4 changes: 2 additions & 2 deletions src/txt/TextLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -362,4 +362,4 @@ namespace txt
mLineHeight = 0.f;
mAscender = 0.f;
}
}
}