diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-21 10:50:47 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-21 10:50:47 +0000 |
| commit | 2c75c27ee8153f9eabdc73a95cd5931a91f0d14e (patch) | |
| tree | 66902b891f2329366b17ff4ecd7071a94c881838 /codec | |
| parent | 1d0dbeb232a7e589cc9ca25405d0f045059c4561 (diff) | |
Solved problems with codec reading from image file directory when filename had more than one "." in name
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/image_to_j2k.c | 6 | ||||
| -rw-r--r-- | codec/j2k_to_image.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c index 75a763f8..0f5541ce 100644 --- a/codec/image_to_j2k.c +++ b/codec/image_to_j2k.c @@ -397,6 +397,7 @@ char * get_file_name(char *name){ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){ char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN]; + char *temp_p, temp1[OPJ_PATH_LEN]=""; strcpy(image_filename,dirptr->filename[imageno]); fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename); @@ -408,6 +409,10 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparamet //Set output file strcpy(temp_ofname,get_file_name(image_filename)); + while((temp_p = strtok(NULL,".")) != NULL){ + strcat(temp_ofname,temp1); + sprintf(temp1,".%s",temp_p); + } if(img_fol->set_out_format==1){ sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format); strncpy(parameters->outfile, outfilename, sizeof(outfilename)); @@ -1718,3 +1723,4 @@ int main(int argc, char **argv) { return 0; } + diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c index e19920c1..f0584554 100644 --- a/codec/j2k_to_image.c +++ b/codec/j2k_to_image.c @@ -202,6 +202,7 @@ int get_file_format(char *filename) { char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){ char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN]; + char *temp_p, temp1[OPJ_PATH_LEN]=""; strcpy(image_filename,dirptr->filename[imageno]); fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename); @@ -213,6 +214,10 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet //Set output file strcpy(temp_ofname,strtok(image_filename,".")); + while((temp_p = strtok(NULL,".")) != NULL){ + strcat(temp_ofname,temp1); + sprintf(temp1,".%s",temp_p); + } if(img_fol->set_out_format==1){ sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format); strncpy(parameters->outfile, outfilename, sizeof(outfilename)); @@ -750,3 +755,4 @@ int main(int argc, char **argv) { } //end main + |