diff options
| author | Miao Wang <miaowang@google.com> | 2015-09-16 00:02:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 00:02:34 +0000 |
| commit | 227df654aed4f6bfc3b2f63841c6542f3f7c91ae (patch) | |
| tree | 9609fe8f5b0e207633c13c342a06ca1dcd3b69bc /cpp/ScriptIntrinsics.cpp | |
| parent | ca9f12e26134648c05445a72333e67d8c8c77540 (diff) | |
| parent | 9ff9685f3f1013dcc416f762408f817f00ea116e (diff) | |
am 9ff9685f: Merge changes I7ced3653,I2b1cce8a
* commit '9ff9685f3f1013dcc416f762408f817f00ea116e':
Comments clean up for C++ API
Fix updateFromNative in C++ API.
Diffstat (limited to 'cpp/ScriptIntrinsics.cpp')
| -rw-r--r-- | cpp/ScriptIntrinsics.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cpp/ScriptIntrinsics.cpp b/cpp/ScriptIntrinsics.cpp index 54ce4650..0a2df33a 100644 --- a/cpp/ScriptIntrinsics.cpp +++ b/cpp/ScriptIntrinsics.cpp @@ -175,7 +175,6 @@ void ScriptIntrinsicBlend::forEachXor(sp<Allocation> in, sp<Allocation> out) { Script::forEach(11, in, out, nullptr, 0); } -// Numbering jumps here void ScriptIntrinsicBlend::forEachMultiply(sp<Allocation> in, sp<Allocation> out) { if (in->getType()->getElement()->isCompatible(mElement) == false || out->getType()->getElement()->isCompatible(mElement) == false) { @@ -184,7 +183,6 @@ void ScriptIntrinsicBlend::forEachMultiply(sp<Allocation> in, sp<Allocation> out Script::forEach(14, in, out, nullptr, 0); } -// Numbering jumps here void ScriptIntrinsicBlend::forEachAdd(sp<Allocation> in, sp<Allocation> out) { if (in->getType()->getElement()->isCompatible(mElement) == false || out->getType()->getElement()->isCompatible(mElement) == false) { |