commit ee73498ddf896f6ed003e9ce1fab87aefda90173
author Jason Sams <rjsams@android.com> Thu Aug 12 12:44:02 2010 -0700
committer Jason Sams <rjsams@android.com> Thu Aug 12 12:47:04 2010 -0700
tree e7695920638136e1cbdfbeade8cfb78b4fe8bfce
parent 5320b326a48a473f58d0e99a81d75f277254b958

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

Change-Id: Ifba6406ba750e69737bd77fa7df5d7fb8e27a5b4

libs/rs/rsAllocation.cpp

diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index 7d31bd6..7e44fea 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -34,6 +34,9 @@
     init(rsc, type);
 
     mPtr = malloc(mType->getSizeBytes());
+    if (mType->getElement()->getHasReferences()) {
+        memset(mPtr, 0, mType->getSizeBytes());
+    }
     if (!mPtr) {
         LOGE("Allocation::Allocation, alloc failure");
     }

libs/rs/rsElement.cpp

diff --git a/libs/rs/rsElement.cpp b/libs/rs/rsElement.cpp
index 5dee1fb..2602dd4 100644
--- a/libs/rs/rsElement.cpp
+++ b/libs/rs/rsElement.cpp
@@ -266,7 +266,7 @@
         if (mComponent.isReference()) {
             ObjectBase *const*obp = static_cast<ObjectBase *const*>(ptr);
             ObjectBase *ob = obp[0];
-            ob->incSysRef();
+            if (ob) ob->incSysRef();
         }
         return;
     }
@@ -285,7 +285,7 @@
         if (mComponent.isReference()) {
             ObjectBase *const*obp = static_cast<ObjectBase *const*>(ptr);
             ObjectBase *ob = obp[0];
-            ob->decSysRef();
+            if (ob) ob->decSysRef();
         }
         return;
     }