Debug Windows compiler complaint fixes
http://codereview.appspot.com/6208055/
git-svn-id: http://skia.googlecode.com/svn/trunk@3924 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index 084bdf2..e11acbc 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -41,9 +41,13 @@
SkMatrix matrix;
SkCanvas c(dev);
- matrix.setAll(-119.34097, -43.436558, 93489.945,
- 43.436558, -119.34097, 123.98426,
- 0, 0, 1);
+ matrix.setAll(SkFloatToScalar(-119.34097f),
+ SkFloatToScalar(-43.436558f),
+ SkFloatToScalar(93489.945f),
+ SkFloatToScalar(43.436558f),
+ SkFloatToScalar(-119.34097f),
+ SkFloatToScalar(123.98426f),
+ 0, 0, SK_Scalar1);
c.concat(matrix);
SkBitmap bm;
@@ -53,9 +57,13 @@
SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
SkShader::kRepeat_TileMode);
- matrix.setAll(0.0078740157, 0, 249,
- 0, 0.0078740157, 239,
- 0, 0, 1);
+ matrix.setAll(SkFloatToScalar(0.0078740157f),
+ 0,
+ SkIntToScalar(249),
+ 0,
+ SkFloatToScalar(0.0078740157f),
+ SkIntToScalar(239),
+ 0, 0, SK_Scalar1);
s->setLocalMatrix(matrix);
SkPaint paint;