am 6463dd52: Merge "add comment about xor not being porter/duff Bug: 21934855"

* commit '6463dd52470a2279e699647a282a085c00604d0c': add comment about xor not being porter/duff Bug: 21934855
2015-06-30 22:44:56 +00:00
parent a8b8fe91ee 6463dd5247
commit 3791d0112e
1 changed files with 2 additions and 0 deletions
--- a/rs/java/android/renderscript/ScriptIntrinsicBlend.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicBlend.java
@ -402,6 +402,8 @@ public class ScriptIntrinsicBlend extends ScriptIntrinsic {
    /**
     * Sets dst = {src.r ^ dst.r, src.g ^ dst.g, src.b ^ dst.b, src.a ^ dst.a}
     *
+     * <b>Note:</b> this is NOT the Porter/Duff XOR mode; this is a bitwise xor.
+     *
     * @param ain The source buffer
     * @param aout The destination buffer
     * @param opt LaunchOptions for clipping