Chromium Code Reviews| Index: src/core/SkBitmapProcState_matrixProcs.cpp |
| diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp |
| index de97a905d43b9ab5d5f3ac89ee63d56d625faf8f..16f1bc6f283ae54ff6781416089b6e306bd1708c 100644 |
| --- a/src/core/SkBitmapProcState_matrixProcs.cpp |
| +++ b/src/core/SkBitmapProcState_matrixProcs.cpp |
| @@ -171,22 +171,12 @@ static inline U16CPU fixed_repeat(SkFixed x) { |
| return x & 0xFFFF; |
| } |
| -// 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) |
|
mtklein
2016/03/10 17:37:47
This is a >= check... you sure we don't need this
bungeman-skia
2016/03/10 17:54:23
This was fixed in Visual Studio 2012 (https://conn
|
| -#pragma optimize("", off) |
| -#endif |
| - |
| static inline U16CPU fixed_mirror(SkFixed x) { |
| SkFixed s = SkLeftShift(x, 15) >> 31; |
| // s is FFFFFFFF if we're on an odd interval, or 0 if an even interval |
| return (x ^ s) & 0xFFFF; |
| } |
| -#if defined(_MSC_VER) && (_MSC_VER >= 1600) |
| -#pragma optimize("", on) |
| -#endif |
| - |
| static SkBitmapProcState::FixedTileProc choose_tile_proc(unsigned m) { |
| if (SkShader::kClamp_TileMode == m) { |
| return fixed_clamp; |