resolved conflicts for merge of adbc54f3 to lmp-dev-plus-aosp
Change-Id: I04f438a6fc4cd374a821c32102cc758d9a30d731
diff --git a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
index f072e52..e298d94 100644
--- a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
+++ b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
@@ -885,9 +885,8 @@
uint32_t instep = p->inEStrides[0];
- uchar *out = (uchar *)p->out + outstep * xstart;
- uchar *in = (uchar *)p->ins[0] + 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 1a546db..e263e74 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;
}