From ab7a9e378c8eeb6f3bc9280c634d9316be906d95 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Thu, 9 Jul 2020 10:06:32 -0500 Subject: [PATCH] VNL 2020-07-07 (4a5f1059) (#1916) Run the UpdateFromUpstream.sh script to extract upstream VNL using the following shell commands. $ git archive --prefix=upstream-vnl/ 4a5f1059 -- CMakeLists.txt config/cmake core/CMakeLists.txt core/testlib core/vnl core/vxl_config.h.in core/vxl_copyright.h core/vxl_version.h v3p/CMakeLists.txt v3p/netlib vcl | tar x $ git shortlog --perl-regexp --author='^((?!Kitware Robot).*)$' --no-merges --abbrev=8 --format='%h %s' 37994a9d..4a5f1059 Drew Gilliam (14): 62149966 acal - new constructors and operators 7815495b build acal as vxl library, guard acal tests, test_include, new acal_tests for equality operators b077e588 acal_io a654853e acal_f_utils operator== and serializtion b45a5b74 acal_match_graph unit test 0a879a66 acal_match_node use weak_ptr for parent 3c0fecfc acal_match_tree: new functions, operators, & unit tests 2f378c2b acal_match_graph update with operator== and operator<< 71e76690 link bpgl to acal 310cb72d brad remove unnecessary #include 84cc8ae5 brad_utils f97adddd contrib/brl brad - organize & update CMakeLists.txt source files 55bfa235 refactor brad_calibration (permit output of calibration scale/offset) d6b3dba9 refactor brad_imag_atmospherics_est (permit output of airlight, refl. mean, refl. gain) Hans Johnson (3): ef127fff ENH: Missing explicit instantiation of template df3d8310 BUG: Remove VXL_INSTALL_NO_LIBRARIES and VXL_INSTALL_NO_DEVELOPMENT. 4a5f1059 BUG: Diagnostic message was wrong. Joseph Mundy (4): d961d0a3 added multiple ray intersection with covariance 02e4a5c6 added ray covariance interface to acal_match_tree_solver d73358c6 Increased version number 8e5967bb Added documentation to vgl_intersection Noah Johnson (12): 5df3b4a3 Comment out cout 305b4eff Add setters and getters to acal_match_graph. Properly set edge IDs. 9f32219a Add guard to acal_match_tree destructor 2e71b6d9 Disallow empty trees - add the root node to the constructor a1a164f9 need a default constructor for serializing 868c59e5 Remove unused code 670be038 ENH: Add tuple serialization support to VSL, via the VSL_TUPLE_IO_INSTANTIATE macro 3cccff3a ENH: Add array serialization support to VSL 15c46118 ENH: serialization of match_tree and match_graph with explicit instantiation of vsl structures used. Also rolled a new vsl_tuple_io 4f72004e ENH: Replaced acal_match_graph getters/setters with public members, so vsl_b_write can access members from a const variable. Added needed template instantiations used in serializing acal_match_graph 5bcbcc7c BUG: acal_io_match_graph was deserializing the tree map incorrectly 6d632b8e COMP: Use new vsl/vsl_tuple Change-Id: Icfa959cde5d85abf65bb04f8f6800995ee0b2fc6 Co-authored-by: VXL Maintainers --- Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt | 2 +- .../vxl/config/cmake/config/vxl_utils.cmake | 52 +++++++++---------- .../vnl_matrix_fixed+double.allsizes-.cxx | 1 + .../VNL/src/vxl/core/vnl/vnl_diag_matrix.h | 2 +- .../VNL/src/vxl/core/vnl/vnl_matrix_fixed.h | 2 +- .../src/vxl/core/vnl/vnl_matrix_fixed_ref.h | 2 +- .../VNL/src/vxl/core/vnl/vnl_transpose.h | 2 +- .../VNL/src/vxl/v3p/netlib/libf2c/comptry.bat | 10 ++-- .../src/vxl/v3p/netlib/libf2c/scomptry.bat | 10 ++-- 9 files changed, 40 insertions(+), 43 deletions(-) diff --git a/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt index cd832c9c7e5..83628e407af 100644 --- a/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt @@ -68,7 +68,7 @@ foreach(p endforeach() project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables - VERSION 2.1.2.2 # defines #MAJOR,MINOR,PATCH,TWEAK} + VERSION 2.3.0.0 # defines #MAJOR,MINOR,PATCH,TWEAK} DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding." LANGUAGES CXX C) diff --git a/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/vxl_utils.cmake b/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/vxl_utils.cmake index 6859eeb559e..3766f52e353 100644 --- a/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/vxl_utils.cmake +++ b/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/vxl_utils.cmake @@ -102,37 +102,33 @@ macro( vxl_add_library ) endif() # Installation - if(NOT VXL_INSTALL_NO_LIBRARIES) - install(TARGETS ${lib_name} - EXPORT ${VXL_INSTALL_EXPORT_NAME} - RUNTIME DESTINATION ${VXL_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries - LIBRARY DESTINATION ${VXL_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries - ARCHIVE DESTINATION ${VXL_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endif() + install(TARGETS ${lib_name} + EXPORT ${VXL_INSTALL_EXPORT_NAME} + RUNTIME DESTINATION ${VXL_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries + LIBRARY DESTINATION ${VXL_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${VXL_INSTALL_ARCHIVE_DIR} COMPONENT Development) endif() - if(NOT VXL_INSTALL_NO_DEVELOPMENT) - # If VXL_INSTALL_INCLUDE_DIR is the default value - if("${VXL_INSTALL_INCLUDE_DIR}" STREQUAL "include/vxl") - ## Identify the relative path for installing the header files and txx files - string(REPLACE ${VXL_ROOT_SOURCE_DIR} "${VXL_INSTALL_INCLUDE_DIR}" relative_install_path ${CMAKE_CURRENT_SOURCE_DIR}) - target_include_directories(${lib_name} - PUBLIC - $ - $ - ) - else() - set(relative_install_path "${VXL_INSTALL_INCLUDE_DIR}") - if(DEFINED header_install_dir) - set(relative_install_path "${relative_install_path}/${header_install_dir}") - endif() - target_include_directories(${lib_name} - PUBLIC - $ - $ - ) + # If VXL_INSTALL_INCLUDE_DIR is the default value + if("${VXL_INSTALL_INCLUDE_DIR}" STREQUAL "include/vxl") + ## Identify the relative path for installing the header files and txx files + string(REPLACE ${VXL_ROOT_SOURCE_DIR} "${VXL_INSTALL_INCLUDE_DIR}" relative_install_path ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(${lib_name} + PUBLIC + $ + $ + ) + else() + set(relative_install_path "${VXL_INSTALL_INCLUDE_DIR}") + if(DEFINED header_install_dir) + set(relative_install_path "${relative_install_path}/${header_install_dir}") endif() - INSTALL_NOBASE_HEADER_FILES(${relative_install_path} ${lib_srcs}) + target_include_directories(${lib_name} + PUBLIC + $ + $ + ) endif() + INSTALL_NOBASE_HEADER_FILES(${relative_install_path} ${lib_srcs}) unset(lib_srcs) unset(header_install_dir) unset(_doing) diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx b/Modules/ThirdParty/VNL/src/vxl/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx index 55c3a086fa3..6f5ef330094 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx @@ -32,6 +32,7 @@ VNL_MATRIX_FIXED_INSTANTIATE(double, 6, 2); VNL_MATRIX_FIXED_INSTANTIATE(double, 6, 3); VNL_MATRIX_FIXED_INSTANTIATE(double, 6, 6); VNL_MATRIX_FIXED_INSTANTIATE(double, 7, 7); +VNL_MATRIX_FIXED_INSTANTIATE(double, 8, 3); VNL_MATRIX_FIXED_INSTANTIATE(double, 8, 8); VNL_MATRIX_FIXED_INSTANTIATE(double, 9, 2); VNL_MATRIX_FIXED_INSTANTIATE(double, 9, 9); diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_diag_matrix.h b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_diag_matrix.h index a5126b2dabf..dbf777eb5e0 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_diag_matrix.h +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_diag_matrix.h @@ -171,7 +171,7 @@ class VNL_EXPORT vnl_diag_matrix explicit operator vnl_matrix () const { return this->as_matrix(); } #else #if VXL_LEGACY_FUTURE_REMOVE - VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_vector() or .as_ref() member function for clarity.") + VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_matrix() or .as_ref() member function for clarity.") #endif operator vnl_matrix () const { return this->as_matrix(); } #endif diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed.h b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed.h index a52f6057f16..b0c8ce31a06 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed.h +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed.h @@ -682,7 +682,7 @@ class VNL_EXPORT vnl_matrix_fixed explicit operator const vnl_matrix_ref() const { return this->as_ref(); } #else #if VXL_LEGACY_FUTURE_REMOVE - VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_vector() or .as_ref() member function for clarity.") + VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_matrix() or .as_ref() member function for clarity.") #endif operator const vnl_matrix_ref() const { return this->as_ref(); } #endif diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed_ref.h b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed_ref.h index 0c36f824219..2e62be1040a 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed_ref.h +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_matrix_fixed_ref.h @@ -725,7 +725,7 @@ class VNL_EXPORT vnl_matrix_fixed_ref : public vnl_matrix_fixed_ref_const() const { return vnl_matrix_ref( num_rows, num_cols, const_cast(data_block()) ); } #else #if VXL_LEGACY_FUTURE_REMOVE - VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_vector() or .as_ref() member function for clarity.") + VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_matrix() or .as_ref() member function for clarity.") #endif operator const vnl_matrix_ref() const { return vnl_matrix_ref( num_rows, num_cols, const_cast(data_block()) ); } #endif diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_transpose.h b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_transpose.h index cc534c4ab53..f23744682be 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_transpose.h +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_transpose.h @@ -50,7 +50,7 @@ class VNL_EXPORT vnl_transpose explicit operator vnl_matrix () const { return M_.transpose(); } #else #if VXL_LEGACY_FUTURE_REMOVE - VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_vector() or .as_ref() member function for clarity.") + VXL_DEPRECATED_MSG("Implicit cast conversion is dangerous.\nUSE: .as_matrix() or .as_ref() member function for clarity.") #endif operator vnl_matrix () const { std::cerr << "vnl_transpose being converted to matrix -- help! I don't wanna go!\n"; diff --git a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/comptry.bat b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/comptry.bat index 0dc84531c9e..2ae4565113a 100755 --- a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/comptry.bat +++ b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/comptry.bat @@ -1,5 +1,5 @@ -%1 %2 %3 %4 %5 %6 %7 %8 %9 -if errorlevel 1 goto nolonglong -exit 0 -:nolonglong -%1 -DNO_LONG_LONG %2 %3 %4 %5 %6 %7 %8 %9 +%1 %2 %3 %4 %5 %6 %7 %8 %9 +if errorlevel 1 goto nolonglong +exit 0 +:nolonglong +%1 -DNO_LONG_LONG %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/scomptry.bat b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/scomptry.bat index 2c11a97e458..69be841b913 100755 --- a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/scomptry.bat +++ b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/scomptry.bat @@ -1,5 +1,5 @@ -%1 -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9 -if errorlevel 1 goto nolonglong -exit 0 -:nolonglong -%1 -DNO_LONG_LONG -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9 +%1 -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9 +if errorlevel 1 goto nolonglong +exit 0 +:nolonglong +%1 -DNO_LONG_LONG -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9