diff options
author | John Hoford <hoford@google.com> | 2013-08-27 17:18:50 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-08-29 11:13:36 -0700 |
commit | 37f8e432f4eb94d0ab483bfdc2a1fa024508e85f (patch) | |
tree | ffba4df533e758c6a7f9c6c1ef3471dbf75e59d8 /jni | |
parent | e40690d73eb611f3f461f51a2841e73bcbd01f79 (diff) | |
download | android_packages_apps_Gallery2-37f8e432f4eb94d0ab483bfdc2a1fa024508e85f.tar.gz android_packages_apps_Gallery2-37f8e432f4eb94d0ab483bfdc2a1fa024508e85f.tar.bz2 android_packages_apps_Gallery2-37f8e432f4eb94d0ab483bfdc2a1fa024508e85f.zip |
vignette fix & enhance to remove center focus
Change-Id: Ide19925c5a9113518815d3aacc2204ef5ab9661d
Diffstat (limited to 'jni')
-rw-r--r-- | jni/Android.mk | 1 | ||||
-rw-r--r-- | jni/filters/vignette.c | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index e612486e1..0b8480e56 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -37,7 +37,6 @@ LOCAL_SRC_FILES := filters/gradient.c \ filters/vibrance.c \ filters/geometry.c \ filters/negative.c \ - filters/vignette.c \ filters/redEyeMath.c \ filters/fx.c \ filters/wbalance.c \ diff --git a/jni/filters/vignette.c b/jni/filters/vignette.c deleted file mode 100644 index b9ee3ff01..000000000 --- a/jni/filters/vignette.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "filters.h" -#include <math.h> - -static int* gVignetteMap = 0; -static int gVignetteWidth = 0; -static int gVignetteHeight = 0; - -void JNIFUNCF(ImageFilterVignette, nativeApplyFilter, jobject bitmap, jint width, jint height, jint centerx, jint centery, jfloat radiusx, jfloat radiusy, jfloat strength) -{ - char* destination = 0; - AndroidBitmap_lockPixels(env, bitmap, (void**) &destination); - int i; - int len = width * height * 4; - int vignette = 0; - float d = centerx; - if (radiusx == 0) radiusx = 10; - if (radiusy == 0) radiusy = 10; - float scalex = 1/radiusx; - float scaley = 1/radiusy; - - for (i = 0; i < len; i += 4) - { - int p = i/4; - float x = ((p%width)-centerx)*scalex; - float y = ((p/width)-centery)*scaley; - float dist = sqrt(x*x+y*y)-1; - vignette = (int) (strength*256*MAX(dist,0)); - destination[RED] = CLAMP(destination[RED] - vignette); - destination[GREEN] = CLAMP(destination[GREEN] - vignette); - destination[BLUE] = CLAMP(destination[BLUE] - vignette); - } - AndroidBitmap_unlockPixels(env, bitmap); -} |