Commit 093a10aa authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Merge branch 'feature/jorgen.lind/update_2.3' into '2.3'

Fix uninitialized secondTransformMask when the number of transform passes is...

See merge request !586
parents 629277ef c3ab0f53
Pipeline #99099 passed with stages
in 160 minutes and 27 seconds
......@@ -76,7 +76,7 @@ macro(Fetch3rdParty_Git name version url tag)
if (NOT (EXISTS ${SRC_DIR}))
FetchContent_Populate(${name}
GIT_REPOSITORY ${url}
GIT_TAG ${url_hash}
GIT_TAG ${tag}
GIT_SHALLOW ON
SOURCE_DIR ${SRC_DIR}
SUBBUILD_DIR ${thirdParty}/CMakeArtifacts/${name}-sub-${version}
......@@ -89,7 +89,7 @@ function(Fetch3rdParty)
set(FETCHCONTENT_QUIET OFF)
include(FetchContent)
Fetch3rdParty_Git(aws-cpp-sdk 1.9.197 https://github.com/aws/aws-sdk-cpp.git 1.9.197)
Fetch3rdParty_Git(aws-cpp-sdk 1.9.197a https://github.com/aws/aws-sdk-cpp.git 1.9.197)
Fetch3rdParty_Package(gtest 1.10.0 https://github.com/google/googletest/archive/release-1.10.0.tar.gz SHA256=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb)
Fetch3rdParty_Package(jsoncpp 1.8.4 https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz MD5=fa47a3ab6b381869b6a5f20811198662)
Fetch3rdParty_Package(fmt 7.1.3 https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz SHA256=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc)
......
......@@ -257,7 +257,7 @@ WaveletAdaptiveLL_DecodeIterator WaveletAdaptiveLLDecompress_CreateDecodeIterato
decodeIterator.children[iTransform] = child;
}
int secondTransformMask = decodeIterator.transformMask[1];
int secondTransformMask = (transformDataCount > 1) ? decodeIterator.transformMask[1] : 0;
int displacement = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment