Update JNI code in preparation for ICU 59 switching to C++11 char16_t. am: 253e515259

am: 042534c352

Change-Id: I34b8a04b7589dc8cc5850aba5c3d50aa2c1b4e02
This commit is contained in:
Fredrik Roubert
2017-07-18 11:14:55 +00:00
committed by android-build-merger

View File

@@ -42,7 +42,7 @@ static jint runBidi(JNIEnv* env, jobject obj, jint dir, jcharArray chsArray,
// Set callbacks to override bidi classes of new emoji // Set callbacks to override bidi classes of new emoji
ubidi_setClassCallback( ubidi_setClassCallback(
bidi, minikin::emojiBidiOverride, nullptr, nullptr, nullptr, &status); bidi, minikin::emojiBidiOverride, nullptr, nullptr, nullptr, &status);
ubidi_setPara(bidi, chs, n, dir, NULL, &status); ubidi_setPara(bidi, reinterpret_cast<const UChar*>(chs), n, dir, NULL, &status);
if (U_SUCCESS(status)) { if (U_SUCCESS(status)) {
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
info[i] = ubidi_getLevelAt(bidi, i); info[i] = ubidi_getLevelAt(bidi, i);