commit c990603b787fd573af8a5733535010020a7eb102
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 16 16:21:28 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 16 16:21:28 2009 +0000
tree d433a4a876ac09587b67b75cd3141b88e8e80609
parent 4cb8bd18d9449328f4d27f22ad4045ecf2aa06bd

make these compile w/o SK_CAN_USE_FLOAT



git-svn-id: http://skia.googlecode.com/svn/trunk@70 2bbb7eff-a529-9590-31e7-b0007b416f81

Makefile

diff --git a/Makefile b/Makefile
index a30cfdc..b240e97 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 DEFINES = -DSK_BUILD_FOR_UNIX
 HIDE = @
 
-#DEFINES += -DSK_RELEASE
-DEFINES += -DSK_DEBUG -DSK_SUPPORT_UNITTEST
+DEFINES += -DSK_RELEASE
+#DEFINES += -DSK_DEBUG -DSK_SUPPORT_UNITTEST
 #DEFINES += -DSK_SCALAR_IS_FIXED
 
 # start with the core (required)

src/core/SkGraphics.cpp

diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp
index 2ad44cd..7536ca8 100644
--- a/src/core/SkGraphics.cpp
+++ b/src/core/SkGraphics.cpp
@@ -148,6 +148,7 @@
 
 #endif
 
+#ifdef SK_CAN_USE_FLOAT
 #include "SkFloatBits.h"
 
 static inline float fast_inc(float x) {
@@ -268,13 +269,16 @@
     return sum;
 }
 #endif
+#endif
 
 void SkGraphics::Init(bool runUnitTests)
 {
     SkGlobals::Init();
 
+#ifdef SK_CAN_USE_FLOAT
 //    time_math();
 //    time_intToFloat();
+#endif
     
 #ifdef BUILD_EMBOSS_TABLE
     SkEmbossMask_BuildTable();

src/core/SkMath.cpp

diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index 2655586..e0babeb 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -576,6 +576,7 @@
 
 #ifdef SK_SUPPORT_UNITTEST
 static void check_length(const SkPoint& p, SkScalar targetLen) {
+#ifdef SK_CAN_USE_FLOAT
     float x = SkScalarToFloat(p.fX);
     float y = SkScalarToFloat(p.fY);
     float len = sk_float_sqrt(x*x + y*y);
@@ -583,6 +584,7 @@
     len /= SkScalarToFloat(targetLen);
 
     SkASSERT(len > 0.999f && len < 1.001f);
+#endif
 }
 #endif
 
@@ -698,6 +700,7 @@
 
 #ifdef SK_SUPPORT_UNITTEST
 static void test_muldiv255() {
+#ifdef SK_CAN_USE_FLOAT
     for (int a = 0; a <= 255; a++) {
         for (int b = 0; b <= 255; b++) {
             int ab = a * b;
@@ -716,6 +719,7 @@
             SkASSERT(iround <= b);
         }
     }
+#endif
 }
 #endif