Fix two intrinsic clipping bugs.
bug 17157250
Change-Id: I65c945da6bd90733333a5472c1a85b5d3e3e4d6b
diff --git a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
index d8ea351..19894bc 100644
--- a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
+++ b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
@@ -883,8 +883,8 @@
uint32_t xstart, uint32_t xend,
uint32_t instep, uint32_t outstep) {
RsdCpuScriptIntrinsicColorMatrix *cp = (RsdCpuScriptIntrinsicColorMatrix *)p->usr;
- uchar *out = (uchar *)p->out + outstep * xstart;
- uchar *in = (uchar *)p->in + instep * xstart;
+ uchar *out = (uchar *)p->out;
+ uchar *in = (uchar *)p->in;
uint32_t x1 = xstart;
uint32_t x2 = xend;
diff --git a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
index 48b5ca5..ffa9543 100644
--- a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
+++ b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
@@ -393,7 +393,7 @@
#if defined(ARCH_ARM_USE_INTRINSICS)
if(gArchUseSIMD && ((x1 + 3) < x2)) {
uint32_t len = (x2 - x1 - 3) >> 1;
- rsdIntrinsicConvolve5x5_K(out, py0, py1, py2, py3, py4, cp->mIp, len);
+ rsdIntrinsicConvolve5x5_K(out, py0 + x1 - 2, py1 + x1 - 2, py2 + x1 - 2, py3 + x1 - 2, py4 + x1 - 2, cp->mIp, len);
out += len << 1;
x1 += len << 1;
}