aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-11 15:46:05 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-11 15:46:05 +0000
commitb51c633c4f4de958600721830c0350bf0f4ac12f (patch)
tree20e738b82fec23b0f6738e3bb7ab08d1aff1d74a
parent4151341273f8b57845f493d59734dc7bbbab8f47 (diff)
Fix Fixed-Point build by changing static_assert around scalar=float to a runtime crash.
git-svn-id: http://skia.googlecode.com/svn/trunk@4222 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/gpu/gl/GrGLPath.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLPath.cpp b/src/gpu/gl/GrGLPath.cpp
index 2fceaa3209..e09d073ee2 100644
--- a/src/gpu/gl/GrGLPath.cpp
+++ b/src/gpu/gl/GrGLPath.cpp
@@ -57,7 +57,9 @@ GrGLPath::GrGLPath(GrGpuGL* gpu, const SkPath& path) : INHERITED(gpu) {
SkPath::Iter iter(path, true);
SkSTArray<16, GrGLubyte, true> pathCommands;
- GR_STATIC_ASSERT(SK_SCALAR_IS_FLOAT); // assuming SkPoint is floats
+#ifndef SK_SCALAR_IS_FLOAT
+ GrCrash("Expected scalar is float.");
+#endif
SkSTArray<16, SkPoint, true> pathPoints;
int verbCnt = path.countVerbs();