diff options
| author | Jason Sams <jsams@google.com> | 2014-08-21 13:24:02 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2014-08-21 13:24:02 -0700 |
| commit | ef48ce24c2fac16326ea9719cae7e930633c52dc (patch) | |
| tree | d52a6e286b9518c4f03aa7134ab23e41e9c7f480 /cpu_ref/rsCpuIntrinsicConvolve5x5.cpp | |
| parent | 05eaedaf599c55f09035955f5dc2bf64a470190a (diff) | |
| parent | adbc54f3fa8c206e2e072d0dfded1dcfb788bad1 (diff) | |
| download | rs-ef48ce24c2fac16326ea9719cae7e930633c52dc.tar.gz | |
resolved conflicts for merge of adbc54f3 to lmp-dev-plus-aosp
Change-Id: I04f438a6fc4cd374a821c32102cc758d9a30d731
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicConvolve5x5.cpp')
| -rw-r--r-- | cpu_ref/rsCpuIntrinsicConvolve5x5.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp index 1a546db3..e263e74c 100644 --- a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp +++ b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp @@ -393,7 +393,7 @@ void RsdCpuScriptIntrinsicConvolve5x5::kernelU4(const RsExpandKernelParams *p, #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; } |