walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

correct nightly crash on all platform linked to merge operation and missing opj_getopt command

This commit is contained in:
Mickael Savinaud 2011-09-02 09:00:58 +00:00
parent 9a89e2f162
commit 5213675ba8
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -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.

2
tests/compareRAWimages.c
View File

@ -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':

7
tests/nonregression/CMakeLists.txt
View File

@ -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