summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Luc Brouillet <jeanluc@google.com>2015-05-28 01:51:04 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-28 01:51:04 (GMT)
commit13d35e38657b0acec499a98d68410258ead18db0 (patch)
tree547117f668ea31f8424844206e27f34c81ed9547
parentede5978776c754f221462d8f76e4d445befbdc16 (diff)
parenta6adf1339543812fef50fd32ea4a1592c1cc55e0 (diff)
downloadandroid_packages_apps_Gallery2-13d35e38657b0acec499a98d68410258ead18db0.zip
android_packages_apps_Gallery2-13d35e38657b0acec499a98d68410258ead18db0.tar.gz
android_packages_apps_Gallery2-13d35e38657b0acec499a98d68410258ead18db0.tar.bz2
am a6adf133: Fix RenderScript warnings.
* commit 'a6adf1339543812fef50fd32ea4a1592c1cc55e0': Fix RenderScript warnings.
-rw-r--r--src/com/android/gallery3d/filtershow/filters/saturation.rs3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/vignette.rs4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/saturation.rs b/src/com/android/gallery3d/filtershow/filters/saturation.rs
index 5210e34..5b21640 100644
--- a/src/com/android/gallery3d/filtershow/filters/saturation.rs
+++ b/src/com/android/gallery3d/filtershow/filters/saturation.rs
@@ -149,7 +149,6 @@ uchar4 __attribute__((kernel)) selectiveAdjust(const uchar4 in, uint32_t x,
uint32_t y) {
float4 pixel = rsUnpackColor8888(in);
- float4 wsum = pixel;
int hue = rgb2hue(in);
float t = satLut[hue];
@@ -158,4 +157,4 @@ uchar4 __attribute__((kernel)) selectiveAdjust(const uchar4 in, uint32_t x,
pixel.a = 1.0f;
return rsPackColorTo8888(clamp(pixel, 0.f, 1.0f));
-} \ No newline at end of file
+}
diff --git a/src/com/android/gallery3d/filtershow/filters/vignette.rs b/src/com/android/gallery3d/filtershow/filters/vignette.rs
index 709b220..7ab4663 100644
--- a/src/com/android/gallery3d/filtershow/filters/vignette.rs
+++ b/src/com/android/gallery3d/filtershow/filters/vignette.rs
@@ -38,8 +38,6 @@ static const float Bf = 0.114f;
void setupVignetteParams() {
- int k = 0;
-
scalex = 1.f / radiusx;
scaley = 1.f / radiusy;
@@ -75,4 +73,4 @@ uchar4 __attribute__((kernel)) vignette(const uchar4 in, uint32_t x, uint32_t y
wsum.a = 1.0f;
uchar4 out = rsPackColorTo8888(clamp(wsum, 0.f, 1.0f));
return out;
-} \ No newline at end of file
+}