aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-02-02 10:03:22 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-02 15:43:08 +0000
commit529bcd6db7ebfa3a9e4898696cfc869839045176 (patch)
treec2fc853e9846f1ca871c75b43a06926fe468129d /src
parent7e97dc0aa1ff5b03593e689fe1cfdcc3550c169e (diff)
Revert "Revert "SkScalar: delete code that doesn't compile.""
This reverts commit 8233fc82b00763d37a7b0db7890b15c7d58939d4. Change-Id: Ia32ccdb3b385ed28e1b41e553c7d80cf803522cc Reviewed-on: https://skia-review.googlesource.com/7899 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/gl/GrGLPath.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLPath.cpp b/src/gpu/gl/GrGLPath.cpp
index 05460187ef..f7e6bd16de 100644
--- a/src/gpu/gl/GrGLPath.cpp
+++ b/src/gpu/gl/GrGLPath.cpp
@@ -218,7 +218,7 @@ void GrGLPath::InitPathObjectPathData(GrGLGpu* gpu,
const SkPath& skPath) {
SkASSERT(!skPath.isEmpty());
-#ifdef SK_SCALAR_IS_FLOAT
+#if 1 // SK_SCALAR_IS_FLOAT
// This branch does type punning, converting SkPoint* to GrGLfloat*.
if ((skPath.getSegmentMasks() & SkPath::kConic_SegmentMask) == 0) {
int verbCnt = skPath.countVerbs();