Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build"

Browse Source
This commit is contained in:
Nick Kralevich
2014-11-14 21:49:17 +00:00
committed by Android (Google) Code Review
parent ed5f8167de 660538f82a
commit bfd5760da2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_text_StaticLayout.cpp
View File

@@ -355,7 +355,7 @@ class GreedyLineBreaker : public LineBreaker {
breaks->push_back(mPrimitives[goodBreakIndex].location);
widths->push_back(goodBreakWidth);
flags->push_back(firstTabIndex < goodBreakIndex);
firstTabIndex = SIZE_MAX;
firstTabIndex = INT_MAX;
} else {
// must split a word because there is no other option
i = breakIndex; // no +1 because of i++
@@ -364,7 +364,7 @@ class GreedyLineBreaker : public LineBreaker {
breaks->push_back(mPrimitives[breakIndex].location);
widths->push_back(breakWidth);
flags->push_back(firstTabIndex < breakIndex);
firstTabIndex = SIZE_MAX;
firstTabIndex = INT_MAX;
}
printedWidth = width = 0;
goodBreakFound = breakFound = false;
@@ -388,7 +388,7 @@ class GreedyLineBreaker : public LineBreaker {
breaks->push_back(p.location);
widths->push_back(printedWidth);
flags->push_back(firstTabIndex < i);
firstTabIndex = SIZE_MAX;
firstTabIndex = INT_MAX;
printedWidth = width = 0;
goodBreakFound = breakFound = false;
goodBreakWidth = breakWidth = 0;