diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkOrderedWriteBuffer.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp index 8904d7cde1..708a7067bd 100644 --- a/src/core/SkOrderedWriteBuffer.cpp +++ b/src/core/SkOrderedWriteBuffer.cpp @@ -296,7 +296,7 @@ void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) { const char* name = SkFlattenable::FactoryToName(factory); this->writeString(name); if (NULL == name) { - SkASSERT(!"Missing factory name"); + SkASSERT(0); // Missing factory name return; } } else if (fFactorySet) { 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)); } |