! : 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.
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':
# PROPERTIES DEPENDS
# NR-${filename}-decode)
-<<<<<<< .working
-ENDFOREACH(filepath)=======
ENDFOREACH(filepath)
ENDIF(NOT IGNORE_LINE_FOUND)
ENDFOREACH(OPJ_TEST_ENC_CMD_LINE)
-
-
-
-
->>>>>>> .merge-right.r907