commit 162d6514e3cff62f97e7c76cf55ab6eb6ac355eb
author Stephen Hines <srhines@google.com> Wed Jun 25 20:50:05 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 25 03:43:48 2014 +0000
tree f6329894ba05d569ca98b56a1e6b762979f27b52
parent af3f15d35893e9ddd2b53780c431b185d9bbf1e4
parent f0a5078aaf6426e5524a847a0b17d09570fc00b8

Merge "Fix one last use of size_t instead of uint32_t."

rsScript.cpp

diff --git a/rsScript.cpp b/rsScript.cpp
index 327e7d9..27fe020 100644
--- a/rsScript.cpp
+++ b/rsScript.cpp
@@ -73,7 +73,7 @@
 }
 
 void Script::setVar(uint32_t slot, const void *val, size_t len, Element *e,
-                    const size_t *dims, size_t dimLen) {
+                    const uint32_t *dims, size_t dimLen) {
     if (slot >= mHal.info.exportedVariableCount) {
         ALOGE("Script::setVar unable to set allocation, invalid slot index: "
               "%u >= %zu", slot, mHal.info.exportedVariableCount);

rsScript.h

diff --git a/rsScript.h b/rsScript.h
index ce4878a..8030ab0 100644
--- a/rsScript.h
+++ b/rsScript.h
@@ -103,7 +103,7 @@
     void setVar(uint32_t slot, const void *val, size_t len);
     void getVar(uint32_t slot, const void *val, size_t len);
     void setVar(uint32_t slot, const void *val, size_t len, Element *e,
-                const size_t *dims, size_t dimLen);
+                const uint32_t *dims, size_t dimLen);
     void setVarObj(uint32_t slot, ObjectBase *val);
 
     virtual bool freeChildren();