diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 12:54:33 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 12:54:33 +0000 |
| commit | 558d5d3f08bcb4ae5c65d318234fe1f3ca61c0b4 (patch) | |
| tree | f7d47f6aabd1baea624152a1da910bdea09ab102 /src/effects/SkMorphologyImageFilter.cpp | |
| parent | 4b681bc95b14e081f1cc5b68cb755d57fc8eb977 (diff) | |
Warnings as errors fix
git-svn-id: http://skia.googlecode.com/svn/trunk@11250 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkMorphologyImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)); } |