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

Comment introcudec (Created by OpenJPEG version 0.9) + Memory leaks fixed

This commit is contained in:
Francois-Olivier Devaux 2004-07-16 08:59:15 +00:00
parent c81b74d91b
commit e28d3d63ea
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
codec/image_to_j2k.c
View File

@ -300,7 +300,7 @@ int main(int argc, char **argv)
Dim[1] = 0; Dim[1] = 0;
TX0 = 0; TX0 = 0;
TY0 = 0; TY0 = 0;
cp.comment = NULL; cp.comment = "Created by OpenJPEG version 0.9";
cp.disto_alloc = 0; cp.disto_alloc = 0;
cp.fixed_alloc = 0; cp.fixed_alloc = 0;
cp.fixed_quality = 0; //add fixed_quality cp.fixed_quality = 0; //add fixed_quality
@ -801,9 +801,9 @@ int main(int argc, char **argv)
} }
} }
else { else {
outbuf = (char *) malloc( cp.tdx * cp.tdy * 2); outbuf = (char *) malloc( cp.tdx * cp.tdy * cp.tw * cp.th * 2); /* Allocate memory for all tiles */
cio_init(outbuf, cp.tdx * cp.tdy * 2); cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
len = j2k_encode(&img, &cp, outbuf, cp.tdx * cp.tdy * 2, index); len = j2k_encode(&img, &cp, outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2, index);
if (len == 0) { if (len == 0) {
fprintf(stderr, "failed to encode image\n"); fprintf(stderr, "failed to encode image\n");
return 1; return 1;
@ -836,8 +836,8 @@ int main(int argc, char **argv)
/*For the moment, JP2 format does not use intermediary files for each tile*/ /*For the moment, JP2 format does not use intermediary files for each tile*/
cp.intermed_file=0; cp.intermed_file=0;
} }
outbuf = (char *) malloc( cp.tdx * cp.tdy * 2); outbuf = (char *) malloc( cp.tdx * cp.tdy * cp.tw * cp.th * 2);
cio_init(outbuf, cp.tdx * cp.tdy * 2); cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
len = jp2_encode(jp2_struct, &cp, outbuf, index); len = jp2_encode(jp2_struct, &cp, outbuf, index);
if (len == 0) { if (len == 0) {
fprintf(stderr, "failed to encode image\n"); fprintf(stderr, "failed to encode image\n");
@ -874,6 +874,14 @@ int main(int argc, char **argv)
} }
} }
/* Free memory */
free(img.comps);
free(cp_init.tcps);
if (tcp_init->numlayers > 9) free(cp.matrice);
for (tileno = 0; tileno < cp.tw * cp.th; tileno++)
free(cp.tcps[tileno].tccps);
free(cp.tcps);
system("pause"); system("pause");
return 0; return 0;
} }