drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"

Browse Source 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
This commit is contained in:
Alan Lau
2014-07-28 19:57:55 +00:00
committed by Android Git Automerger
parent a665380b60 af60e56b39
commit 18b5f44c5e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_text_StaticLayout.cpp
View File

@ -63,7 +63,7 @@ static jintArray nLineBreakOpportunities(JNIEnv* env, jclass, jstring javaLocale
jcharArray inputText, jint length, jcharArray inputText, jint length,
jintArray recycle) { jintArray recycle) {
jintArray ret; jintArray ret;
std::vector<jint> breaks; std::vector<jint> breaks(16);
ScopedIcuLocale icuLocale(env, javaLocaleName); ScopedIcuLocale icuLocale(env, javaLocaleName);
if (icuLocale.valid()) { if (icuLocale.valid()) {
@ -84,7 +84,7 @@ static jintArray nLineBreakOpportunities(JNIEnv* env, jclass, jstring javaLocale
breaks.push_back(-1); // sentinel terminal value breaks.push_back(-1); // sentinel terminal value
if (recycle != NULL && static_cast<size_t>(env->GetArrayLength(recycle)) >= breaks.size()) { if (recycle != NULL && env->GetArrayLength(recycle) >= breaks.size()) {
ret = recycle; ret = recycle;
} else { } else {
ret = env->NewIntArray(breaks.size()); ret = env->NewIntArray(breaks.size());