aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2009-05-01 09:32:23 -0400
committerMike Reed <reed@google.com>2009-05-01 14:07:59 -0400
commiteba9f316916f3381d6a5dd5c1300fea6ec6da8dc (patch)
treec4734e82435139f3234d4ca51a84daba9b4a8c39 /src/utils
parentcd9f913643f6d8fb1a8bdc45b275f0544ea81a08 (diff)
downloadexternal_skia-eba9f316916f3381d6a5dd5c1300fea6ec6da8dc.zip
external_skia-eba9f316916f3381d6a5dd5c1300fea6ec6da8dc.tar.gz
external_skia-eba9f316916f3381d6a5dd5c1300fea6ec6da8dc.tar.bz2
refresh from skia/trunk
- catch overflow from mask size computation - add kADD_Mode to porterduff (for webkit) - support interlace images in png
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/SkNinePatch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp
index b8e11fb..3d85edc 100644
--- a/src/utils/SkNinePatch.cpp
+++ b/src/utils/SkNinePatch.cpp
@@ -186,7 +186,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
if (numXDivs == 2 && numYDivs <= 2) {
mesh.fIndices = g3x3Indices;
} else {
- int n = fillIndices(indices, numXDivs + 1, numYDivs + 1);
+ SkDEBUGCODE(int n =) fillIndices(indices, numXDivs + 1, numYDivs + 1);
SkASSERT(n == indexCount);
mesh.fIndices = indices;
}