Skip to content

Commit fe1b4b7

Browse files
authored
Merge pull request #5625 from InsightSoftwareConsortium/vxl-missing-warning-fix
VXL 2025-11-11 (9a17c839)
2 parents d4dcb59 + 455b8c2 commit fe1b4b7

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
#
1414
1515

16-
cmake_minimum_required(VERSION 3.10.2...3.20.3)
16+
cmake_minimum_required(VERSION 3.10.2...3.31.9)
1717
if(CMAKE_VERSION VERSION_LESS 3.12.0)
1818
cmake_policy(VERSION ${CMAKE_VERSION})
19+
else()
20+
cmake_policy(VERSION 3.10.2...3.31.9)
1921
endif()
2022

2123
if(NOT CMAKE_CXX_STANDARD)

Modules/ThirdParty/VNL/src/vxl/config/cmake/config/vxl_shared_link_test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
# Set policies consistent with newer versions of cmake
55
# to ease integration with projects that require newer
66
# cmake versions.
7-
cmake_minimum_required(VERSION 3.10.2)
7+
cmake_minimum_required(VERSION 3.10.2...3.31.9)
88
if(CMAKE_VERSION VERSION_LESS 3.12.0)
99
cmake_policy(VERSION ${CMAKE_VERSION})
1010
else()
11-
cmake_policy(VERSION 3.10.2...3.13.2)
11+
cmake_policy(VERSION 3.10.2...3.31.9)
1212
endif()
1313

1414
project(vxl_pic_compatible)

Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_complex_traits.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,11 @@ struct VNL_EXPORT vnl_complex_traits<std::complex<vnl_bignum>>
205205
{
206206
isreal = false
207207
};
208-
static std::complex<vnl_bignum>
208+
static std::complex<float>
209209
conjugate(std::complex<vnl_bignum> x)
210210
{
211-
return std::complex<vnl_bignum>(x.real(), -x.imag());
211+
throw std::runtime_error("Can not call complexify on non floating point data type");
212+
return std::complex<float>(0., 0.);
212213
}
213214
static std::complex<float>
214215
complexify(std::complex<float> /* x */)

0 commit comments

Comments
 (0)