diff options
author | jinwu <jinwu@codeaurora.org> | 2018-03-08 17:52:48 +0800 |
---|---|---|
committer | jinwu <jinwu@codeaurora.org> | 2018-03-08 17:52:48 +0800 |
commit | 2ba45029b40b4932fc112efb102dd6b59b757d8a (patch) | |
tree | 76265adaf8f145a220be0ce6a8a591812e205727 /jni_jpegstream | |
parent | ac82ae3474b874035d0a7499d7e62775ac908f2a (diff) | |
download | android_packages_apps_Gallery2-2ba45029b40b4932fc112efb102dd6b59b757d8a.tar.gz android_packages_apps_Gallery2-2ba45029b40b4932fc112efb102dd6b59b757d8a.tar.bz2 android_packages_apps_Gallery2-2ba45029b40b4932fc112efb102dd6b59b757d8a.zip |
Fix compiling warnings
Change-Id: Ifa32c703e9919277be98c258ced56ef67150dd13
Diffstat (limited to 'jni_jpegstream')
-rw-r--r-- | jni_jpegstream/src/jerr_hook.cpp | 1 | ||||
-rw-r--r-- | jni_jpegstream/src/jpeg_hook.cpp | 3 | ||||
-rw-r--r-- | jni_jpegstream/src/jpeg_reader.cpp | 2 | ||||
-rw-r--r-- | jni_jpegstream/src/jpegstream.cpp | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/jni_jpegstream/src/jerr_hook.cpp b/jni_jpegstream/src/jerr_hook.cpp index f8f864f78..c8491ccbd 100644 --- a/jni_jpegstream/src/jerr_hook.cpp +++ b/jni_jpegstream/src/jerr_hook.cpp @@ -34,7 +34,6 @@ void ErrExit(j_common_ptr cinfo) { * to logcat's error log. */ void ErrOutput(j_common_ptr cinfo) { - ErrManager* mgr = reinterpret_cast<ErrManager*>(cinfo->err); char buf[JMSG_LENGTH_MAX]; (*cinfo->err->format_message) (cinfo, buf); buf[JMSG_LENGTH_MAX - 1] = '\0'; // Force null terminator diff --git a/jni_jpegstream/src/jpeg_hook.cpp b/jni_jpegstream/src/jpeg_hook.cpp index cca54e405..b4d4dd302 100644 --- a/jni_jpegstream/src/jpeg_hook.cpp +++ b/jni_jpegstream/src/jpeg_hook.cpp @@ -121,7 +121,7 @@ void Mgr_skip_input_data_fcn(j_decompress_ptr cinfo, long num_bytes) { return; } SourceManager *src = reinterpret_cast<SourceManager*>(cinfo->src); - if (src->mgr.bytes_in_buffer >= num_bytes) { + if (src->mgr.bytes_in_buffer >= (size_t)num_bytes) { src->mgr.bytes_in_buffer -= num_bytes; src->mgr.next_input_byte += num_bytes; } else { @@ -151,6 +151,7 @@ void Mgr_skip_input_data_fcn(j_decompress_ptr cinfo, long num_bytes) { void Mgr_term_source_fcn(j_decompress_ptr cinfo) { //noop + (void)cinfo; } int32_t MakeSrc(j_decompress_ptr cinfo, JNIEnv *env, jobject inStream){ diff --git a/jni_jpegstream/src/jpeg_reader.cpp b/jni_jpegstream/src/jpeg_reader.cpp index 4726b6426..9662152da 100644 --- a/jni_jpegstream/src/jpeg_reader.cpp +++ b/jni_jpegstream/src/jpeg_reader.cpp @@ -215,7 +215,6 @@ void JpegReader::formatPixels(uint8_t* buf, int32_t len) { // Do endianness and alpha for output format if (mFormat == Jpeg_Config::FORMAT_RGBA) { // Set alphas to 255 - uint8_t* end = buf + len - 1; for (int i = len - 1; i >= 0; i -= 4) { buf[i] = 255; buf[i - 1] = *--iter; @@ -224,7 +223,6 @@ void JpegReader::formatPixels(uint8_t* buf, int32_t len) { } } else if (mFormat == Jpeg_Config::FORMAT_ABGR) { // Reverse endianness and set alphas to 255 - uint8_t* end = buf + len - 1; int r, g, b; for (int i = len - 1; i >= 0; i -= 4) { b = *--iter; diff --git a/jni_jpegstream/src/jpegstream.cpp b/jni_jpegstream/src/jpegstream.cpp index 3b9a6830b..4c239e831 100644 --- a/jni_jpegstream/src/jpegstream.cpp +++ b/jni_jpegstream/src/jpegstream.cpp @@ -324,6 +324,7 @@ static int registerNativeMethods(JNIEnv* env, const char* className, } jint JNI_OnLoad(JavaVM* vm, void* reserved) { + (void)reserved; JNIEnv* env; if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { LOGE("Error: GetEnv failed in JNI_OnLoad"); |