From: DRC Date: Tue, 17 Jan 2012 11:48:38 +0000 (+0000) Subject: Compiler warnings X-Git-Tag: 1.2.0~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efe28cec4b29b5a7357d9cd1c30a066486d19b12;p=libjpeg-turbo Compiler warnings git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@734 632fc199-4ca6-4c93-a231-07263d6284db --- diff --git a/jdhuff.c b/jdhuff.c index c2b38a9..f822dba 100644 --- a/jdhuff.c +++ b/jdhuff.c @@ -758,7 +758,7 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) usefast = 0; } - if (cinfo->src->bytes_in_buffer < BUFSIZE * cinfo->blocks_in_MCU + if (cinfo->src->bytes_in_buffer < BUFSIZE * (size_t)cinfo->blocks_in_MCU || cinfo->unread_marker != 0) usefast = 0; diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c index 25cca7d..1ff9bba 100644 --- a/turbojpeg-jni.c +++ b/turbojpeg-jni.c @@ -635,7 +635,8 @@ JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transf if(t[i].r.w!=0) w=t[i].r.w; if(t[i].r.h!=0) h=t[i].r.h; bailif0(jdstBufs[i]=(*env)->GetObjectArrayElement(env, dstobjs, i)); - if((*env)->GetArrayLength(env, jdstBufs[i])GetArrayLength(env, jdstBufs[i]) + GetPrimitiveArrayCritical(env, jdstBufs[i], 0)); } diff --git a/turbojpeg.c b/turbojpeg.c index e27f0da..2d5959a 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -1065,7 +1065,7 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf, &xinfo[i]); if(t[i].customFilter) { - int ci, by, y; + int ci, y; JDIMENSION by; for(ci=0; cinum_components; ci++) { jpeg_component_info *compptr=&cinfo->comp_info[ci];