commit 3cd44af22622898d3000b2b3c4c408cede294152
author Tim Murray <timmurray@google.com> Wed Nov 14 11:25:27 2012 -0800
committer Tim Murray <timmurray@google.com> Wed Nov 14 11:25:27 2012 -0800
tree 9c31b27fd6c1f2f37af4b367875036114733ed4f
parent 704616e76e43c827ed554b797151a996bcbf3a77

Fix intrinsic creation to use the appropriate types.

Change-Id: I9f919ad410d8dac843da01afa9b14bd0d6b355ad

cpp/ScriptIntrinsics.cpp

diff --git a/cpp/ScriptIntrinsics.cpp b/cpp/ScriptIntrinsics.cpp
index 2150d40..7436351 100644
--- a/cpp/ScriptIntrinsics.cpp
+++ b/cpp/ScriptIntrinsics.cpp
@@ -23,12 +23,12 @@
 using namespace android;
 using namespace renderscriptCpp;
 
-ScriptIntrinsic::ScriptIntrinsic(sp<RS> rs, int id, Element *e)
+ScriptIntrinsic::ScriptIntrinsic(sp<RS> rs, int id, sp<const Element> e)
     : Script(NULL, rs) {
-    mID = rsScriptIntrinsicCreate(rs->getContext(), id, e);
+    mID = rsScriptIntrinsicCreate(rs->getContext(), id, e->getID());
 }
 
-ScriptIntrinsicBlend::ScriptIntrinsicBlend(sp<RS> rs, Element *e)
+ScriptIntrinsicBlend::ScriptIntrinsicBlend(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_BLEND, e) {
 
 }
@@ -95,7 +95,7 @@
     Script::forEach(35, in, out, NULL, 0);
 }
 
-ScriptIntrinsicBlur::ScriptIntrinsicBlur(sp<RS> rs, Element *e)
+ScriptIntrinsicBlur::ScriptIntrinsicBlur(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_BLUR, e) {
 
 }

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index a5df611..abd11c5 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -528,12 +528,12 @@
 
 class ScriptIntrinsic : public Script {
  protected:
-    ScriptIntrinsic(sp<RS> rs, int id, Element *e);
+    ScriptIntrinsic(sp<RS> rs, int id, sp<const Element> e);
 };
 
 class ScriptIntrinsicBlend : public ScriptIntrinsic {
  public:
-    ScriptIntrinsicBlend(sp<RS> rs, Element *e);
+    ScriptIntrinsicBlend(sp<RS> rs, sp <const Element> e);
     void blendClear(sp<Allocation> in, sp<Allocation> out);
     void blendSrc(sp<Allocation> in, sp<Allocation> out);
     void blendDst(sp<Allocation> in, sp<Allocation> out);
@@ -553,7 +553,7 @@
 
 class ScriptIntrinsicBlur : public ScriptIntrinsic {
  public:
-    ScriptIntrinsicBlur(sp<RS> rs, Element *e);
+    ScriptIntrinsicBlur(sp<RS> rs, sp <const Element> e);
     void blur(sp<Allocation> in, sp<Allocation> out);
     void setRadius(float radius);
 };