diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | tests/compareRAWimages.c | 2 | ||||
| -rw-r--r-- | tests/nonregression/CMakeLists.txt | 7 |
3 files changed, 4 insertions, 8 deletions
@@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +September 2, 2011 +! [mickael] correct nightly crash on all platform linked to merge operation and missing opj_getopt command + September 1st, 2011 ! [antonin] renamed getopt.{c/h} to opj_getopt.{c/h} and forced the use of these files rather than the system ones. This fixed issue 78. Credit to Winfried. diff --git a/tests/compareRAWimages.c b/tests/compareRAWimages.c index 24738873..fb037c24 100644 --- a/tests/compareRAWimages.c +++ b/tests/compareRAWimages.c @@ -74,7 +74,7 @@ int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) param->test_filename = NULL; opj_opterr = 0; - while ((c = getopt(argc, argv, optlist)) != -1) + while ((c = opj_getopt(argc, argv, optlist)) != -1) switch (c) { case 'b': diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index 954f646d..a54450cc 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -51,8 +51,6 @@ FOREACH(filepath ${OPJ_DATA_NR_LIST}) # PROPERTIES DEPENDS # NR-${filename}-decode) -<<<<<<< .working -ENDFOREACH(filepath)======= ENDFOREACH(filepath) @@ -209,8 +207,3 @@ FOREACH(OPJ_TEST_ENC_CMD_LINE ${OPJ_TEST_ENC_CMD_LINE_LIST}) ENDIF(NOT IGNORE_LINE_FOUND) ENDFOREACH(OPJ_TEST_ENC_CMD_LINE) - - - - ->>>>>>> .merge-right.r907 |