summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-06-07 14:51:42 -0700
committerAndroid Code Review <code-review@android.com>2010-06-07 14:51:42 -0700
commit6af5a9ea4d7efb16c859467389c9e3cb9352eaa6 (patch)
tree8e0c4720bb5e4129a49a79c298e6102712dcce6d
parent47633f86279bc1854660d95a0b02bfa5ff14ad04 (diff)
parent92ce5734b52ef014c80cc6335112a027188b3eb6 (diff)
downloadframeworks_base-6af5a9ea4d7efb16c859467389c9e3cb9352eaa6.zip
frameworks_base-6af5a9ea4d7efb16c859467389c9e3cb9352eaa6.tar.gz
frameworks_base-6af5a9ea4d7efb16c859467389c9e3cb9352eaa6.tar.bz2
Merge "Canvas.drawVertices: correct color range-check"
-rw-r--r--graphics/java/android/graphics/Canvas.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 345f810..76cde73 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -1221,7 +1221,7 @@ public class Canvas {
checkRange(texs.length, texOffset, vertexCount);
}
if (colors != null) {
- checkRange(colors.length, colorOffset, vertexCount);
+ checkRange(colors.length, colorOffset, vertexCount / 2);
}
if (indices != null) {
checkRange(indices.length, indexOffset, indexCount);