From 558d5d3f08bcb4ae5c65d318234fe1f3ca61c0b4 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 13 Sep 2013 12:54:33 +0000 Subject: Warnings as errors fix git-svn-id: http://skia.googlecode.com/svn/trunk@11250 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkMorphologyImageFilter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/effects/SkMorphologyImageFilter.cpp') diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index ecc8074b0c..5d5f29058b 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -24,8 +24,8 @@ SkMorphologyImageFilter::SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer : INHERITED(buffer) { fRadius.fWidth = buffer.readInt(); fRadius.fHeight = buffer.readInt(); - buffer.validate(SkScalarIsFinite(fRadius.fWidth) && - SkScalarIsFinite(fRadius.fHeight) && + buffer.validate(SkScalarIsFinite(SkIntToScalar(fRadius.fWidth)) && + SkScalarIsFinite(SkIntToScalar(fRadius.fHeight)) && (fRadius.fWidth >= 0) && (fRadius.fHeight >= 0)); } -- cgit v1.2.3