commit e7b3af24f1f2dc5382f688e2284afc3d3518da80
author Jason Sams <rjsams@android.com> Thu Aug 12 12:49:17 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 12 12:49:17 2010 -0700
tree f2813e382ccffc4f08985a5bbadf4591254a7fd5
parent 0bd010a5bdf4df3021c92c70e92008d6640c5da6
parent 10e5e570bab66a6cd543c857b26c576795eb240f

Merge "Fix field packer bug for U32 data. Fix initial refcounts in allocations. Support null references in allocations."

java/ImageProcessing/src/com/android/rs/image/ip.rsh

diff --git a/java/ImageProcessing/src/com/android/rs/image/ip.rsh b/java/ImageProcessing/src/com/android/rs/image/ip.rsh
index 34213f5..1d7a719 100644
--- a/java/ImageProcessing/src/com/android/rs/image/ip.rsh
+++ b/java/ImageProcessing/src/com/android/rs/image/ip.rsh
@@ -2,7 +2,7 @@
 
 #define MAX_RADIUS 25
 
-typedef struct {
+typedef struct FilterStruct_s {
     rs_allocation ain;
 
     float *gaussian; //[MAX_RADIUS * 2 + 1];

scriptc/rs_types.rsh

diff --git a/scriptc/rs_types.rsh b/scriptc/rs_types.rsh
index ddae7eb..fd9ac16 100644
--- a/scriptc/rs_types.rsh
+++ b/scriptc/rs_types.rsh
@@ -67,10 +67,7 @@
     float m[4];
 } rs_matrix2x2;
 
-typedef struct {
-    float w, x, y, z;
-} rs_quaternion;
-
+typedef float4 rs_quaternion;
 
 #define RS_PACKED __attribute__((packed, aligned(4)))