commit 5db3b6cce4e9e02415a0a31d95666c044c953ac2
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 12 20:38:57 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 12 20:38:57 2012 +0000
tree 2c3cfeb0d649843845038b2208ae2ad57479564f
parent 150d28465d340e3c6da6a3e1fd5adfdb128e61d0

Fix vs2010 int to scalar warnings



git-svn-id: http://skia.googlecode.com/svn/trunk@3032 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 518698e..d9b9f08 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1683,10 +1683,11 @@
                 const GrRect* srcRects[GrDrawState::kNumStages] = {NULL};
                 srcRects[kPathMaskStage] = &maskRect;
                 stageMask |= 1 << kPathMaskStage;
-                GrRect dstRect = GrRect::MakeLTRB(pathBounds.fLeft,
-                                                  pathBounds.fTop,
-                                                  pathBounds.fRight,
-                                                  pathBounds.fBottom);
+                GrRect dstRect = GrRect::MakeLTRB(
+                    SK_Scalar1* pathBounds.fLeft,
+                    SK_Scalar1* pathBounds.fTop,
+                    SK_Scalar1* pathBounds.fRight,
+                    SK_Scalar1* pathBounds.fBottom);
                 target->drawRect(dstRect, NULL, stageMask, srcRects, NULL);
                 target->drawState()->setTexture(kPathMaskStage, NULL);
                 if (GrIsFillInverted(fill)) {
@@ -1939,7 +1940,9 @@
     sampleM.setIDiv(src->width(), src->height());
     drawState->setTexture(0, src);
     drawState->sampler(0)->reset(sampleM);
-    SkRect rect = SkRect::MakeXYWH(0, 0, src->width(), src->height());
+    SkRect rect = SkRect::MakeXYWH(0, 0,
+                                   SK_Scalar1 * src->width(),
+                                   SK_Scalar1 * src->height());
     fGpu->drawSimpleRect(rect, NULL, 1 << 0);
 }