commit 9d12f5c11b56ef51ba2c95db721ae7e5bab27023
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 29 18:08:18 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 29 18:08:18 2011 +0000
tree 61cce930350f9ca04a8beb8dea581033baf63b3b
parent 6f92f18b6266098a74cd90ff7b88328acc439d17

Fix some VS2010 warnings
Review URL: http://codereview.appspot.com/5155043




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

gpu/src/GrContext.cpp

diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp
index 6aaa28b..e0c7b55 100644
--- a/gpu/src/GrContext.cpp
+++ b/gpu/src/GrContext.cpp
@@ -856,8 +856,8 @@
                          scale * GR_Scalar1 / src->height());
         sampler.setMatrix(sampleM);
         target->setSamplerState(kOffscreenStage, sampler);
-        GrRect rect = SkRect::MakeWH(scale * tileRect.width(),
-                                     scale * tileRect.height());
+        GrRect rect = SkRect::MakeWH(SkIntToScalar(scale * tileRect.width()),
+                                     SkIntToScalar(scale * tileRect.height()));
         target->drawSimpleRect(rect, NULL, 1 << kOffscreenStage);
         
         src = record->fOffscreen1.texture();
@@ -896,7 +896,8 @@
     sampleM.setScale(scale * GR_Scalar1 / src->width(),
                      scale * GR_Scalar1 / src->height());
     sampler.setMatrix(sampleM);
-    sampleM.setTranslate(-tileRect.fLeft, -tileRect.fTop);
+    sampleM.setTranslate(SkIntToScalar(-tileRect.fLeft),
+                         SkIntToScalar(-tileRect.fTop));
     sampler.preConcatMatrix(sampleM);
     target->setSamplerState(kOffscreenStage, sampler);
 
@@ -1506,23 +1507,23 @@
                 GrDrawTarget::AutoDeviceCoordDraw adcd(target, stageMask);
                 GrRect rect;
                 if (clipIBounds.fTop < bound.fTop) {
-                    rect.setLTRB(clipIBounds.fLeft, clipIBounds.fTop, 
-                                 clipIBounds.fRight, bound.fTop);
+                    rect.iset(clipIBounds.fLeft, clipIBounds.fTop, 
+                              clipIBounds.fRight, bound.fTop);
                     target->drawSimpleRect(rect, NULL, stageMask);
                 }
                 if (clipIBounds.fLeft < bound.fLeft) {
-                    rect.setLTRB(clipIBounds.fLeft, bound.fTop, 
-                                 bound.fLeft, bound.fBottom);
+                    rect.iset(clipIBounds.fLeft, bound.fTop, 
+                              bound.fLeft, bound.fBottom);
                     target->drawSimpleRect(rect, NULL, stageMask);
                 }
                 if (clipIBounds.fRight > bound.fRight) {
-                    rect.setLTRB(bound.fRight, bound.fTop, 
-                                 clipIBounds.fRight, bound.fBottom);
+                    rect.iset(bound.fRight, bound.fTop, 
+                              clipIBounds.fRight, bound.fBottom);
                     target->drawSimpleRect(rect, NULL, stageMask);
                 }
                 if (clipIBounds.fBottom > bound.fBottom) {
-                    rect.setLTRB(clipIBounds.fLeft, bound.fBottom, 
-                                 clipIBounds.fRight, clipIBounds.fBottom);
+                    rect.iset(clipIBounds.fLeft, bound.fBottom, 
+                              clipIBounds.fRight, clipIBounds.fBottom);
                     target->drawSimpleRect(rect, NULL, stageMask);
                 }
             }