diff options
author | Elliott Hughes <enh@google.com> | 2015-12-17 16:16:21 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-17 16:16:21 -0800 |
commit | d42bb6218a583cd78a4fa49271f605b77d7b0246 (patch) | |
tree | 967f44f03960d1b22cc8396ca2502d4663e18bcc | |
parent | f9227bfaae4d5e120cdc22930b6c06965bb5e0e7 (diff) | |
parent | c2702fcd385410b17a0448cbf047ae6d2b75e892 (diff) | |
download | jhead-d42bb6218a583cd78a4fa49271f605b77d7b0246.tar.gz |
Merge "Silence some external/jhead warnings."
am: c2702fcd38
* commit 'c2702fcd385410b17a0448cbf047ae6d2b75e892':
Silence some external/jhead warnings.
-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) { |