summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2011-04-19 18:22:28 -0700
committerStephen Hines <srhines@google.com>2011-04-27 13:30:43 -0700
commit4658d779e37b0127060438b4cb364c3e0eab5956 (patch)
tree5ce008a69e5dd99a9c3116629da74c802c77c6f6 /libs/rs
parente1e3d7d97caf89307230e85997f5d23074b216cb (diff)
downloadframeworks_base-4658d779e37b0127060438b4cb364c3e0eab5956.zip
frameworks_base-4658d779e37b0127060438b4cb364c3e0eab5956.tar.gz
frameworks_base-4658d779e37b0127060438b4cb364c3e0eab5956.tar.bz2
Check setName() for null string + fix rsRand().
Change-Id: I5e0042930209861e2eb9acc91380e9473dac0997
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/rsScriptC_Lib.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index 23230a6..8a4789a 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -76,13 +76,15 @@ static float SC_cosf_fast(float x) {
static float SC_randf(float max) {
float r = (float)rand();
r *= max;
- return r / RAND_MAX;
+ r /= RAND_MAX;
+ return r;
}
static float SC_randf2(float min, float max) {
float r = (float)rand();
+ r /= RAND_MAX;
r = r * (max - min) + min;
- return r / RAND_MAX;
+ return r;
}
static int SC_randi(int max) {