From b859fe653003862ca8603a60d561a053f752cc77 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 27 May 2014 17:03:25 +0000 Subject: [PATCH] Fixing windows warnings BUG=skia: R=bsalomon@google.com, epoger@google.com Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/298093006 git-svn-id: http://skia.googlecode.com/svn/trunk@14899 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleFilterFuzz.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 11a5ec1..0cba43c 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -100,10 +100,10 @@ static SkRect make_rect() { } static SkRegion make_region() { - SkIRect iRegion = SkIRect::MakeXYWH(SkIntToScalar(R(static_cast(kBitmapSize))), - SkIntToScalar(R(static_cast(kBitmapSize))), - SkIntToScalar(R(static_cast(kBitmapSize))), - SkIntToScalar(R(static_cast(kBitmapSize)))); + SkIRect iRegion = SkIRect::MakeXYWH(R(static_cast(kBitmapSize)), + R(static_cast(kBitmapSize)), + R(static_cast(kBitmapSize)), + R(static_cast(kBitmapSize))); return SkRegion(iRegion); } @@ -293,7 +293,8 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) { for (int i = 0; i < arraySize; ++i) { kernel.push_back() = make_scalar(); } - SkIPoint kernelOffset = SkIPoint::Make(R(size.width()), R(size.height())); + SkIPoint kernelOffset = SkIPoint::Make(R(SkIntToScalar(size.width())), + R(SkIntToScalar(size.height()))); filter = SkMatrixConvolutionImageFilter::Create(size, kernel.begin(), make_scalar(), -- 2.7.4