commit b51c633c4f4de958600721830c0350bf0f4ac12f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 11 15:46:05 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 11 15:46:05 2012 +0000
tree 20e738b82fec23b0f6738e3bb7ab08d1aff1d74a
parent 4151341273f8b57845f493d59734dc7bbbab8f47

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

src/gpu/gl/GrGLPath.cpp

diff --git a/src/gpu/gl/GrGLPath.cpp b/src/gpu/gl/GrGLPath.cpp
index 2fceaa3..e09d073 100644
--- a/src/gpu/gl/GrGLPath.cpp
+++ b/src/gpu/gl/GrGLPath.cpp
@@ -57,7 +57,9 @@
     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();