summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-10-29 13:53:02 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-10-29 13:53:02 +0000
commitece2a2d6c231aa60409a75a2787b349d342b99eb (patch)
treea3d623785f238df2a0452649266f1375ee37fad5 /src/lib
parentf31957c502457654fa77b77fa8ff5c5fe866490f (diff)
[trunk] Normalize the return type of opj_read_from_file regarding the test in the calling function
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/openjpeg.c2
1 files changed, 1 insertions, 1 deletions
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)