commit 0e51577a14f903ffeafa117a75954baeb173ffb9
author humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 07 19:54:40 2013 +0000
committer humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 07 19:54:40 2013 +0000
tree 3f3d849f3b6ec7778660f0da19f5d4175ba9f800
parent af2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec

fix warning from scalar --> int32 conversion

BUG=

Review URL: https://codereview.appspot.com/7065050

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

src/animator/SkScript.cpp

diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp
index 92e8f3c..64e8b5c 100644
--- a/src/animator/SkScript.cpp
+++ b/src/animator/SkScript.cpp
@@ -1514,7 +1514,7 @@
             break;
         case SkType_Float:
             if (type == SkType_Int) {
-                if ((uint32_t)operand.fS32 == SK_NaN32)
+                if (operand.fS32 == SK_NaN32)
                     operand.fScalar = SK_ScalarNaN;
                 else if (SkAbs32(operand.fS32) == SK_MaxS32)
                     operand.fScalar = SkSign32(operand.fS32) * SK_ScalarMax;
@@ -1562,7 +1562,7 @@
 
 SkScalar SkScriptEngine::IntToScalar(int32_t s32) {
     SkScalar scalar;
-    if ((uint32_t)s32 == SK_NaN32)
+    if (s32 == SK_NaN32)
         scalar = SK_ScalarNaN;
     else if (SkAbs32(s32) == SK_MaxS32)
         scalar = SkSign32(s32) * SK_ScalarMax;