summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsScriptC_Lib.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2011-03-03 16:14:00 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-03 16:14:00 -0800
commit6e71c954faff34b78a2952436b4f48d84a8c20cd (patch)
treee7e35a26c22f3ff6a00a739608aa9e82e8f2efb8 /libs/rs/rsScriptC_Lib.cpp
parent389bf4f734f1820e31f8807d117b6b15ded9ff8b (diff)
parent1bf1f8df178170ee3d4224f3c92a1b724d783178 (diff)
downloadframeworks_base-6e71c954faff34b78a2952436b4f48d84a8c20cd.zip
frameworks_base-6e71c954faff34b78a2952436b4f48d84a8c20cd.tar.gz
frameworks_base-6e71c954faff34b78a2952436b4f48d84a8c20cd.tar.bz2
Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
Diffstat (limited to 'libs/rs/rsScriptC_Lib.cpp')
-rw-r--r--libs/rs/rsScriptC_Lib.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index 80da8ae..7c64184 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -35,6 +35,7 @@ using namespace android::renderscript;
// Math routines
//////////////////////////////////////////////////////////////////////////////
+#if 0
static float SC_sinf_fast(float x) {
const float A = 1.0f / (2.0f * M_PI);
const float B = -16.0f;
@@ -70,6 +71,7 @@ static float SC_cosf_fast(float x) {
const float y = B * x * fabsf(x) + C * x;
return 0.2215f * (y * fabsf(y) - y) + y;
}
+#endif
static float SC_randf(float max) {
float r = (float)rand();