diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-16 10:29:30 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-16 10:29:30 +0000 |
| commit | c469e1339fc032757cff232c785bb6cb45b7f993 (patch) | |
| tree | c4f40ebd2af959f0347abd00fd2a504adaecfcb3 /applications/codec | |
| parent | abf9809c2249b277f9ba13d79018d64a5ec8bfce (diff) | |
Remove some simple warnings about comments
Diffstat (limited to 'applications/codec')
| -rw-r--r-- | applications/codec/image_to_j2k.c | 8 | ||||
| -rw-r--r-- | applications/codec/index.c | 4 | ||||
| -rw-r--r-- | applications/codec/j2k_dump.c | 14 | ||||
| -rw-r--r-- | applications/codec/j2k_to_image.c | 12 |
4 files changed, 19 insertions, 19 deletions
diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c index ee671bb4..dd8425db 100644 --- a/applications/codec/image_to_j2k.c +++ b/applications/codec/image_to_j2k.c @@ -427,7 +427,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparamet sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename); strncpy(parameters->infile, infilename, sizeof(infilename)); - //Set output file + /*Set output file*/ strcpy(temp_ofname,get_file_name(image_filename)); while((temp_p = strtok(NULL,".")) != NULL){ strcat(temp_ofname,temp1); @@ -1550,7 +1550,7 @@ int main(int argc, char **argv) { num_images=get_num_images(img_fol.imgdirpath); dirptr=(dircnt_t*)malloc(sizeof(dircnt_t)); 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*)malloc(num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ dirptr->filename = (char**) malloc(num_images*sizeof(char*)); if(!dirptr->filename_buf){ return 0; @@ -1699,7 +1699,7 @@ int main(int argc, char **argv) { cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0); /* encode the image */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ bSuccess = opj_encode_with_info(cinfo, cio, image, &cstr_info); else bSuccess = opj_encode(cinfo, cio, image, NULL); @@ -1760,7 +1760,7 @@ int main(int argc, char **argv) { cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0); /* encode the image */ - if (*indexfilename || parameters.jpip_on) // If need to extract codestream information + if (*indexfilename || parameters.jpip_on) /* If need to extract codestream information*/ bSuccess = opj_encode_with_info(cinfo, cio, image, &cstr_info); else bSuccess = opj_encode(cinfo, cio, image, NULL); diff --git a/applications/codec/index.c b/applications/codec/index.c index 873b3403..95cddb91 100644 --- a/applications/codec/index.c +++ b/applications/codec/index.c @@ -260,7 +260,7 @@ int write_index_file(opj_codestream_info_t *cstr_info, char *index) { int x1 = x0 + cstr_info->tile_x;
int y1 = y0 + cstr_info->tile_y;
- // Count the maximum number of precincts
+ /* Count the maximum number of precincts */
int max_numprec = 0;
for (resno = 0; resno < max_numdecompos + 1; resno++) {
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
@@ -311,7 +311,7 @@ int write_index_file(opj_codestream_info_t *cstr_info, char *index) { } /* PCRL */
else { /* CPRL */
- // Count the maximum number of precincts
+ /* Count the maximum number of precincts */
int max_numprec = 0;
for (resno = 0; resno < max_numdecompos + 1; resno++) {
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index 82b9f6f6..6977c9cd 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -180,7 +180,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename); strncpy(parameters->infile, infilename, sizeof(infilename)); - //Set output file + /*Set output file*/ strcpy(temp_ofname,strtok(image_filename,".")); while((temp_p = strtok(NULL,".")) != NULL){ strcat(temp_ofname,temp1); @@ -356,7 +356,7 @@ int main(int argc, char *argv[]) dirptr=(dircnt_t*)malloc(sizeof(dircnt_t)); 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*)malloc(num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ dirptr->filename = (char**) malloc(num_images*sizeof(char*)); if(!dirptr->filename_buf){ @@ -377,7 +377,7 @@ int main(int argc, char *argv[]) num_images=1; } - // + /* */ if (parameters.outfile[0] != 0) { fout = fopen(parameters.outfile,"w"); @@ -445,7 +445,7 @@ int main(int argc, char *argv[]) cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); /* decode the stream and fill the image structure */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ image = opj_decode_with_info(dinfo, cio, &cstr_info); else image = opj_decode(dinfo, cio); @@ -494,7 +494,7 @@ int main(int argc, char *argv[]) cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); /* decode the stream and fill the image structure */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ image = opj_decode_with_info(dinfo, cio, &cstr_info); else image = opj_decode(dinfo, cio); @@ -547,7 +547,7 @@ int main(int argc, char *argv[]) cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); /* decode the stream and fill the image structure */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ image = opj_decode_with_info(dinfo, cio, &cstr_info); else image = opj_decode(dinfo, cio); @@ -611,7 +611,7 @@ static void j2k_dump_image(FILE *fd, opj_image_t * img) { fprintf(fd, " comp %d {\n", compno); fprintf(fd, " dx=%d, dy=%d\n", comp->dx, comp->dy); fprintf(fd, " prec=%d\n", comp->prec); - //fprintf(fd, " bpp=%d\n", comp->bpp); + /*fprintf(fd, " bpp=%d\n", comp->bpp);*/ fprintf(fd, " sgnd=%d\n", comp->sgnd); fprintf(fd, " }\n"); } diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c index 12e037c1..36967b27 100644 --- a/applications/codec/j2k_to_image.c +++ b/applications/codec/j2k_to_image.c @@ -221,7 +221,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename); strncpy(parameters->infile, infilename, sizeof(infilename)); - //Set output file + /*Set output file*/ strcpy(temp_ofname,strtok(image_filename,".")); while((temp_p = strtok(NULL,".")) != NULL){ strcat(temp_ofname,temp1); @@ -551,7 +551,7 @@ int main(int argc, char **argv) { dirptr=(dircnt_t*)malloc(sizeof(dircnt_t)); 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*)malloc(num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/ dirptr->filename = (char**) malloc(num_images*sizeof(char*)); if(!dirptr->filename_buf){ @@ -625,7 +625,7 @@ int main(int argc, char **argv) { cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); /* decode the stream and fill the image structure */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ image = opj_decode_with_info(dinfo, cio, &cstr_info); else image = opj_decode(dinfo, cio); @@ -668,7 +668,7 @@ int main(int argc, char **argv) { cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); /* decode the stream and fill the image structure */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ image = opj_decode_with_info(dinfo, cio, &cstr_info); else image = opj_decode(dinfo, cio); @@ -711,7 +711,7 @@ int main(int argc, char **argv) { cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); /* decode the stream and fill the image structure */ - if (*indexfilename) // If need to extract codestream information + if (*indexfilename) /* If need to extract codestream information*/ image = opj_decode_with_info(dinfo, cio, &cstr_info); else image = opj_decode(dinfo, cio); @@ -847,7 +847,7 @@ int main(int argc, char **argv) { } return 0; } -//end main +/*end main*/ |
