Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc15fcf authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am e5c47256: Merge change 873 into donut 

Merge commit 'e5c47256'

* commit 'e5c47256':
  pass original ptrs to JNI release functions (instead of += index to them)
parents ac7a3de4 e5c47256

core/jni/android/graphics/Canvas.cpp

+2 −4
Original line number Diff line number Diff line
@@ -722,8 +722,7 @@ public: 
        jsize textCount = env->GetArrayLength(text);

        SkScalar x_ = SkFloatToScalar(x);

        SkScalar y_ = SkFloatToScalar(y);

        textArray += index;

        canvas->drawText(textArray, count << 1, x_, y_, *paint);

        canvas->drawText(textArray + index, count << 1, x_, y_, *paint);

        env->ReleaseCharArrayElements(text, textArray, 0);

    }
@@ -767,8 +766,7 @@ public: 
            posPtr[indx].fX = SkFloatToScalar(posArray[indx << 1]);

            posPtr[indx].fY = SkFloatToScalar(posArray[(indx << 1) + 1]);

        }

        textArray += index;

        canvas->drawPosText(textArray, count << 1, posPtr, *paint);

        canvas->drawPosText(textArray + index, count << 1, posPtr, *paint);

        if (text) {

            env->ReleaseCharArrayElements(text, textArray, 0);

        }