Adding missing SkIntToScalar to resolve DeferredCanvas unit test failures with fixed-point build
TBR=reed
TEST=DeferredCanvas unit test
git-svn-id: http://skia.googlecode.com/svn/trunk@3182 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index 27fc0c5..19b98a8 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -180,9 +180,10 @@
// The following test holds with AA enabled, and is conservative
// by a 0.5 pixel margin with AA disabled
- if (transformedRect.fLeft > 0 || transformedRect.fTop > 0 ||
- transformedRect.fRight < canvasSize.fWidth ||
- transformedRect.fBottom < canvasSize.fHeight) {
+ if (transformedRect.fLeft > SkIntToScalar(0) ||
+ transformedRect.fTop > SkIntToScalar(0) ||
+ transformedRect.fRight < SkIntToScalar(canvasSize.fWidth) ||
+ transformedRect.fBottom < SkIntToScalar(canvasSize.fHeight)) {
return false;
}
}
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 7fbb581..17adb52 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -57,7 +57,8 @@
fullRect.setXYWH(SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(gWidth),
SkIntToScalar(gHeight));
SkRect partialRect;
- partialRect.setXYWH(0, 0, 1, 1);
+ partialRect.setXYWH(SkIntToScalar(0), SkIntToScalar(0),
+ SkIntToScalar(1), SkIntToScalar(1));
create(&store, SkBitmap::kARGB_8888_Config, 0xFFFFFFFF);
SkDevice device(store);
SkDeferredCanvas canvas(&device);