commit 5468c9006e125a79f14a05e830dbf15a00661936
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 02 20:41:45 2012 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 02 20:41:45 2012 +0000
tree a369a18e0d37bd6f121b431cf5e28c4ba5c8d36e
parent b02af6edf3f23948c6298e90113cd2b40fc5f2e0

Disable optimization of certain bit-shift operations on Visual Studio 2010 only
to address http://code.google.com/p/skia/issues/detail?id=472
Review URL: https://codereview.appspot.com/5607058

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

src/effects/SkGradientShader.cpp

diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp
index ef3edc0..4bbc96c 100644
--- a/src/effects/SkGradientShader.cpp
+++ b/src/effects/SkGradientShader.cpp
@@ -71,6 +71,12 @@
 
 // Mirror
 
+// Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly.
+// See http://code.google.com/p/skia/issues/detail?id=472
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#pragma optimize("", off)
+#endif
+
 static inline SkFixed mirror_tileproc(SkFixed x) {
     int s = x << 15 >> 31;
     return (x ^ s) & 0xFFFF;
@@ -99,6 +105,10 @@
 #endif
 }
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#pragma optimize("", on)
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef SkFixed (*TileProc)(SkFixed);