From 3c8fb5171858a81b7f2f66b357891f41755c4033 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Thu, 21 Feb 2013 17:10:44 +0000 Subject: Fix warnings-as-errors on Mac10.6 and Win. Unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk@7811 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/ShaderImageFilterTest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/ShaderImageFilterTest.cpp') diff --git a/tests/ShaderImageFilterTest.cpp b/tests/ShaderImageFilterTest.cpp index 934e8c23e6..78aa796caa 100644 --- a/tests/ShaderImageFilterTest.cpp +++ b/tests/ShaderImageFilterTest.cpp @@ -12,16 +12,17 @@ #include "SkGradientShader.h" static void test_asShaderMode(skiatest::Reporter* reporter) { - SkRect r = SkRect::MakeWH(10, 10); // Make small 10x10 gradient + int w = 10, h = 10; + SkRect r = SkRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h)); // Make small 10x10 gradient SkBitmap filterResult, shaderResult; - filterResult.setConfig(SkBitmap::kARGB_8888_Config, r.width(), r.height()); + filterResult.setConfig(SkBitmap::kARGB_8888_Config, w, h); filterResult.allocPixels(); SkCanvas canvasFilter(filterResult); canvasFilter.clear(0x00000000); - shaderResult.setConfig(SkBitmap::kARGB_8888_Config, r.width(), r.height()); + shaderResult.setConfig(SkBitmap::kARGB_8888_Config, w, h); shaderResult.allocPixels(); SkCanvas canvasShader(shaderResult); canvasShader.clear(0x00000000); -- cgit v1.2.3