Warnings as errors fix

git-svn-id: http://skia.googlecode.com/svn/trunk@11250 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp
index 8904d7c..708a706 100644 (file)
--- 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 ecc8074..5d5f290 100644 (file)
--- 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));
 }