diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-03 12:00:24 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-03 12:00:24 +0000 |
| commit | 11f402b44ae63295663737e355d1319b6e50f84b (patch) | |
| tree | 30bde70a5dd9a73da759b97300848581f3b7e825 /src/bin | |
| parent | 18049fe3e0dadd6765f030e71d647d6865e8625d (diff) | |
[trunk] Remove easy to fix warnings about conversion
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/common/color.c | 3 | ||||
| -rw-r--r-- | src/bin/jp2/opj_decompress.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index f18eb801..6cb98497 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -388,7 +388,8 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " if(image->numcomps > 2)/* RGB, RGBA */ { 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); out = outbuf = (unsigned short*)malloc(nr_samples); diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index b2e4e83c..dd1a0775 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -271,7 +271,7 @@ static int infile_format(const char *fname) const char *s, *magic_s; int ext_format, magic_format; unsigned char buf[12]; - unsigned int l_nb_read; + OPJ_SIZE_T l_nb_read; reader = fopen(fname, "rb"); |