summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-03-25 14:32:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-25 14:32:10 +0000
commit163b865564fdb4d491c54ee04efb17af80a18689 (patch)
tree247c2e2bc1c19590612b497b38df8303b950480e
parent686f041ea484abe23e5d70fcc141de687f38d1df (diff)
parentea96d791c7eca3eb5d003b8559b89a573f81dac9 (diff)
am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."
* commit 'ea96d791c7eca3eb5d003b8559b89a573f81dac9': 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]) {