commit a026a04d9062abea07e0904eafbf78751f2d839e
author Tim Murray <timmurray@google.com> Tue Oct 15 22:30:38 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 22:30:38 2013 +0000
tree b0c0daa05845fd8ba7222d4fe753da9c8b705a54
parent 853cb29013aa15e2355a30d2a2a491b886105328
parent faac6eddf81106c2526bea326226c3894cf44e74

Merge "Fix blend name change." into klp-dev

tests/tests/rscpp/librscpptest/rs_jni.cpp

diff --git a/tests/tests/rscpp/librscpptest/rs_jni.cpp b/tests/tests/rscpp/librscpptest/rs_jni.cpp
index 8c4ef84..16c4176 100644
--- a/tests/tests/rscpp/librscpptest/rs_jni.cpp
+++ b/tests/tests/rscpp/librscpptest/rs_jni.cpp
@@ -275,49 +275,49 @@
     sp<ScriptIntrinsicBlend> blend = ScriptIntrinsicBlend::create(rs, e);
     switch(optionFlag) {
     case 0:
-        blend->blendAdd(inputAlloc, outputAlloc);
+        blend->forEachAdd(inputAlloc, outputAlloc);
         break;
     case 1:
-        blend->blendClear(inputAlloc, outputAlloc);
+        blend->forEachClear(inputAlloc, outputAlloc);
         break;
     case 2:
-        blend->blendDst(inputAlloc, outputAlloc);
+        blend->forEachDst(inputAlloc, outputAlloc);
         break;
     case 3:
-        blend->blendDstAtop(inputAlloc, outputAlloc);
+        blend->forEachDstAtop(inputAlloc, outputAlloc);
         break;
     case 4:
-        blend->blendDstIn(inputAlloc, outputAlloc);
+        blend->forEachDstIn(inputAlloc, outputAlloc);
         break;
     case 5:
-        blend->blendDstOut(inputAlloc, outputAlloc);
+        blend->forEachDstOut(inputAlloc, outputAlloc);
         break;
     case 6:
-        blend->blendDstOver(inputAlloc, outputAlloc);
+        blend->forEachDstOver(inputAlloc, outputAlloc);
         break;
     case 7:
-        blend->blendMultiply(inputAlloc, outputAlloc);
+        blend->forEachMultiply(inputAlloc, outputAlloc);
         break;
     case 8:
-        blend->blendSrc(inputAlloc, outputAlloc);
+        blend->forEachSrc(inputAlloc, outputAlloc);
         break;
     case 9:
-        blend->blendSrcAtop(inputAlloc, outputAlloc);
+        blend->forEachSrcAtop(inputAlloc, outputAlloc);
         break;
     case 10:
-        blend->blendSrcIn(inputAlloc, outputAlloc);
+        blend->forEachSrcIn(inputAlloc, outputAlloc);
         break;
     case 11:
-        blend->blendSrcOut(inputAlloc, outputAlloc);
+        blend->forEachSrcOut(inputAlloc, outputAlloc);
         break;
     case 12:
-        blend->blendSrcOver(inputAlloc, outputAlloc);
+        blend->forEachSrcOver(inputAlloc, outputAlloc);
         break;
     case 13:
-        blend->blendSubtract(inputAlloc, outputAlloc);
+        blend->forEachSubtract(inputAlloc, outputAlloc);
         break;
     case 14:
-        blend->blendXor(inputAlloc, outputAlloc);
+        blend->forEachXor(inputAlloc, outputAlloc);
         break;
     default:
         break;