diff options
author | Elliott Hughes <enh@google.com> | 2015-12-17 01:14:38 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-17 01:14:38 +0000 |
commit | c2702fcd385410b17a0448cbf047ae6d2b75e892 (patch) | |
tree | 3fe3cbb4f75e1fc7835bdd72f4ab8290eff1debd | |
parent | 5c8f937269957e6651383e988006824781fd021a (diff) | |
parent | cabf029d0157831253d58ecdaa3e646d933503fe (diff) | |
download | jhead-c2702fcd385410b17a0448cbf047ae6d2b75e892.tar.gz |
Merge "Silence some external/jhead warnings."android-n-preview-2android-n-preview-1
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | main.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -19,7 +19,7 @@ LOCAL_PATH := $(my-dir) # non-jni part include $(CLEAR_VARS) - +LOCAL_CFLAGS := -Wno-unused-parameter LOCAL_SRC_FILES:= \ exif.c \ gpsinfo.c \ @@ -44,6 +44,7 @@ include $(BUILD_SHARED_LIBRARY) ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) include $(CLEAR_VARS) +LOCAL_CFLAGS := -Wno-unused-parameter LOCAL_MODULE_TAGS := optional @@ -450,7 +450,8 @@ static jbyteArray getThumbnail(JNIEnv *env, jobject jobj, jstring jfilename) #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) { |