aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-08-22 18:14:07 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-08-22 18:14:07 +0000
commit6b66c398f998418a001d664dce54f502c1d5e167 (patch)
tree70582b626b9e107b33fb3627bb0734faa14a262c
parent2a151fe02be19cc56da7a931d25fd2f8b3acff66 (diff)
Fix gm/bitmapscroll.cpp to actually draw in both Debug and Release modes.
Review URL: http://codereview.appspot.com/4922047 git-svn-id: http://skia.googlecode.com/svn/trunk@2151 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gm/bitmapscroll.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/gm/bitmapscroll.cpp b/gm/bitmapscroll.cpp
index a4f7f32290..c12dd058d2 100644
--- a/gm/bitmapscroll.cpp
+++ b/gm/bitmapscroll.cpp
@@ -121,10 +121,12 @@ protected:
// Scroll a new copy of the bitmap, and then draw it.
// scrollRect() should always return true, even if it's a no-op
SkBitmap scrolledBitmap;
- SkASSERT(origBitmap.copyTo(
- &scrolledBitmap, origBitmap.config()));
- SkASSERT(scrolledBitmap.scrollRect(
- subset, scrollX * xMult, scrollY * yMult));
+ bool copyToReturnValue = origBitmap.copyTo(
+ &scrolledBitmap, origBitmap.config());
+ SkASSERT(copyToReturnValue);
+ bool scrollRectReturnValue = scrolledBitmap.scrollRect(
+ subset, scrollX * xMult, scrollY * yMult);
+ SkASSERT(scrollRectReturnValue);
canvas->drawBitmap(scrolledBitmap, bitmapX, bitmapY);
}
}