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

[trunk] Another round of fixes for sign conversion warnings. 

Update issue 256
This commit is contained in:
Mathieu Malaterre 2014-03-07 12:06:00 +00:00
parent 472ce19183
commit 956b1a7697
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/jp2/opj_compress.c
View File

@ -623,8 +623,8 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
if (numlayers > 9) if (numlayers > 9)
s++; s++;
parameters->tcp_numlayers = numlayers; parameters->tcp_numlayers = (int)numlayers;
numresolution = parameters->numresolution; numresolution = (OPJ_UINT32)parameters->numresolution;
matrix_width = numresolution * 3; matrix_width = numresolution * 3;
parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int)); parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
s = s + 2; s = s + 2;
@ -799,7 +799,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
} }
s++; s++;
} }
parameters->numpocs = numpocs; parameters->numpocs = (OPJ_UINT32)numpocs;
} }
break; break;
@ -935,7 +935,8 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
float *lCurrentDoublePtr; float *lCurrentDoublePtr;
float *lSpace; float *lSpace;
int *l_int_ptr; int *l_int_ptr;
int lNbComp = 0, lTotalComp, lMctComp, i; long int lStrLen, lStrFread; int lNbComp = 0, lTotalComp, lMctComp, i;
size_t lStrLen, lStrFread;
/* Open file */ /* Open file */
FILE * lFile = fopen(lFilename,"r"); FILE * lFile = fopen(lFilename,"r");
@ -945,7 +946,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
/* Set size of file and read its content*/ /* Set size of file and read its content*/
fseek(lFile,0,SEEK_END); fseek(lFile,0,SEEK_END);
lStrLen = ftell(lFile); lStrLen = (size_t)ftell(lFile);
fseek(lFile,0,SEEK_SET); fseek(lFile,0,SEEK_SET);
lMatrix = (char *) malloc(lStrLen + 1); lMatrix = (char *) malloc(lStrLen + 1);
lStrFread = fread(lMatrix, 1, lStrLen, lFile); lStrFread = fread(lMatrix, 1, lStrLen, lFile);
@ -969,7 +970,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
lNbComp = (int) (sqrt(4*lNbComp + 1)/2. - 0.5); lNbComp = (int) (sqrt(4*lNbComp + 1)/2. - 0.5);
lMctComp = lNbComp * lNbComp; lMctComp = lNbComp * lNbComp;
lTotalComp = lMctComp + lNbComp; lTotalComp = lMctComp + lNbComp;
lSpace = (float *) malloc(lTotalComp * sizeof(float)); lSpace = (float *) malloc((size_t)lTotalComp * sizeof(float));
lCurrentDoublePtr = lSpace; lCurrentDoublePtr = lSpace;
for (i=0;i<lMctComp;++i) { for (i=0;i<lMctComp;++i) {
lStrLen = strlen(lCurrentPtr) + 1; lStrLen = strlen(lCurrentPtr) + 1;
@ -985,7 +986,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
} }
/* TODO should not be here ! */ /* TODO should not be here ! */
opj_set_MCT(parameters, lSpace, (int *)(lSpace + lMctComp), lNbComp); opj_set_MCT(parameters, lSpace, (int *)(lSpace + lMctComp), (OPJ_UINT32)lNbComp);
/* Free memory*/ /* Free memory*/
free(lSpace); free(lSpace);
@ -1501,7 +1502,7 @@ int main(int argc, char **argv) {
fprintf(stderr,"\n"); fprintf(stderr,"\n");
if(img_fol.set_imgdir==1){ if(img_fol.set_imgdir==1){
if (get_next_file(imageno, dirptr,&img_fol, &parameters)) { if (get_next_file((int)imageno, dirptr,&img_fol, &parameters)) {
fprintf(stderr,"skipping file...\n"); fprintf(stderr,"skipping file...\n");
continue; continue;
} }