Merge "Silence some external/jhead warnings."
diff --git a/Android.mk b/Android.mk
index 99a1766..8ccd307 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
# non-jni part
include $(CLEAR_VARS)
-
+LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_SRC_FILES:= \
exif.c \
gpsinfo.c \
@@ -44,6 +44,7 @@
ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
include $(CLEAR_VARS)
+LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_MODULE_TAGS := optional
diff --git a/main.c b/main.c
index dc0699a..da45c1b 100644
--- a/main.c
+++ b/main.c
@@ -450,7 +450,8 @@
#endif
goto noThumbnail;
}
- uchar* thumbnailPointer = ExifSection->Data + ImageInfo.ThumbnailOffset + 8;
+ const jbyte* thumbnailPointer =
+ (const jbyte*) (ExifSection->Data + ImageInfo.ThumbnailOffset + 8);
jbyteArray byteArray = (*env)->NewByteArray(env, ImageInfo.ThumbnailSize);
if (byteArray == NULL) {