commit b1e218e782261304440199642f1b98e7ba96b525
author junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Feb 13 22:27:58 2012 +0000
committer junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Feb 13 22:27:58 2012 +0000
tree a077d2446b764e60d41ac2a2f6c7ddffbb5752cc
parent 8f9ecbd3466d4330886b4c23b06e75b468c795ad

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

src/utils/SkDeferredCanvas.cpp

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;
         }
     }