#include <ctype.h>
#include "opj_config.h"
-#include "getopt.h"
+#include "opj_getopt.h"
#include "openjpeg.h"
#include "format_defs.h"
param->tabPEAKvalues = NULL;
param->nr_flag = 0;
- opterr = 0;
+ opj_opterr = 0;
- while ((c = getopt(argc, argv, optlist)) != -1)
+ while ((c = opj_getopt(argc, argv, optlist)) != -1)
switch (c)
{
case 'b':
- sizemembasefile = (int)strlen(optarg)+1;
+ sizemembasefile = (int)strlen(opj_optarg)+1;
param->base_filename = (char*) malloc(sizemembasefile);
param->base_filename[0] = '\0';
- strncpy(param->base_filename, optarg, strlen(optarg));
- param->base_filename[strlen(optarg)] = '\0';
+ strncpy(param->base_filename, opj_optarg, strlen(opj_optarg));
+ param->base_filename[strlen(opj_optarg)] = '\0';
//printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile );
break;
case 't':
- sizememtestfile = (int) strlen(optarg) + 1;
+ sizememtestfile = (int) strlen(opj_optarg) + 1;
param->test_filename = (char*) malloc(sizememtestfile);
param->test_filename[0] = '\0';
- strncpy(param->test_filename, optarg, strlen(optarg));
- param->test_filename[strlen(optarg)] = '\0';
+ strncpy(param->test_filename, opj_optarg, strlen(opj_optarg));
+ param->test_filename[strlen(opj_optarg)] = '\0';
//printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile);
break;
case 'n':
- param->nbcomp = atoi(optarg);
+ param->nbcomp = atoi(opj_optarg);
break;
case 'm':
- MSElistvalues = optarg;
+ MSElistvalues = opj_optarg;
flagM = 1;
break;
case 'p':
- PEAKlistvalues = optarg;
+ PEAKlistvalues = opj_optarg;
flagP = 1;
break;
case 'd':
param->nr_flag = 1;
break;
case 's':
- separatorList = optarg;
+ separatorList = opj_optarg;
break;
case '?':
- if ((optopt == 'b') || (optopt == 't') || (optopt == 'n') || (optopt == 'p') || (optopt == 'm') || (optopt
+ if ((opj_optopt == 'b') || (opj_optopt == 't') || (opj_optopt == 'n') || (opj_optopt == 'p') || (opj_optopt == 'm') || (opj_optopt
== 's'))
- fprintf(stderr, "Option -%c requires an argument.\n", optopt);
+ fprintf(stderr, "Option -%c requires an argument.\n", opj_optopt);
else
- if (isprint(optopt)) fprintf(stderr, "Unknown option `-%c'.\n", optopt);
- else fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
+ if (isprint(opj_optopt)) fprintf(stderr, "Unknown option `-%c'.\n", opj_optopt);
+ else fprintf(stderr, "Unknown option character `\\x%x'.\n", opj_optopt);
return 1;
default:
- fprintf(stderr, "WARNING -> this option is not valid \"-%c %s\"\n", c, optarg);
+ fprintf(stderr, "WARNING -> this option is not valid \"-%c %s\"\n", c, opj_optarg);
break;
}
- if (optind != argc)
+ if (opj_optind != argc)
{
- for (index = optind; index < argc; index++)
+ for (index = opj_optind; index < argc; index++)
fprintf(stderr,"Non-option argument %s\n", argv[index]);
return EXIT_FAILURE;
}
}
if (it_comp != nbcomp)
+ {
+ free(outArgs);
return NULL;
+ }
else
return outArgs;
}
// Read the pgx file corresponding to the component
image_read = pgxtoimage(filenameComponentPGX, ¶meters);
if (!image_read)
- {
- fprintf(stderr, "Unable to load pgx file\n");
- return NULL;
- }
+ {
+ int it_free_data;
+ fprintf(stderr, "Unable to load pgx file\n");
+
+ free(param_image_read);
+
+ for (it_free_data = 0; it_free_data < it_file; it_free_data++) {
+ free(data[it_free_data]);
+ }
+ free(data);
+
+ free(filenameComponentPGX);
+
+ return NULL;
+ }
// Set the image_read parameters
param_image_read[it_file].x0 = 0;
if( parse_cmdline_cmp(argc, argv, &inParam) == EXIT_FAILURE )
{
comparePGXimages_help_display();
- if (!inParam.tabMSEvalues) free(inParam.tabMSEvalues);
- if (!inParam.tabPEAKvalues) free(inParam.tabPEAKvalues);
- if (!inParam.base_filename) free(inParam.base_filename);
- if (!inParam.test_filename) free(inParam.test_filename);
+ if (inParam.tabMSEvalues) free(inParam.tabMSEvalues);
+ if (inParam.tabPEAKvalues) free(inParam.tabPEAKvalues);
+ if (inParam.base_filename) free(inParam.base_filename);
+ if (inParam.test_filename) free(inParam.test_filename);
return EXIT_FAILURE;
}
}
else
{
- if (!inParam.tabMSEvalues) free(inParam.tabMSEvalues);
- if (!inParam.tabPEAKvalues) free(inParam.tabPEAKvalues);
- if (!inParam.base_filename) free(inParam.base_filename);
- if (!inParam.test_filename) free(inParam.test_filename);
+ if (inParam.tabMSEvalues) free(inParam.tabMSEvalues);
+ if (inParam.tabPEAKvalues) free(inParam.tabPEAKvalues);
+ if (inParam.base_filename) free(inParam.base_filename);
+ if (inParam.test_filename) free(inParam.test_filename);
return EXIT_FAILURE;
}
}
else
{
- if (!inParam.tabMSEvalues) free(inParam.tabMSEvalues);
- if (!inParam.tabPEAKvalues) free(inParam.tabPEAKvalues);
- if (!inParam.base_filename) free(inParam.base_filename);
- if (!inParam.test_filename) free(inParam.test_filename);
+ if (inParam.tabMSEvalues) free(inParam.tabMSEvalues);
+ if (inParam.tabPEAKvalues) free(inParam.tabPEAKvalues);
+ if (inParam.base_filename) free(inParam.base_filename);
+ if (inParam.test_filename) free(inParam.test_filename);
free(filenamePNGbase);
return EXIT_FAILURE;
}