enable JPT-stream request from client viewer option

[openjpeg.git] / tests / compareRAWimages.c

diff --git a/tests/compareRAWimages.c b/tests/compareRAWimages.c
index 631d028d785719bc5edbcea6362c2aef4837763b..fb037c248c6d9b782e58ea4637304b0db0a15d46 100644 (file)
--- a/tests/compareRAWimages.c
+++ b/tests/compareRAWimages.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "getopt.h"
+#include "opj_getopt.h"
 
 void compareRAWimages_help_display(void);
 
@@ -73,40 +73,40 @@ int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
        param->base_filename = NULL;
        param->test_filename = NULL;
 
-       opterr = 0;
-       while ((c = getopt(argc, argv, optlist)) != -1)
+       opj_opterr = 0;
+       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 '?':
-                       if ((optopt == 'b') || (optopt == 't'))
-                               fprintf(stderr, "Option -%c requires an argument.\n", optopt);
+                       if ((opj_optopt == 'b') || (opj_optopt == 't'))
+                               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) {
-               for (index = optind; index < argc; index++)
+       if (opj_optind != argc) {
+               for (index = opj_optind; index < argc; index++)
                        fprintf(stderr,"Non-option argument %s\n", argv[index]);
                return EXIT_FAILURE;
     }