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

[trunk] Remove some easy warnings about sign compare reported by gcc

This commit is contained in:
Mathieu Malaterre 2014-03-06 15:00:41 +00:00
parent 8a959bb1f4
commit 7e64eb5414
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,8 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) {
int imagetotga(opj_image_t * image, const char *outfile) { int imagetotga(opj_image_t * image, const char *outfile) {
int width, height, bpp, x, y; int width, height, bpp, x, y;
OPJ_BOOL write_alpha; OPJ_BOOL write_alpha;
int i, adjustR, adjustG, adjustB, fails; unsigned int i;
int adjustR, adjustG, adjustB, fails;
unsigned int alpha_channel; unsigned int alpha_channel;
float r,g,b,a; float r,g,b,a;
unsigned char value; unsigned char value;
@ -702,8 +703,8 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters)
/* set image offset and reference grid */ /* set image offset and reference grid */
image->x0 = parameters->image_offset_x0; image->x0 = parameters->image_offset_x0;
image->y0 = parameters->image_offset_y0; image->y0 = parameters->image_offset_y0;
image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1; image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : (int)(image->x0 + (w - 1) * subsampling_dx + 1);
image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1; image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : (int)(image->y0 + (h - 1) * subsampling_dy + 1);
/* set image data */ /* set image data */
@ -803,8 +804,8 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters)
/* set image offset and reference grid */ /* set image offset and reference grid */
image->x0 = parameters->image_offset_x0; image->x0 = parameters->image_offset_x0;
image->y0 = parameters->image_offset_y0; image->y0 = parameters->image_offset_y0;
image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1; image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : (int)(image->x0 + (w - 1) * subsampling_dx + 1);
image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1; image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : (int)(image->y0 + (h - 1) * subsampling_dy + 1);
/* set image data */ /* set image data */
@ -915,10 +916,8 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters)
/* set image offset and reference grid */ /* set image offset and reference grid */
image->x0 = parameters->image_offset_x0; image->x0 = parameters->image_offset_x0;
image->y0 = parameters->image_offset_y0; image->y0 = parameters->image_offset_y0;
image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : (int)(image->x0 + (w - 1) * subsampling_dx + 1);
- 1) * subsampling_dx + 1; image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : (int)(image->y0 + (h - 1) * subsampling_dy + 1);
image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h
- 1) * subsampling_dy + 1;
/* set image data */ /* set image data */
@ -1338,8 +1337,8 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) {
cmptparm.x0 = parameters->image_offset_x0; cmptparm.x0 = parameters->image_offset_x0;
cmptparm.y0 = parameters->image_offset_y0; cmptparm.y0 = parameters->image_offset_y0;
cmptparm.w = !cmptparm.x0 ? (w - 1) * parameters->subsampling_dx + 1 : cmptparm.x0 + (w - 1) * parameters->subsampling_dx + 1; cmptparm.w = !cmptparm.x0 ? (w - 1) * parameters->subsampling_dx + 1 : (int)(cmptparm.x0 + (w - 1) * parameters->subsampling_dx + 1);
cmptparm.h = !cmptparm.y0 ? (h - 1) * parameters->subsampling_dy + 1 : cmptparm.y0 + (h - 1) * parameters->subsampling_dy + 1; cmptparm.h = !cmptparm.y0 ? (h - 1) * parameters->subsampling_dy + 1 : (int)(cmptparm.y0 + (h - 1) * parameters->subsampling_dy + 1);
if (sign == '-') { if (sign == '-') {
cmptparm.sgnd = 1; cmptparm.sgnd = 1;
@ -1439,7 +1438,8 @@ static inline int clamp( const int value, const int prec, const int sgnd )
int imagetopgx(opj_image_t * image, const char *outfile) int imagetopgx(opj_image_t * image, const char *outfile)
{ {
int w, h; int w, h;
int i, j, compno, fails = 1; int i, j, fails = 1;
unsigned int compno;
FILE *fdest = NULL; FILE *fdest = NULL;
for (compno = 0; compno < image->numcomps; compno++) for (compno = 0; compno < image->numcomps; compno++)
@ -1938,7 +1938,8 @@ int imagetopnm(opj_image_t * image, const char *outfile)
{ {
int *red, *green, *blue, *alpha; int *red, *green, *blue, *alpha;
int wr, hr, max; int wr, hr, max;
int i, compno, ncomp; int i;
unsigned int compno, ncomp;
int adjustR, adjustG, adjustB, adjustA; int adjustR, adjustG, adjustB, adjustA;
int fails, two, want_gray, has_alpha, triple; int fails, two, want_gray, has_alpha, triple;
int prec, v; int prec, v;
@ -2701,9 +2702,9 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
image->x0 = parameters->image_offset_x0; image->x0 = parameters->image_offset_x0;
image->y0 = parameters->image_offset_y0; image->y0 = parameters->image_offset_y0;
image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 :
image->x0 + (w - 1) * subsampling_dx + 1; (int)(image->x0 + (w - 1) * subsampling_dx + 1);
image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 :
image->y0 + (h - 1) * subsampling_dy + 1; (int)(image->y0 + (h - 1) * subsampling_dy + 1);
buf = _TIFFmalloc(TIFFStripSize(tif)); buf = _TIFFmalloc(TIFFStripSize(tif));
@ -2851,9 +2852,9 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
image->x0 = parameters->image_offset_x0; image->x0 = parameters->image_offset_x0;
image->y0 = parameters->image_offset_y0; image->y0 = parameters->image_offset_y0;
image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 :
image->x0 + (w - 1) * subsampling_dx + 1; (int)(image->x0 + (w - 1) * subsampling_dx + 1);
image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 :
image->y0 + (h - 1) * subsampling_dy + 1; (int)(image->y0 + (h - 1) * subsampling_dy + 1);
buf = _TIFFmalloc(TIFFStripSize(tif)); buf = _TIFFmalloc(TIFFStripSize(tif));
@ -3046,7 +3047,7 @@ static int imagetoraw_common(opj_image_t * image, const char *outfile, OPJ_BOOL
{ {
FILE *rawFile = NULL; FILE *rawFile = NULL;
size_t res; size_t res;
int compno; unsigned int compno;
int w, h, fails; int w, h, fails;
int line, row, curr, mask; int line, row, curr, mask;
int *ptr; int *ptr;

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

@ -1000,7 +1000,7 @@ OPJ_BOOL opj_jp2_read_pclr( opj_jp2_t *jp2,
for(j = 0; j < nr_entries; ++j) { for(j = 0; j < nr_entries; ++j) {
for(i = 0; i < nr_channels; ++i) { for(i = 0; i < nr_channels; ++i) {
OPJ_INT32 bytes_to_read = (channel_size[i]+7)>>3; OPJ_UINT32 bytes_to_read = (channel_size[i]+7)>>3;
if (bytes_to_read > sizeof(OPJ_UINT32)) if (bytes_to_read > sizeof(OPJ_UINT32))
bytes_to_read = sizeof(OPJ_UINT32); bytes_to_read = sizeof(OPJ_UINT32);

2
tests/unit/testempty1.c
View File

@ -91,7 +91,7 @@ int main(int argc, char *argv[])
for (i = 0; i < image_width * image_height; i++) for (i = 0; i < image_width * image_height; i++)
{ {
int compno; unsigned int compno;
for(compno = 0; compno < numcomps; compno++) for(compno = 0; compno < numcomps; compno++)
{ {
image->comps[compno].data[i] = 0; image->comps[compno].data[i] = 0;

2
tests/unit/testempty2.c
View File

@ -96,7 +96,7 @@ int main(int argc, char *argv[])
for (i = 0; i < image_width * image_height; i++) for (i = 0; i < image_width * image_height; i++)
{ {
int compno; unsigned int compno;
for(compno = 0; compno < numcomps; compno++) for(compno = 0; compno < numcomps; compno++)
{ {
image->comps[compno].data[i] = 0; image->comps[compno].data[i] = 0;