diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index b088b7a06..ba4337403 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -46,6 +46,7 @@ 'SK_BUILD_FOR_WIN32', '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', + '_HAS_EXCEPTIONS=0', ], 'msvs_disabled_warnings': [ 4275, # An exported class was derived from a class that was not exported diff --git a/include/core/SkFloatingPoint.h b/include/core/SkFloatingPoint.h index 432f53d22..ad1669c4e 100644 --- a/include/core/SkFloatingPoint.h +++ b/include/core/SkFloatingPoint.h @@ -38,7 +38,7 @@ static inline float sk_float_copysign(float x, float y) { # define SK_BUILD_WITH_CLANG_CL 0 #endif #if (!SK_BUILD_WITH_CLANG_CL && __cplusplus >= 201103L) || (_MSC_VER >= 1800) - return copysign(x, y); + return copysignf(x, y); // Posix has demanded 'float copysignf(float, float)' (from C99) since Issue 6. #elif defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp index 3c5fc2e35..804784430 100644 --- a/samplecode/SampleRegion.cpp +++ b/samplecode/SampleRegion.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -15,6 +14,8 @@ #include "SkUtils.h" #include "SkImageDecoder.h" +#include + static void test_strokerect(SkCanvas* canvas) { int width = 100; int height = 100; @@ -115,11 +116,6 @@ static void test_text(SkCanvas* canvas) { drawFadingText(canvas, str, len, x, y, paint); } -#ifdef SK_BUILD_FOR_WIN -// windows doesn't have roundf -inline float roundf(float x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } -#endif - #ifdef SK_DEBUG static void make_rgn(SkRegion* rgn, int left, int top, int right, int bottom, int count, int32_t runs[]) {