[trunk][JPIP] fixed opj_server execusion error (instant terminating) with autotool...

[openjpeg.git] / applications / JavaOpenJPEG / JavaOpenJPEGDecoder.c

diff --git a/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
index decc1373d122e623a434789dcab0129d6bcc2a95..a273028c6f1d72572fa52d24128471e3551aaa6b 100644 (file)
--- a/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
+++ b/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
@@ -37,7 +37,7 @@
 #include <math.h>\r
 \r
 #include "openjpeg.h"\r
-#include "getopt.h"\r
+#include "opj_getopt.h"\r
 #include "convert.h"\r
 #include "dirent.h"\r
 #include "org_openJpeg_OpenJPEGJavaDecoder.h"\r
@@ -206,7 +206,7 @@ int get_file_format(char *filename) {
 int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {\r
        /* parse the command line */\r
        int totlen;\r
-       option_t long_option[]={\r
+       opj_option_t long_option[]={\r
                {"ImgDir",REQ_ARG, NULL ,'y'},\r
                {"OutFor",REQ_ARG, NULL ,'O'},\r
        };\r
@@ -229,13 +229,13 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
        reset_options_reading();\r
 \r
        while (1) {\r
-               int c = getopt_long(argc, argv,optlist,long_option,totlen);\r
+               int c = opj_getopt_long(argc, argv,optlist,long_option,totlen);\r
                if (c == -1)\r
                        break;\r
                switch (c) {\r
                        case 'i':                       /* input file */\r
                        {\r
-                               char *infile = optarg;\r
+                               char *infile = opj_optarg;\r
                                parameters->decod_format = get_file_format(infile);\r
                                switch(parameters->decod_format) {\r
                                        case J2K_CFMT:\r
@@ -256,7 +256,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
 \r
                        case 'o':                       /* output file */\r
                        {\r
-                               char *outfile = optarg;\r
+                               char *outfile = opj_optarg;\r
                                parameters->cod_format = get_file_format(outfile);\r
                                switch(parameters->cod_format) {\r
                                        case PGX_DFMT:\r
@@ -279,7 +279,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
                        case 'O':                       /* output format */\r
                        {\r
                                char outformat[50];\r
-                               char *of = optarg;\r
+                               char *of = opj_optarg;\r
                                sprintf(outformat,".%s",of);\r
                                img_fol->set_out_format = 1;\r
                                parameters->cod_format = get_file_format(outformat);\r
@@ -315,7 +315,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
 \r
                        case 'r':               /* reduce option */\r
                        {\r
-                               sscanf(optarg, "%d", &parameters->cp_reduce);\r
+                               sscanf(opj_optarg, "%d", &parameters->cp_reduce);\r
                        }\r
                        break;\r
                        \r
@@ -324,7 +324,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
 \r
                        case 'l':               /* layering option */\r
                        {\r
-                               sscanf(optarg, "%d", &parameters->cp_layer);\r
+                               sscanf(opj_optarg, "%d", &parameters->cp_layer);\r
                        }\r
                        break;\r
                        \r
@@ -338,8 +338,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
 \r
                        case 'y':                       /* Image Directory path */\r
                                {\r
-                                       img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);\r
-                                       strcpy(img_fol->imgdirpath,optarg);\r
+                                       img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);\r
+                                       strcpy(img_fol->imgdirpath,opj_optarg);\r
                                        img_fol->set_imgdir=1;\r
                                }\r
                                break;\r
@@ -351,7 +351,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
                        {\r
                                char *token = NULL;\r
 \r
-                               token = strtok(optarg, ",");\r
+                               token = strtok(opj_optarg, ",");\r
                                while(token != NULL) {\r
 \r
                                        /* search expected number of components */\r
@@ -418,7 +418,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
                                /* ----------------------------------------------------- */\r
                        \r
                        default:\r
-                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);\r
+                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);\r
                                break;\r
                }\r
        }\r