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

[trunk] fix error with new way to detect kdu_expand

This commit is contained in:
Mickael Savinaud 2011-11-29 09:28:02 +00:00
parent b3368a85da
commit 3932e860ca
2 changed files with 5 additions and 2 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 ! : changed
+ : added + : added
November 29, 2011
* [mickael] fix error with new way to detect kdu_expand
November 27, 2011 November 27, 2011
* [jmalik] clean up redundant includes already handled in opj_includes.h * [jmalik] clean up redundant includes already handled in opj_includes.h
* [jmalik] reverted changeset 1091 (see issue #103) * [jmalik] reverted changeset 1091 (see issue #103)

4
tests/nonregression/CMakeLists.txt
View File

@ -263,7 +263,7 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump) NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump)
# Decode the encoding file with kakadu expand command # Decode the encoding file with kakadu expand command
IF (NOT REF_DECODER_NOTFOUND) IF (REF_DECODER_BIN_PATH)
IF (NOT WIN32) IF (NOT WIN32)
# Need a bash script to export the path of the kakadu library into PATH # Need a bash script to export the path of the kakadu library into PATH
ADD_TEST( NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref ADD_TEST( NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref
@ -294,7 +294,7 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
PROPERTIES DEPENDS PROPERTIES DEPENDS
NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref)
ENDIF(NOT REF_DECODER_NOTFOUND) ENDIF(REF_DECODER_BIN_PATH)
ENDIF(FAILED_TEST_FOUND) ENDIF(FAILED_TEST_FOUND)
# DECODER TEST SUITE # DECODER TEST SUITE