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

[trunk] Remove easy to fix warnings about conversion

This commit is contained in:
Mathieu Malaterre 2014-03-03 12:00:24 +00:00
parent 18049fe3e0
commit 11f402b44a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/common/color.c
View File

@ -388,7 +388,8 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
if(image->numcomps > 2)/* RGB, RGBA */ if(image->numcomps > 2)/* RGB, RGBA */
{ {
unsigned short *inbuf, *outbuf, *in, *out; unsigned short *inbuf, *outbuf, *in, *out;
max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned short); max = max_w * max_h;
nr_samples = (cmsUInt32Number)(max * 3 * sizeof(unsigned short));
in = inbuf = (unsigned short*)malloc(nr_samples); in = inbuf = (unsigned short*)malloc(nr_samples);
out = outbuf = (unsigned short*)malloc(nr_samples); out = outbuf = (unsigned short*)malloc(nr_samples);

2
src/bin/jp2/opj_decompress.c
View File

@ -271,7 +271,7 @@ static int infile_format(const char *fname)
const char *s, *magic_s; const char *s, *magic_s;
int ext_format, magic_format; int ext_format, magic_format;
unsigned char buf[12]; unsigned char buf[12];
unsigned int l_nb_read; OPJ_SIZE_T l_nb_read;
reader = fopen(fname, "rb"); reader = fopen(fname, "rb");

2
src/lib/openjp2/dwt.c
View File

@ -404,7 +404,7 @@ INLINE OPJ_BOOL opj_dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,void (*p_fun
rw = l_cur_res->x1 - l_cur_res->x0; rw = l_cur_res->x1 - l_cur_res->x0;
rh = l_cur_res->y1 - l_cur_res->y0; rh = l_cur_res->y1 - l_cur_res->y0;
l_data_size = opj_dwt_max_resolution( tilec->resolutions,tilec->numresolutions) * sizeof(OPJ_INT32); l_data_size = opj_dwt_max_resolution( tilec->resolutions,tilec->numresolutions) * (OPJ_UINT32)sizeof(OPJ_INT32);
bj = (OPJ_INT32*)opj_malloc(l_data_size); bj = (OPJ_INT32*)opj_malloc(l_data_size);
if (! bj) { if (! bj) {
return OPJ_FALSE; return OPJ_FALSE;