Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2058)

Unified Diff: samplecode/SampleRegion.cpp

Issue 1244173005: Compile with VS2015. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gyp/common_conditions.gypi ('K') | « include/core/SkFloatingPoint.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleRegion.cpp
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 3c5fc2e35cf0ac445c387b6f0373ac959b2b6cfc..80478443071911218151ebd1bdcb80539fbdac39 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 <math.h>
+
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[]) {
« gyp/common_conditions.gypi ('K') | « include/core/SkFloatingPoint.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698