summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2009-05-01 08:24:01 -0400
committerMike Reed <reed@google.com>2009-05-01 08:24:01 -0400
commitad8b8f57a457ff615112b7fa4987f39e75fc5ff6 (patch)
tree70a7054457a9c16be733df87a8a74140a7b0a015 /core/jni
parenta56b318cf2d4c3700899f9de394c5635761dda66 (diff)
downloadframeworks_base-ad8b8f57a457ff615112b7fa4987f39e75fc5ff6.zip
frameworks_base-ad8b8f57a457ff615112b7fa4987f39e75fc5ff6.tar.gz
frameworks_base-ad8b8f57a457ff615112b7fa4987f39e75fc5ff6.tar.bz2
pass original ptrs to JNI release functions (instead of += index to them)
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android/graphics/Canvas.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp
index bd6fea8..93d68cb 100644
--- a/core/jni/android/graphics/Canvas.cpp
+++ b/core/jni/android/graphics/Canvas.cpp
@@ -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);
}