Merge branch 'master' into openjpeg-2.1

11 files changed, 71 insertions, 27 deletions

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index f8b23ada..f8c50e5b 100644
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -69,8 +69,8 @@ if("$ENV{CC}" MATCHES ".*mingw.*")
 endif()
 
 if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
-	# To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare 
-	# it to the baseline. Kakadu binaries are freely available for non-commercial purposes 
+	# To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare
+	# it to the baseline. Kakadu binaries are freely available for non-commercial purposes
 	# at http://www.kakadusoftware.com.
 	# Here's the copyright notice from kakadu:
 	# Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.
@@ -91,7 +91,7 @@ else()
 	set(BUILD_TESTING "FALSE")
 endif(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
 
-# Options 
+# Options
 set( CACHE_CONTENTS "
 
 # Build kind
@@ -103,19 +103,19 @@ CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} ${CCFLAGS_WARNING}
 # Use to activate the test suite
 BUILD_TESTING:BOOL=${BUILD_TESTING}
 
-# Build Thirdparty, useful but not required for test suite 
+# Build Thirdparty, useful but not required for test suite
 BUILD_THIRDPARTY:BOOL=TRUE
 
 # JPEG2000 test files are available with git clone https://github.com/uclouvain/openjpeg-data.git
 OPJ_DATA_ROOT:PATH=$ENV{PWD}/data
 
-# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer  
+# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer
 JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT}
 
 " )
 
 #---------------------
-#1. openjpeg specific: 
+#1. openjpeg specific:
 set( CTEST_PROJECT_NAME	"OPENJPEG" )
 if(NOT EXISTS $ENV{OPJ_SOURCE_DIR})
 	message(FATAL_ERROR "OPJ_SOURCE_DIR not defined or does not exist:$ENV{OPJ_SOURCE_DIR}")
diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh
index c62feee8..1a4c0bb9 100755
--- a/tools/travis-ci/install.sh
+++ b/tools/travis-ci/install.sh
@@ -37,9 +37,9 @@ fi
 
 if [ "${OPJ_CI_ASAN:-}" == "1" ]; then
 	# We need a new version of cmake than travis-ci provides
-	wget --no-check-certificate -qO - https://cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz | tar -xz
+	wget --no-check-certificate -qO - https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz | tar -xz
 	# copy to a directory that will not changed every version
-	mv cmake-3.3.2-Linux-x86_64 cmake-install
+	mv cmake-3.5.2-Linux-x86_64 cmake-install
 fi
 
 if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
@@ -62,16 +62,17 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
 	git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data
 
 	# We need jpylyzer for the test suite
+    JPYLYZER_VERSION="1.17.0"    
 	echo "Retrieving jpylyzer"
 	if [ "${APPVEYOR:-}" == "True" ]; then
-		wget --local-encoding=UTF-8 -q http://dl.bintray.com/openplanets/opf-windows/jpylyzer_1.14.2_win32.zip
+		wget --local-encoding=UTF-8 -q http://dl.bintray.com/openplanets/opf-windows/jpylyzer_${JPYLYZER_VERSION}_win32.zip
 		mkdir jpylyzer
 		cd jpylyzer
-		cmake -E tar -xf ../jpylyzer_1.14.2_win32.zip
+		cmake -E tar -xf ../jpylyzer_${JPYLYZER_VERSION}_win32.zip
 		cd ..
 	else
-		wget -qO - https://github.com/openpreserve/jpylyzer/archive/1.14.2.tar.gz | tar -xz
-		mv jpylyzer-1.14.2/jpylyzer ./
+		wget -qO - https://github.com/openpreserve/jpylyzer/archive/${JPYLYZER_VERSION}.tar.gz | tar -xz
+		mv jpylyzer-${JPYLYZER_VERSION}/jpylyzer ./
 		chmod +x jpylyzer/jpylyzer.py
 	fi
 
@@ -114,3 +115,33 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
 		fi
 	fi
 fi
