commit 706f6212c60dd8861a0ae922a77c455a08360aa3
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 14 17:51:23 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 14 17:51:23 2012 +0000
tree 659a17427fdbb4b15a49ba7766c0fc8dafadd228
parent 6f31a3b7d7996e4126fde27dbf7ee1f4852cb537

Fixes for Windows Release compiler complaints (overflow in const arith)

http://codereview.appspot.com/6210056/



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

src/animator/SkDisplayNumber.cpp

diff --git a/src/animator/SkDisplayNumber.cpp b/src/animator/SkDisplayNumber.cpp
index 282dab6..ed24ce8 100644
--- a/src/animator/SkDisplayNumber.cpp
+++ b/src/animator/SkDisplayNumber.cpp
@@ -31,6 +31,13 @@
 
 DEFINE_GET_MEMBER(SkDisplayNumber);
 
+#if defined _WIN32
+#pragma warning ( push )
+// we are intentionally causing an overflow here
+//      (warning C4756: overflow in constant arithmetic)
+#pragma warning ( disable : 4756 )
+#endif
+
 bool SkDisplayNumber::getProperty(int index, SkScriptValue* value) const {
     SkScalar constant;
     switch (index) {
@@ -57,3 +64,7 @@
     value->fType = SkType_Float;
     return true;
 }
+
+#if defined _WIN32
+#pragma warning ( pop )
+#endif
\ No newline at end of file