From ece2a2d6c231aa60409a75a2787b349d342b99eb Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 29 Oct 2012 13:53:02 +0000 Subject: [PATCH] [trunk] Normalize the return type of opj_read_from_file regarding the test in the calling function --- src/lib/openjp2/openjpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index be0b16ca..85ddc7e9 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -202,7 +202,7 @@ opj_bool OPJ_CALLCONV opj_set_error_handler(opj_codec_t * p_codec, static OPJ_SIZE_T opj_read_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file) { OPJ_SIZE_T l_nb_read = fread(p_buffer,1,p_nb_bytes,p_file); - return l_nb_read ? l_nb_read : -1; + return l_nb_read ? l_nb_read : (OPJ_SIZE_T)-1; } static OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file)