Merge "Define RS Graphics functions (rsg*)"
diff --git a/api/rs_core_math.spec b/api/rs_core_math.spec
index 47ba154..2432996 100644
--- a/api/rs_core_math.spec
+++ b/api/rs_core_math.spec
@@ -932,7 +932,7 @@
comment:
Returns the base two exponent of a value, where the mantissa is between 1.f (inclusive) and 2.f (exclusive).
- For example, ilogb(8.5f) returns 3.f. Because of the difference in mantissa, this number is one less than
+ For example, logb(8.5f) returns 3.f. Because of the difference in mantissa, this number is one less than
is returned by frexp().
ilogb() is similar but returns an integer.
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index f341b4e..38a0bf5 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -223,6 +223,7 @@
ALOGE("Unable to open shared library (%s): %s",
scriptSOName.c_str(), dlerror());
+#ifdef RS_COMPATIBILITY_LIB
// One final attempt to find the library in "/system/lib".
// We do this to allow bundled applications to use the compatibility
// library fallback path. Those applications don't have a private
@@ -237,6 +238,7 @@
ALOGE("Unable to open system shared library (%s): %s",
scriptSONameSystem.c_str(), dlerror());
}
+#endif
}
return loaded;
diff --git a/rsScriptGroup.cpp b/rsScriptGroup.cpp
index 791ab14..45a53e4 100644
--- a/rsScriptGroup.cpp
+++ b/rsScriptGroup.cpp
@@ -36,6 +36,14 @@
for (auto link : mLinks) {
delete link;
}
+
+ for (auto input : mInputs) {
+ input->mAlloc.clear();
+ }
+
+ for (auto output : mOutputs) {
+ output->mAlloc.clear();
+ }
}
ScriptGroup::IO::IO(const ScriptKernelID *kid) {