walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

convert.c: fix recently introduced -Wsign-conversion warnings

This commit is contained in:
Even Rouault 2017-08-17 17:02:40 +02:00
parent 9f7d79fd30
commit da046b73a8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/jp2/convert.c
View File

@ -583,7 +583,7 @@ struct tga_header {
/* Returns a ushort from a little-endian serialized value */ /* Returns a ushort from a little-endian serialized value */
static unsigned short get_tga_ushort(const unsigned char *data) static unsigned short get_tga_ushort(const unsigned char *data)
{ {
return data[0] | (data[1] << 8); return (unsigned short)data[0] | (unsigned short)(data[1] << 8);
} }
#define TGA_HEADER_SIZE 18 #define TGA_HEADER_SIZE 18
@ -816,10 +816,11 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters)
/* If the declared file size is > 10 MB, check that the file is big */ /* If the declared file size is > 10 MB, check that the file is big */
/* enough to avoid excessive memory allocations */ /* enough to avoid excessive memory allocations */
if (image_height != 0 && image_width > 10000000 / image_height / numcomps) { if (image_height != 0 &&
image_width > 10000000U / image_height / (OPJ_UINT32)numcomps) {
char ch; char ch;
OPJ_UINT64 expected_file_size = OPJ_UINT64 expected_file_size =
(OPJ_UINT64)image_width * image_height * numcomps; (OPJ_UINT64)image_width * image_height * (OPJ_UINT32)numcomps;
long curpos = ftell(f); long curpos = ftell(f);
if (expected_file_size > (OPJ_UINT64)INT_MAX) { if (expected_file_size > (OPJ_UINT64)INT_MAX) {
expected_file_size = (OPJ_UINT64)INT_MAX; expected_file_size = (OPJ_UINT64)INT_MAX;