summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-10-09 10:17:55 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-09 10:17:55 -0700
commit3a11c7e55b938257701dd87e68aa1c1ff341074a (patch)
tree685f867c391270e097d674bc1a71c545b4845a5b /src
parent556b0f6e22a078fbbb105277951f0d88eff5fcdc (diff)
parenteaf6ca6e3053d7cb0b3a1491f028e82c8573926d (diff)
downloadandroid_packages_apps_Gallery2-3a11c7e55b938257701dd87e68aa1c1ff341074a.tar.gz
android_packages_apps_Gallery2-3a11c7e55b938257701dd87e68aa1c1ff341074a.tar.bz2
android_packages_apps_Gallery2-3a11c7e55b938257701dd87e68aa1c1ff341074a.zip
Merge "Gallery2: fix display abnormal when tap sharpness in filtershow" into ui_dev_2.0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/convolve3x3.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/convolve3x3.rs b/src/com/android/gallery3d/filtershow/filters/convolve3x3.rs
index 2acffab06..d348b92e5 100644
--- a/src/com/android/gallery3d/filtershow/filters/convolve3x3.rs
+++ b/src/com/android/gallery3d/filtershow/filters/convolve3x3.rs
@@ -31,15 +31,15 @@ void root(const uchar4 *in, uchar4 *out, const void *usrData, uint32_t x, uint32
uint32_t y1 = min((int32_t)y+1, gHeight-1);
uint32_t y2 = max((int32_t)y-1, 0);
- float4 p00 = rsUnpackColor8888(gPixels[x1 + gWidth * y1]);
- float4 p01 = rsUnpackColor8888(gPixels[x + gWidth * y1]);
- float4 p02 = rsUnpackColor8888(gPixels[x2 + gWidth * y1]);
- float4 p10 = rsUnpackColor8888(gPixels[x1 + gWidth * y]);
- float4 p11 = rsUnpackColor8888(gPixels[x + gWidth * y]);
- float4 p12 = rsUnpackColor8888(gPixels[x2 + gWidth * y]);
- float4 p20 = rsUnpackColor8888(gPixels[x1 + gWidth * y2]);
- float4 p21 = rsUnpackColor8888(gPixels[x + gWidth * y2]);
- float4 p22 = rsUnpackColor8888(gPixels[x2 + gWidth * y2]);
+ float4 p00 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x1, y1)));
+ float4 p01 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x, y1)));
+ float4 p02 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x2, y1)));
+ float4 p10 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x1, y)));
+ float4 p11 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x, y)));
+ float4 p12 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x2, y)));
+ float4 p20 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x1, y2)));
+ float4 p21 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x, y2)));
+ float4 p22 = rsUnpackColor8888(*((uchar4 *)rsGetElementAt(gIn, x2, y2)));
p00 *= gCoeffs[0];
p01 *= gCoeffs[1];