summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-03-25 14:38:25 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-25 14:38:25 +0000
commit2c595209f99103be6572bafe4ad7faf52f81bbcb (patch)
tree4e4529e61c01e51466daf87dc76a575ba8965144
parentf71eebdb22a251538a81c1fce8d5bf80ce5d7619 (diff)
parent163b865564fdb4d491c54ee04efb17af80a18689 (diff)
am 163b8655: am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."
* commit '163b865564fdb4d491c54ee04efb17af80a18689': Fix scaleNinePatch.
-rw-r--r--core/jni/android/graphics/BitmapFactory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index fc587c0843c4..2b9a5c4a049c 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -115,7 +115,7 @@ static void scaleNinePatchChunk(android::Res_png_9patch* chunk, float scale) {
}
}
- int32_t* yDivs = chunk->getXDivs();
+ int32_t* yDivs = chunk->getYDivs();
for (int i = 0; i < chunk->numYDivs; i++) {
yDivs[i] = int32_t(yDivs[i] * scale + 0.5f);
if (i > 0 && yDivs[i] == yDivs[i - 1]) {