+
+# Install clang if necessary.
+# clang-3.4 is available on base image
+# For more up-to-date versions, use packages from http://llvm.org/apt
+# Cannot use addons.apt.packages because clang-3.9 is currently on hold
+# (see https://github.com/travis-ci/apt-package-whitelist/pull/2780 or https://github.com/travis-ci/apt-package-whitelist/pull/2770)
+# "sudo: required" should be set in .travis.yml matrix for those configurations
+if echo "${CC:-}" | egrep -q "^clang-3.[7-9]?$" ; then
+  case "${CC:-}" in
+  clang-3.7)
+    echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.7 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+    ;;
+  clang-3.8)
+    echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.8 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+    ;;
+  clang-3.9)
+    echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" | sudo tee /etc/apt/sources.list.d/llvm.list
+    ;;
+  *)
+    echo "We should never have been there. Exiting..."
+    exit 1
+  esac
+  wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+
+  # On precise, ubuntu-toolchain ppa must be installed also (see http://llvm.org/apt)
+  sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+
+  sudo apt-get update -qq
+  sudo apt-get install "${CC:-}" -y
+fi
diff --git a/tools/travis-ci/knownfailures-Ubuntu12.04-clang3.9.0-x86_64-Debug-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu12.04-clang3.9.0-x86_64-Debug-3rdP.txt
new file mode 100644
index 00000000..2554d91c
--- /dev/null
+++ b/tools/travis-ci/knownfailures-Ubuntu12.04-clang3.9.0-x86_64-Debug-3rdP.txt
@@ -0,0 +1,8 @@
+NR-ENC-X_4_2K_24_185_CBR_WB_000.tif-15-compare_dec-ref-out2base
+NR-ENC-X_5_2K_24_235_CBR_STEM24_000.tif-16-compare_dec-ref-out2base
+NR-ENC-X_6_2K_24_FULL_CBR_CIRCLE_000.tif-17-compare_dec-ref-out2base
+NR-ENC-X_4_2K_24_185_CBR_WB_000.tif-18-compare_dec-ref-out2base
+NR-ENC-X_5_2K_24_235_CBR_STEM24_000.tif-19-compare_dec-ref-out2base
+NR-ENC-X_6_2K_24_FULL_CBR_CIRCLE_000.tif-20-compare_dec-ref-out2base
+NR-ENC-ElephantDream_4K.tif-21-compare_dec-ref-out2base
+NR-ENC-issue141.rawl-23-compare_dec-ref-out2base
diff --git a/tools/travis-ci/knownfailures-Ubuntu12.04-clang3.9.0-x86_64-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu12.04-clang3.9.0-x86_64-Release-3rdP.txt
new file mode 100644
index 00000000..2554d91c
--- /dev/null
+++ b/tools/travis-ci/knownfailures-Ubuntu12.04-clang3.9.0-x86_64-Release-3rdP.txt
@@ -0,0 +1,8 @@
+NR-ENC-X_4_2K_24_185_CBR_WB_000.tif-15-compare_dec-ref-out2base
+NR-ENC-X_5_2K_24_235_CBR_STEM24_000.tif-16-compare_dec-ref-out2base
+NR-ENC-X_6_2K_24_FULL_CBR_CIRCLE_000.tif-17-compare_dec-ref-out2base
+NR-ENC-X_4_2K_24_185_CBR_WB_000.tif-18-compare_dec-ref-out2base
+NR-ENC-X_5_2K_24_235_CBR_STEM24_000.tif-19-compare_dec-ref-out2base
+NR-ENC-X_6_2K_24_FULL_CBR_CIRCLE_000.tif-20-compare_dec-ref-out2base
+NR-ENC-ElephantDream_4K.tif-21-compare_dec-ref-out2base
+NR-ENC-issue141.rawl-23-compare_dec-ref-out2base
diff --git a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt
index 2c74d31a..40b84e5f 100644
--- a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt
+++ b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt
@@ -21,8 +21,6 @@ NR-DEC-_00042.j2k-2-decode-md5
 NR-DEC-buxI.j2k-9-decode-md5
 NR-DEC-CT_Phillips_JPEG2K_Decompr_Problem.j2k-13-decode-md5
 NR-DEC-Marrin.jp2-18-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
 NR-DEC-file409752.jp2-40-decode-md5
 NR-DEC-issue188_beach_64bitsbox.jp2-41-decode-md5
 NR-DEC-issue206_image-000.jp2-42-decode-md5
@@ -31,7 +29,6 @@ NR-DEC-issue228.j2k-60-decode-md5
 NR-DEC-issue134.jp2-67-decode-md5
 NR-DEC-issue208.jp2-69-decode-md5
 NR-DEC-issue211.jp2-70-decode-md5
-NR-DEC-issue135.j2k-68-decode-md5
 NR-DEC-issue414.jp2-110-decode-md5
 NR-DEC-p1_04.j2k-124-decode-md5
 NR-DEC-p1_04.j2k-125-decode-md5
@@ -51,3 +48,6 @@ NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
 NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5
 NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
 NR-DEC-p1_06.j2k-164-decode
+NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
+NR-DEC-issue135.j2k-68-decode-md5
diff --git a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt
index 2c74d31a..40b84e5f 100644
--- a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt
+++ b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt
@@ -21,8 +21,6 @@ NR-DEC-_00042.j2k-2-decode-md5
 NR-DEC-buxI.j2k-9-decode-md5
 NR-DEC-CT_Phillips_JPEG2K_Decompr_Problem.j2k-13-decode-md5
 NR-DEC-Marrin.jp2-18-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
 NR-DEC-file409752.jp2-40-decode-md5
 NR-DEC-issue188_beach_64bitsbox.jp2-41-decode-md5
 NR-DEC-issue206_image-000.jp2-42-decode-md5
@@ -31,7 +29,6 @@ NR-DEC-issue228.j2k-60-decode-md5
 NR-DEC-issue134.jp2-67-decode-md5
 NR-DEC-issue208.jp2-69-decode-md5
 NR-DEC-issue211.jp2-70-decode-md5
-NR-DEC-issue135.j2k-68-decode-md5
 NR-DEC-issue414.jp2-110-decode-md5
 NR-DEC-p1_04.j2k-124-decode-md5
 NR-DEC-p1_04.j2k-125-decode-md5
@@ -51,3 +48,6 @@ NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
 NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5
 NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
 NR-DEC-p1_06.j2k-164-decode
+NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
+NR-DEC-issue135.j2k-68-decode-md5
diff --git a/tools/travis-ci/knownfailures-Ubuntu14.04-gcc4.8.4-i386-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu14.04-gcc4.8.4-i386-Release-3rdP.txt
index fe66aa36..2e33de84 100644
--- a/tools/travis-ci/knownfailures-Ubuntu14.04-gcc4.8.4-i386-Release-3rdP.txt
+++ b/tools/travis-ci/knownfailures-Ubuntu14.04-gcc4.8.4-i386-Release-3rdP.txt
@@ -15,8 +15,6 @@ NR-DEC-_00042.j2k-2-decode-md5
 NR-DEC-buxI.j2k-9-decode-md5
 NR-DEC-CT_Phillips_JPEG2K_Decompr_Problem.j2k-13-decode-md5
 NR-DEC-Marrin.jp2-18-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
 NR-DEC-file409752.jp2-40-decode-md5
 NR-DEC-issue188_beach_64bitsbox.jp2-41-decode-md5
 NR-DEC-issue206_image-000.jp2-42-decode-md5
@@ -43,3 +41,6 @@ NR-DEC-issue205.jp2-253-decode-md5
 NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5
 NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
 NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
+NR-DEC-issue135.j2k-68-decode-md5
diff --git a/tools/travis-ci/knownfailures-all.txt b/tools/travis-ci/knownfailures-all.txt
index e2c01aaa..bfcfa0a0 100644
--- a/tools/travis-ci/knownfailures-all.txt
+++ b/tools/travis-ci/knownfailures-all.txt
@@ -1,6 +1,5 @@
 NR-DEC-p1_06.j2k-164-decode
 NR-DEC-issue104_jpxstream.jp2-33-decode-md5
-NR-DEC-issue135.j2k-68-decode-md5
 NR-DEC-issue226.j2k-74-decode-md5
 NR-DEC-p1_06.j2k-156-decode-md5
 NR-DEC-p1_06.j2k-164-decode-md5
diff --git a/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt b/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt
index d243c235..ac826b32 100644
--- a/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt
+++ b/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt
@@ -14,8 +14,6 @@ NR-DEC-_00042.j2k-2-decode-md5
 NR-DEC-buxI.j2k-9-decode-md5
 NR-DEC-CT_Phillips_JPEG2K_Decompr_Problem.j2k-13-decode-md5
 NR-DEC-Marrin.jp2-18-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
 NR-DEC-file409752.jp2-40-decode-md5
 NR-DEC-issue188_beach_64bitsbox.jp2-41-decode-md5
 NR-DEC-issue206_image-000.jp2-42-decode-md5
@@ -44,3 +42,6 @@ NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
 NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
 ETS-C1P0-p0_12.j2k-compare2ref
 NR-C1P0-p0_12.j2k-compare2base
+NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
+NR-DEC-issue135.j2k-68-decode-md5
diff --git a/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt b/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt
index e52efb85..dd0782c2 100644
--- a/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt
+++ b/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt
@@ -1,5 +1,3 @@
 NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base
-NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
 ETS-C1P0-p0_12.j2k-compare2ref
 NR-C1P0-p0_12.j2k-compare2base
diff --git a/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt b/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt
index e52efb85..dd0782c2 100644
--- a/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt
+++ b/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt
@@ -1,5 +1,3 @@
 NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base
-NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
-NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
 ETS-C1P0-p0_12.j2k-compare2ref
 NR-C1P0-p0_12.j2k-compare2base