aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/animator/SkDisplayType.cpp2
-rw-r--r--src/animator/SkDrawColor.cpp4
-rw-r--r--src/core/SkBitmapProcState_matrixProcs.cpp10
-rw-r--r--src/core/SkBlitter_ARGB32.cpp4
-rw-r--r--src/core/SkDraw.cpp4
-rw-r--r--src/core/SkRegion.cpp4
-rw-r--r--src/core/SkScan_Path.cpp4
-rw-r--r--src/effects/gradients/SkGradientShaderPriv.h10
-rw-r--r--src/effects/gradients/SkLinearGradient.cpp10
-rw-r--r--src/sfnt/SkTypedEnum.h2
-rw-r--r--src/utils/SkBase64.cpp4
11 files changed, 14 insertions, 44 deletions
diff --git a/src/animator/SkDisplayType.cpp b/src/animator/SkDisplayType.cpp
index 7ee8dab5a4..92d120eb96 100644
--- a/src/animator/SkDisplayType.cpp
+++ b/src/animator/SkDisplayType.cpp
@@ -730,7 +730,7 @@ void SkDisplayType::UnitTest() {
SkDisplayable* test = CreateInstance(maker, gTypeNames[index].fType);
if (test == nullptr)
continue;
-#if defined _WIN32 && _MSC_VER >= 1300 && defined _INC_CRTDBG // only on windows, only if using "crtdbg.h"
+#if defined _WIN32 && defined _INC_CRTDBG // only on windows, only if using "crtdbg.h"
// we know that crtdbg puts 0xfdfdfdfd at the end of the block
// look for unitialized memory, signature 0xcdcdcdcd prior to that
int* start = (int*) test;
diff --git a/src/animator/SkDrawColor.cpp b/src/animator/SkDrawColor.cpp
index c2d0dae8fe..529d9a5954 100644
--- a/src/animator/SkDrawColor.cpp
+++ b/src/animator/SkDrawColor.cpp
@@ -52,7 +52,7 @@ static SkScalar RGB_to_HSV(SkColor color, HSV_Choice choice) {
return hue;
}
-#if defined _WIN32 && _MSC_VER >= 1300 // disable 'red', etc. may be used without having been initialized
+#if defined _WIN32 // disable 'red', etc. may be used without having been initialized
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -89,7 +89,7 @@ static SkColor HSV_to_RGB(SkColor color, HSV_Choice choice, SkScalar hsv) {
SkScalarRoundToInt(green), SkScalarRoundToInt(blue));
}
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp
index de97a905d4..16f1bc6f28 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)
-#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;
diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp
index a00ed86d8e..af62f2eb1d 100644
--- a/src/core/SkBlitter_ARGB32.cpp
+++ b/src/core/SkBlitter_ARGB32.cpp
@@ -62,7 +62,7 @@ const SkPixmap* SkARGB32_Blitter::justAnOpaqueColor(uint32_t* value) {
return nullptr;
}
-#if defined _WIN32 && _MSC_VER >= 1300 // disable warning : local variable used without having been initialized
+#if defined _WIN32 // disable warning : local variable used without having been initialized
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -252,7 +252,7 @@ void SkARGB32_Blitter::blitRect(int x, int y, int width, int height) {
}
}
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 409b652e93..70eb5732e1 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1435,7 +1435,7 @@ void SkDraw::drawText_asPaths(const char text[], size_t byteLength,
}
// disable warning : local variable used without having been initialized
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -1671,7 +1671,7 @@ void SkDraw::drawPosText(const char text[], size_t byteLength,
offset, *fMatrix, pos, scalarsPerPosition, textAlignment, cache.get(), drawOneGlyph);
}
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index 3a542c6169..ba6658182a 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -599,7 +599,7 @@ bool SkRegion::setRects(const SkIRect rects[], int count) {
///////////////////////////////////////////////////////////////////////////////
-#if defined _WIN32 && _MSC_VER >= 1300 // disable warning : local variable used without having been initialized
+#if defined _WIN32 // disable warning : local variable used without having been initialized
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -737,7 +737,7 @@ static SkRegion::RunType* operate_on_span(const SkRegion::RunType a_runs[],
return dst;
}
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif
diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp
index 4508865a99..6c1f1c052d 100644
--- a/src/core/SkScan_Path.cpp
+++ b/src/core/SkScan_Path.cpp
@@ -119,7 +119,7 @@ static void validate_edges_for_y(const SkEdge* edge, int curr_y) {
#define validate_edges_for_y(edge, curr_y)
#endif
-#if defined _WIN32 && _MSC_VER >= 1300 // disable warning : local variable used without having been initialized
+#if defined _WIN32 // disable warning : local variable used without having been initialized
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -392,7 +392,7 @@ static void PrePostInverseBlitterProc(SkBlitter* blitter, int y, bool isStart) {
///////////////////////////////////////////////////////////////////////////////
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 5b1b09b9fc..1a6d391de3 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -51,21 +51,11 @@ static inline SkFixed repeat_tileproc(SkFixed x) {
// 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 = SkLeftShift(x, 15) >> 31;
return (x ^ s) & 0xFFFF;
}
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-#pragma optimize("", on)
-#endif
-
///////////////////////////////////////////////////////////////////////////////
typedef SkFixed (*TileProc)(SkFixed);
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 8ad120991d..0a2b1581d5 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -17,12 +17,6 @@ static inline int repeat_8bits(int x) {
return x & 0xFF;
}
-// 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 int mirror_8bits(int x) {
if (x & 256) {
x = ~x;
@@ -30,10 +24,6 @@ static inline int mirror_8bits(int x) {
return x & 255;
}
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-#pragma optimize("", on)
-#endif
-
static SkMatrix pts_to_unit_matrix(const SkPoint pts[2]) {
SkVector vec = pts[1] - pts[0];
SkScalar mag = vec.length();
diff --git a/src/sfnt/SkTypedEnum.h b/src/sfnt/SkTypedEnum.h
index 73d7314885..19d57acf0a 100644
--- a/src/sfnt/SkTypedEnum.h
+++ b/src/sfnt/SkTypedEnum.h
@@ -19,7 +19,7 @@
#endif
//Detect if typed enums are supported.
-#if defined(_MSC_VER) && _MSC_VER >= 1400
+#if defined(_MSC_VER)
#define SK_TYPED_ENUMS
#elif defined(__clang__) && __has_extension(cxx_strong_enums)
diff --git a/src/utils/SkBase64.cpp b/src/utils/SkBase64.cpp
index 4c3078f255..b0268921ed 100644
--- a/src/utils/SkBase64.cpp
+++ b/src/utils/SkBase64.cpp
@@ -29,7 +29,7 @@ static const signed char decodeData[] = {
SkBase64::SkBase64() : fLength((size_t) -1), fData(nullptr) {
}
-#if defined _WIN32 && _MSC_VER >= 1300 // disable 'two', etc. may be used without having been initialized
+#if defined _WIN32 // disable 'two', etc. may be used without having been initialized
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -105,7 +105,7 @@ goHome:
return kNoError;
}
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 08:56:24 +0000