summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-07-07 11:55:51 -0700
committer Jason Sams <rjsams@android.com> 2010-07-07 17:08:07 -0700
commit6c8c2f22e9c7efc5b8fdb3d02a4c19be7a1728ec (patch)
tree3aee1f5a374340147cf9f57c38240439776d795c
parent0b9a22cf782ab8f837161bf3357e08471ff5b9f2 (diff)
Fix image processing resource problem for non high-density devices.
Protect include file. Change-Id: I5c6721033b37e35261b9fe424d74d3aef0620791
-rw-r--r--libs/rs/java/ImageProcessing/res/drawable/data.jpgbin0 -> 76367 bytes
-rw-r--r--libs/rs/scriptc/rs_math.rsh5
2 files changed, 4 insertions, 1 deletions
diff --git a/libs/rs/java/ImageProcessing/res/drawable/data.jpg b/libs/rs/java/ImageProcessing/res/drawable/data.jpg
new file mode 100644
index 000000000000..81a87b1726c2
--- /dev/null
+++ b/libs/rs/java/ImageProcessing/res/drawable/data.jpg
Binary files differ
diff --git a/libs/rs/scriptc/rs_math.rsh b/libs/rs/scriptc/rs_math.rsh
index 8bf53bf2666c..370929676a2b 100644
--- a/libs/rs/scriptc/rs_math.rsh
+++ b/libs/rs/scriptc/rs_math.rsh
@@ -1,3 +1,6 @@
+#ifndef __RS_MATH_RSH__
+#define __RS_MATH_RSH__
+
#include "rs_cl.rsh"
#include "rs_core.rsh"
@@ -52,4 +55,4 @@ extern void __attribute__((overloadable))rsForEach(rs_script, rs_allocation inpu
extern void __attribute__((overloadable))rsForEach(rs_script, rs_allocation input, int xStart, int yStart, int xEnd, int yEnd);
extern void __attribute__((overloadable))rsForEach(rs_script, rs_allocation input, rs_allocation output, int xStart, int yStart, int xEnd, int yEnd);
-
+#endif