Eliminate Linux compile warnings throughout animator/ with variable

initializations, missing braces.



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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/animator/SkMemberInfo.cpp b/src/animator/SkMemberInfo.cpp
index 00b4af99e2..7fae5033fd 100644
--- a/src/animator/SkMemberInfo.cpp
+++ b/src/animator/SkMemberInfo.cpp
@@ -89,8 +89,9 @@ bool SkMemberInfo::getArrayValue(const SkDisplayable* displayable, int index, Sk
         if (dispArray->values.count() <= index)
             return false;
         type = dispArray->values.getType();
-    } else
+    } else {
         SkASSERT(0); // incomplete
+    }
     size_t byteSize = GetSize(type);
     memcpy(value, valuePtr + index * byteSize, byteSize);
     return true;
@@ -257,7 +258,7 @@ scriptCommon: {
             SkASSERT(success);
             if (scriptValue.fType == SkType_Displayable) {
                 if (type == SkType_String) {
-                    const char* charPtr;
+                    const char* charPtr = NULL;
                     maker.findKey(scriptValue.fOperand.fDisplayable, &charPtr);
                     scriptValue.fOperand.fString = new SkString(charPtr);
                     scriptValue.fType = SkType_String;