From c2122c6e57cad3c90ac7eeb8c42fa8416984590c Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 26 Jul 2016 15:06:10 -0700 Subject: Add missing includes. These files all use malloc/free but never include it. It looks like the NDK headers leak stdlib.h through something that was being included, but the updated headers don't have that mess. Test: mma Change-Id: Ia34a2d74f382f88476708e31da819ea18ab0aa4f --- jni/filters/geometry.c | 4 +++- jni/filters/highlight.c | 2 ++ jni/filters/redEyeMath.c | 2 ++ jni/filters/shadows.c | 2 ++ jni/filters/wbalance.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c index 84a044c5a..b01e5e05f 100644 --- a/jni/filters/geometry.c +++ b/jni/filters/geometry.c @@ -14,8 +14,10 @@ * limitations under the License. */ -#include "filters.h" #include +#include + +#include "filters.h" static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){ //Vertical diff --git a/jni/filters/highlight.c b/jni/filters/highlight.c index fe9b88f94..567a216e0 100644 --- a/jni/filters/highlight.c +++ b/jni/filters/highlight.c @@ -15,6 +15,8 @@ */ #include +#include + #include "filters.h" void JNIFUNCF(ImageFilterHighlights, nativeApplyFilter, jobject bitmap, diff --git a/jni/filters/redEyeMath.c b/jni/filters/redEyeMath.c index 26f3f76a4..9a16d6004 100644 --- a/jni/filters/redEyeMath.c +++ b/jni/filters/redEyeMath.c @@ -15,6 +15,8 @@ */ #include +#include + #include "filters.h" int value(int r, int g, int b) { diff --git a/jni/filters/shadows.c b/jni/filters/shadows.c index 38d64c8b5..5f802dd21 100644 --- a/jni/filters/shadows.c +++ b/jni/filters/shadows.c @@ -15,6 +15,8 @@ */ #include +#include + #include "filters.h" void JNIFUNCF(ImageFilterShadows, nativeApplyFilter, jobject bitmap, jint width, jint height, float scale){ diff --git a/jni/filters/wbalance.c b/jni/filters/wbalance.c index 7592a427d..99a7d2e0d 100644 --- a/jni/filters/wbalance.c +++ b/jni/filters/wbalance.c @@ -14,6 +14,8 @@ * limitations under the License. */ +#include + #include "filters.h" void estmateWhite(unsigned char *src, int len, int *wr, int *wb, int *wg){ -- cgit v1.2.3