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

[trunk] Use opj_malloc/opj_free in jpip bin 

Update issue 177
This commit is contained in:
Mathieu Malaterre 2012-10-09 09:44:24 +00:00
parent 16d2dc662f
commit b18ffbd08a
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/bin/jpip/opj_jpip_compress.c
View File

@ -54,6 +54,7 @@
#include "opj_config.h" #include "opj_config.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "openjpip.h"
#include "opj_getopt.h" #include "opj_getopt.h"
#include "convert.h" #include "convert.h"
#include "index.h" #include "index.h"
@ -415,7 +416,7 @@ int get_file_format(char *filename) {
char * get_file_name(char *name){ char * get_file_name(char *name){
char *fname; char *fname;
fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char)); fname= (char*)opj_malloc(OPJ_PATH_LEN*sizeof(char));
fname= strtok(name,"."); fname= strtok(name,".");
return fname; return fname;
} }
@ -767,7 +768,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
parameters->tcp_numlayers = numlayers; parameters->tcp_numlayers = numlayers;
numresolution = parameters->numresolution; numresolution = parameters->numresolution;
matrix_width = numresolution * 3; matrix_width = numresolution * 3;
parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int)); parameters->cp_matrice = (int *) opj_malloc(numlayers * matrix_width * sizeof(int));
s = s + 2; s = s + 2;
for (i = 0; i < numlayers; i++) { for (i = 0; i < numlayers; i++) {
@ -995,7 +996,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
case 'C': /* add a comment */ case 'C': /* add a comment */
{ {
parameters->cp_comment = (char*)malloc(strlen(opj_optarg) + 1); parameters->cp_comment = (char*)opj_malloc(strlen(opj_optarg) + 1);
if(parameters->cp_comment) { if(parameters->cp_comment) {
strcpy(parameters->cp_comment, opj_optarg); strcpy(parameters->cp_comment, opj_optarg);
} }
@ -1024,7 +1025,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
case 'z': /* Image Directory path */ case 'z': /* Image Directory path */
{ {
img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1); img_fol->imgdirpath = (char*)opj_malloc(strlen(opj_optarg) + 1);
strcpy(img_fol->imgdirpath,opj_optarg); strcpy(img_fol->imgdirpath,opj_optarg);
img_fol->set_imgdir=1; img_fol->set_imgdir=1;
} }
@ -1081,7 +1082,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
fseek(lFile,0,SEEK_END); fseek(lFile,0,SEEK_END);
lStrLen = ftell(lFile); lStrLen = ftell(lFile);
fseek(lFile,0,SEEK_SET); fseek(lFile,0,SEEK_SET);
lMatrix = (char *) malloc(lStrLen + 1); lMatrix = (char *) opj_malloc(lStrLen + 1);
fread(lMatrix, lStrLen, 1, lFile); fread(lMatrix, lStrLen, 1, lFile);
fclose(lFile); fclose(lFile);
@ -1102,7 +1103,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
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 *) opj_malloc(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;
@ -1121,8 +1122,8 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
opj_set_MCT(parameters, lSpace, (int *)(lSpace + lMctComp), lNbComp); opj_set_MCT(parameters, lSpace, (int *)(lSpace + lMctComp), lNbComp);
/* Free memory*/ /* Free memory*/
free(lSpace); opj_free(lSpace);
free(lMatrix); opj_free(lMatrix);
} }
break; break;
@ -1619,7 +1620,7 @@ int main(int argc, char **argv) {
} }
if (parameters.cp_cinema){ if (parameters.cp_cinema){
img_fol.rates = (float*)malloc(parameters.tcp_numlayers * sizeof(float)); img_fol.rates = (float*)opj_malloc(parameters.tcp_numlayers * sizeof(float));
for(i=0; i< parameters.tcp_numlayers; i++){ for(i=0; i< parameters.tcp_numlayers; i++){
img_fol.rates[i] = parameters.tcp_rates[i]; img_fol.rates[i] = parameters.tcp_rates[i];
} }
@ -1633,10 +1634,10 @@ int main(int argc, char **argv) {
const char *version = opj_version(); const char *version = opj_version();
/* UniPG>> */ /* UniPG>> */
#ifdef USE_JPWL #ifdef USE_JPWL
parameters.cp_comment = (char*)malloc(clen+strlen(version)+11); parameters.cp_comment = (char*)opj_malloc(clen+strlen(version)+11);
sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version); sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version);
#else #else
parameters.cp_comment = (char*)malloc(clen+strlen(version)+1); parameters.cp_comment = (char*)opj_malloc(clen+strlen(version)+1);
sprintf(parameters.cp_comment,"%s%s", comment, version); sprintf(parameters.cp_comment,"%s%s", comment, version);
#endif #endif
/* <<UniPG */ /* <<UniPG */
@ -1645,10 +1646,10 @@ int main(int argc, char **argv) {
/* Read directory if necessary */ /* Read directory if necessary */
if(img_fol.set_imgdir==1){ if(img_fol.set_imgdir==1){
num_images=get_num_images(img_fol.imgdirpath); num_images=get_num_images(img_fol.imgdirpath);
dirptr=(dircnt_t*)malloc(sizeof(dircnt_t)); dirptr=(dircnt_t*)opj_malloc(sizeof(dircnt_t));
if(dirptr){ if(dirptr){
dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ dirptr->filename_buf = (char*)opj_malloc(num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/
dirptr->filename = (char**) malloc(num_images*sizeof(char*)); dirptr->filename = (char**) opj_malloc(num_images*sizeof(char*));
if(!dirptr->filename_buf){ if(!dirptr->filename_buf){
return 0; return 0;
} }
@ -1839,7 +1840,7 @@ int main(int argc, char **argv) {
if( bUseTiles ) { if( bUseTiles ) {
OPJ_BYTE *l_data; OPJ_BYTE *l_data;
OPJ_UINT32 l_data_size = 512*512*3; OPJ_UINT32 l_data_size = 512*512*3;
l_data = (OPJ_BYTE*) malloc( l_data_size * sizeof(OPJ_BYTE)); l_data = (OPJ_BYTE*) opj_malloc( l_data_size * sizeof(OPJ_BYTE));
memset(l_data, 0, l_data_size ); memset(l_data, 0, l_data_size );
assert( l_data ); assert( l_data );
for (i=0;i<l_nb_tiles;++i) { for (i=0;i<l_nb_tiles;++i) {
@ -1852,7 +1853,7 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
} }
free(l_data); opj_free(l_data);
} }
else { else {
bSuccess = bSuccess && opj_encode(l_codec, l_stream); bSuccess = bSuccess && opj_encode(l_codec, l_stream);
@ -1888,9 +1889,9 @@ int main(int argc, char **argv) {
} }
/* free user parameters structure */ /* free user parameters structure */
if(parameters.cp_comment) free(parameters.cp_comment); if(parameters.cp_comment) opj_free(parameters.cp_comment);
if(parameters.cp_matrice) free(parameters.cp_matrice); if(parameters.cp_matrice) opj_free(parameters.cp_matrice);
if(parameters.cp_cinema) free(img_fol.rates); if(parameters.cp_cinema) opj_free(img_fol.rates);
return 0; return 0;
} }