From 3a66f3579560b29e9454b8e03233272c04a6229f Mon Sep 17 00:00:00 2001 From: VXL Maintainers Date: Wed, 14 Nov 2018 11:01:36 -0600 Subject: [PATCH 1/2] VNL 2018-11-14 (ee083096) Run the UpdateFromUpstream.sh script to extract upstream VNL using the following shell commands. $ git archive --prefix=upstream-vnl/ ee083096 -- 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' 88b72533..ee083096 Daniel Crispell (3): ea8b256e use binary dir for generated include files, not install dir e13b2401 fix inconsistently defined const members 99fdb501 fix tautilogical comparison to silence warning Hans J. Johnson (2): 28f8d8c3 ENH: Build VXL with WINDOWS_EXPORT_ALL_SYMBOLS & BUILD_SHARED 7f52a1b7 ENH: separate vnl_vector_ref into .hxx file Hans Johnson (6): cb794b23 ENH: Consolodate explicit instantiations dims to allsizes cf9c40ad ENH: Explicit instantiation for all symbols 4aa5d9ec ENH: Complete explicit instantiations for algo 3e1bed75 ENH: Explicit instantiations for building contributed packages. 6ba48054 ENH: Remove end of line whitespace ee083096 STYLE: Agressively remove trailing whitespace from lines Change-Id: I90ba04ae1a1b41f0af2e2ae58737c4018742cba2 --- ...ble--.cxx => vnl_det+complex+double--.cxx} | 0 ...loat--.cxx => vnl_det+complex+float--.cxx} | 0 ....cxx => vnl_det+complex+long_double--.cxx} | 0 ...x => vnl_diag_matrix+complex+double--.cxx} | 0 ...xx => vnl_diag_matrix+complex+float--.cxx} | 0 ..._matrix_fixed+complex_double.allsizes-.cxx | 4 + ...g_matrix_fixed+complex_float.allsizes-.cxx | 4 + .../vnl_diag_matrix_fixed+double.1-.cxx | 2 - .../vnl_diag_matrix_fixed+double.10-.cxx | 2 - .../vnl_diag_matrix_fixed+double.2-.cxx | 2 - .../vnl_diag_matrix_fixed+double.3-.cxx | 2 - .../vnl_diag_matrix_fixed+double.4-.cxx | 2 - .../vnl_diag_matrix_fixed+double.5-.cxx | 2 - .../vnl_diag_matrix_fixed+double.6-.cxx | 2 - .../vnl_diag_matrix_fixed+double.7-.cxx | 2 - .../vnl_diag_matrix_fixed+double.8-.cxx | 2 - .../vnl_diag_matrix_fixed+double.9-.cxx | 2 - ...vnl_diag_matrix_fixed+double.allsizes-.cxx | 11 ++ .../vnl_diag_matrix_fixed+float.1-.cxx | 2 - .../vnl_diag_matrix_fixed+float.10-.cxx | 2 - .../vnl_diag_matrix_fixed+float.2-.cxx | 2 - .../vnl_diag_matrix_fixed+float.3-.cxx | 2 - .../vnl_diag_matrix_fixed+float.4-.cxx | 2 - .../vnl_diag_matrix_fixed+float.5-.cxx | 2 - .../vnl_diag_matrix_fixed+float.6-.cxx | 2 - .../vnl_diag_matrix_fixed+float.7-.cxx | 2 - .../vnl_diag_matrix_fixed+float.8-.cxx | 2 - .../vnl_diag_matrix_fixed+float.9-.cxx | 2 - .../vnl_diag_matrix_fixed+float.allsizes-.cxx | 11 ++ ... => vnl_fortran_copy+complex+double--.cxx} | 0 ...x => vnl_fortran_copy+complex+float--.cxx} | 0 ...nl_fortran_copy+complex+long_double--.cxx} | 0 .../vnl_fortran_copy_fixed+double.1.1-.cxx | 2 - .../vnl_fortran_copy_fixed+double.10.10-.cxx | 2 - .../vnl_fortran_copy_fixed+double.2.2-.cxx | 2 - .../vnl_fortran_copy_fixed+double.3.3-.cxx | 2 - .../vnl_fortran_copy_fixed+double.3.4-.cxx | 3 - .../vnl_fortran_copy_fixed+double.4.4-.cxx | 2 - .../vnl_fortran_copy_fixed+double.5.5-.cxx | 2 - .../vnl_fortran_copy_fixed+double.6.6-.cxx | 2 - .../vnl_fortran_copy_fixed+double.7.7-.cxx | 2 - .../vnl_fortran_copy_fixed+double.8.8-.cxx | 2 - .../vnl_fortran_copy_fixed+double.9.9-.cxx | 2 - ...nl_fortran_copy_fixed+double.allsizes-.cxx | 15 +++ .../vnl_fortran_copy_fixed+float.1.1-.cxx | 2 - .../vnl_fortran_copy_fixed+float.10.10-.cxx | 2 - .../vnl_fortran_copy_fixed+float.2.2-.cxx | 2 - .../vnl_fortran_copy_fixed+float.3.3-.cxx | 2 - .../vnl_fortran_copy_fixed+float.3.4-.cxx | 2 - .../vnl_fortran_copy_fixed+float.4.4-.cxx | 2 - .../vnl_fortran_copy_fixed+float.5.5-.cxx | 2 - .../vnl_fortran_copy_fixed+float.6.6-.cxx | 2 - .../vnl_fortran_copy_fixed+float.7.7-.cxx | 2 - .../vnl_fortran_copy_fixed+float.8.8-.cxx | 2 - .../vnl_fortran_copy_fixed+float.9.9-.cxx | 2 - ...vnl_fortran_copy_fixed+float.allsizes-.cxx | 15 +++ ... => vnl_matlab_print+complex+double--.cxx} | 0 ...x => vnl_matlab_print+complex+float--.cxx} | 0 ...nl_matlab_print+complex+long_double--.cxx} | 0 ...b_print2+vnl_matrix+complex+double---.cxx} | 0 ...b_print2+vnl_vector+complex+double---.cxx} | 0 ...--.cxx => vnl_matrix+complex+double--.cxx} | 0 ...t--.cxx => vnl_matrix+complex+float--.cxx} | 0 ...x => vnl_matrix+complex+long_double--.cxx} | 0 ...trix_exp+vnl_matrix_fixed+double.1.1--.cxx | 5 - ...trix_exp+vnl_matrix_fixed+double.2.2--.cxx | 5 - ...trix_exp+vnl_matrix_fixed+double.3.3--.cxx | 5 - ...trix_exp+vnl_matrix_fixed+double.4.4--.cxx | 5 - ..._exp+vnl_matrix_fixed+double.allsizes-.cxx | 14 +++ ..._matrix_fixed+complex_double.allsizes-.cxx | 5 + ...l_matrix_fixed+complex_float.allsizes-.cxx | 5 + .../vnl_matrix_fixed+double.1.1-.cxx | 2 - .../vnl_matrix_fixed+double.1.2-.cxx | 2 - .../vnl_matrix_fixed+double.1.3-.cxx | 2 - .../vnl_matrix_fixed+double.1.6-.cxx | 2 - .../vnl_matrix_fixed+double.10.10-.cxx | 2 - .../vnl_matrix_fixed+double.2.1-.cxx | 2 - .../vnl_matrix_fixed+double.2.11-.cxx | 2 - .../vnl_matrix_fixed+double.2.2-.cxx | 2 - .../vnl_matrix_fixed+double.2.3-.cxx | 2 - .../vnl_matrix_fixed+double.2.4-.cxx | 2 - .../vnl_matrix_fixed+double.2.6-.cxx | 2 - .../vnl_matrix_fixed+double.2.8-.cxx | 2 - .../vnl_matrix_fixed+double.2.9-.cxx | 2 - .../vnl_matrix_fixed+double.3.1-.cxx | 2 - .../vnl_matrix_fixed+double.3.2-.cxx | 2 - .../vnl_matrix_fixed+double.3.3-.cxx | 2 - .../vnl_matrix_fixed+double.3.4-.cxx | 2 - .../vnl_matrix_fixed+double.3.6-.cxx | 2 - .../vnl_matrix_fixed+double.3.9-.cxx | 2 - .../vnl_matrix_fixed+double.4.1-.cxx | 2 - .../vnl_matrix_fixed+double.4.2-.cxx | 2 - .../vnl_matrix_fixed+double.4.20-.cxx | 2 - .../vnl_matrix_fixed+double.4.3-.cxx | 2 - .../vnl_matrix_fixed+double.4.4-.cxx | 2 - .../vnl_matrix_fixed+double.5.5-.cxx | 2 - .../vnl_matrix_fixed+double.6.1-.cxx | 2 - .../vnl_matrix_fixed+double.6.2-.cxx | 2 - .../vnl_matrix_fixed+double.6.3-.cxx | 2 - .../vnl_matrix_fixed+double.6.6-.cxx | 2 - .../vnl_matrix_fixed+double.7.7-.cxx | 2 - .../vnl_matrix_fixed+double.8.8-.cxx | 2 - .../vnl_matrix_fixed+double.9.9-.cxx | 2 - .../vnl_matrix_fixed+double.allsizes-.cxx | 39 ++++++ .../Templates/vnl_matrix_fixed+float.1.1-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.1.2-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.1.3-.cxx | 2 - .../vnl_matrix_fixed+float.10.10-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.2.1-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.2.2-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.2.3-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.2.4-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.3.1-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.3.2-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.3.3-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.3.4-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.3.5-.cxx | 2 - .../vnl_matrix_fixed+float.4.20-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.4.3-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.4.4-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.5.5-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.6.6-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.7.7-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.8.8-.cxx | 2 - .../Templates/vnl_matrix_fixed+float.9.9-.cxx | 2 - .../vnl_matrix_fixed+float.allsizes-.cxx | 39 ++++++ .../Templates/vnl_matrix_fixed+int.1.1-.cxx | 2 - .../Templates/vnl_matrix_fixed+int.2.2-.cxx | 2 - .../Templates/vnl_matrix_fixed+int.3.4-.cxx | 2 - .../vnl_matrix_fixed+int.allsizes-.cxx | 7 ++ ...vnl_matrix_fixed+vnl_bignum.allsizes-.cxx} | 0 .../vnl_matrix_fixed+vnl_rational.4.4-.cxx | 5 - ...l_matrix_fixed+vnl_rational.allsizes-.cxx} | 1 + .../vnl_matrix_fixed_ref+double.1.1-.cxx | 2 - .../vnl_matrix_fixed_ref+double.10.10-.cxx | 2 - .../vnl_matrix_fixed_ref+double.2.2-.cxx | 2 - .../vnl_matrix_fixed_ref+double.3.3-.cxx | 2 - .../vnl_matrix_fixed_ref+double.3.4-.cxx | 2 - .../vnl_matrix_fixed_ref+double.4.4-.cxx | 2 - .../vnl_matrix_fixed_ref+double.5.5-.cxx | 2 - .../vnl_matrix_fixed_ref+double.6.6-.cxx | 2 - .../vnl_matrix_fixed_ref+double.7.7-.cxx | 2 - .../vnl_matrix_fixed_ref+double.8.8-.cxx | 2 - .../vnl_matrix_fixed_ref+double.9.9-.cxx | 2 - .../vnl_matrix_fixed_ref+double.allsizes-.cxx | 16 +++ .../vnl_matrix_fixed_ref+float.1.1-.cxx | 2 - .../vnl_matrix_fixed_ref+float.10.10-.cxx | 2 - .../vnl_matrix_fixed_ref+float.2.2-.cxx | 2 - .../vnl_matrix_fixed_ref+float.3.3-.cxx | 2 - .../vnl_matrix_fixed_ref+float.3.4-.cxx | 2 - .../vnl_matrix_fixed_ref+float.4.4-.cxx | 2 - .../vnl_matrix_fixed_ref+float.5.5-.cxx | 2 - .../vnl_matrix_fixed_ref+float.6.6-.cxx | 2 - .../vnl_matrix_fixed_ref+float.7.7-.cxx | 2 - .../vnl_matrix_fixed_ref+float.8.8-.cxx | 2 - .../vnl_matrix_fixed_ref+float.9.9-.cxx | 2 - .../vnl_matrix_fixed_ref+float.allsizes-.cxx | 16 +++ ...=> vnl_sparse_matrix+complex+double--.cxx} | 0 ... => vnl_sparse_matrix+complex+float--.cxx} | 0 ...xx => vnl_sym_matrix+complex+double--.cxx} | 0 ...cxx => vnl_sym_matrix+complex+float--.cxx} | 0 ... vnl_sym_matrix+complex+long_double--.cxx} | 0 ...--.cxx => vnl_vector+complex+double--.cxx} | 0 ...t--.cxx => vnl_vector+complex+float--.cxx} | 0 ...x => vnl_vector+complex+long_double--.cxx} | 0 ..._vector_fixed+complex_double.allsizes-.cxx | 10 ++ ...l_vector_fixed+complex_float.allsizes-.cxx | 10 ++ .../Templates/vnl_vector_fixed+double.1-.cxx | 3 - .../Templates/vnl_vector_fixed+double.10-.cxx | 3 - .../Templates/vnl_vector_fixed+double.2-.cxx | 3 - .../Templates/vnl_vector_fixed+double.20-.cxx | 3 - .../Templates/vnl_vector_fixed+double.3-.cxx | 4 - .../Templates/vnl_vector_fixed+double.4-.cxx | 3 - .../Templates/vnl_vector_fixed+double.5-.cxx | 3 - .../Templates/vnl_vector_fixed+double.6-.cxx | 3 - .../Templates/vnl_vector_fixed+double.9-.cxx | 3 - .../vnl_vector_fixed+double.allsizes-.cxx | 32 +++++ .../Templates/vnl_vector_fixed+float.1-.cxx | 3 - .../Templates/vnl_vector_fixed+float.10-.cxx | 2 - .../Templates/vnl_vector_fixed+float.16-.cxx | 2 - .../Templates/vnl_vector_fixed+float.2-.cxx | 3 - .../Templates/vnl_vector_fixed+float.3-.cxx | 4 - .../Templates/vnl_vector_fixed+float.4-.cxx | 3 - .../Templates/vnl_vector_fixed+float.5-.cxx | 2 - .../Templates/vnl_vector_fixed+float.9-.cxx | 2 - .../vnl_vector_fixed+float.allsizes-.cxx | 32 +++++ .../vnl/Templates/vnl_vector_fixed+int.1-.cxx | 3 - .../vnl/Templates/vnl_vector_fixed+int.2-.cxx | 3 - .../vnl/Templates/vnl_vector_fixed+int.3-.cxx | 4 - .../vnl/Templates/vnl_vector_fixed+int.4-.cxx | 3 - .../vnl_vector_fixed+int.allsizes-.cxx | 27 ++++ ... => vnl_vector_fixed+sshort.allsizes-.cxx} | 0 .../Templates/vnl_vector_fixed+uchar.16-.cxx | 3 - .../vnl_vector_fixed+uchar.allsizes-.cxx | 12 ++ .../vnl_vector_fixed+uint.allsizes-.cxx | 11 ++ .../Templates/vnl_vector_fixed+ushort.2-.cxx | 3 - .../vnl_vector_fixed+ushort.allsizes-.cxx | 6 + .../vnl_vector_fixed+vnl_bignum.2-.cxx | 4 - .../vnl_vector_fixed+vnl_bignum.3-.cxx | 5 - ...vnl_vector_fixed+vnl_bignum.allsizes-.cxx} | 3 + .../vnl_vector_fixed+vnl_rational.1-.cxx | 4 - .../vnl_vector_fixed+vnl_rational.2-.cxx | 4 - .../vnl_vector_fixed+vnl_rational.3-.cxx | 5 - .../vnl_vector_fixed+vnl_rational.4-.cxx | 5 - ...nl_vector_fixed+vnl_rational.allsizes-.cxx | 9 ++ .../vnl_vector_fixed_ref+double.4-.cxx | 2 - ...vnl_vector_fixed_ref+double.allsizes-.cxx} | 1 + ... vnl_vector_fixed_ref+float.allsizes-.cxx} | 0 .../vnl/Templates/vnl_vector_ref+alltypes.cxx | 23 ++++ .../algo/Templates/vnl_fft_base+double.1-.cxx | 2 - .../algo/Templates/vnl_fft_base+double.2-.cxx | 2 - .../algo/Templates/vnl_fft_base+double.3-.cxx | 2 - .../algo/Templates/vnl_fft_base+double.4-.cxx | 2 - .../vnl_fft_base+double.allsizes-.cxx | 8 ++ .../algo/Templates/vnl_fft_base+float.1-.cxx | 2 - .../algo/Templates/vnl_fft_base+float.2-.cxx | 2 - .../algo/Templates/vnl_fft_base+float.3-.cxx | 2 - .../algo/Templates/vnl_fft_base+float.4-.cxx | 2 - .../vnl_fft_base+float.allsizes-.cxx | 8 ++ .../Templates/vnl_svd_fixed+double.1.1-.cxx | 2 - .../Templates/vnl_svd_fixed+double.10.10-.cxx | 2 - .../Templates/vnl_svd_fixed+double.2.2-.cxx | 2 - .../Templates/vnl_svd_fixed+double.3.3-.cxx | 2 - .../Templates/vnl_svd_fixed+double.3.4-.cxx | 2 - .../Templates/vnl_svd_fixed+double.4.4-.cxx | 2 - .../Templates/vnl_svd_fixed+double.5.5-.cxx | 2 - .../Templates/vnl_svd_fixed+double.6.6-.cxx | 2 - .../Templates/vnl_svd_fixed+double.7.7-.cxx | 2 - .../Templates/vnl_svd_fixed+double.8.8-.cxx | 2 - .../Templates/vnl_svd_fixed+double.9.9-.cxx | 2 - .../vnl_svd_fixed+double.allsizes-.cxx | 15 +++ .../Templates/vnl_svd_fixed+float.1.1-.cxx | 2 - .../Templates/vnl_svd_fixed+float.10.10-.cxx | 2 - .../Templates/vnl_svd_fixed+float.2.2-.cxx | 2 - .../Templates/vnl_svd_fixed+float.3.3-.cxx | 2 - .../Templates/vnl_svd_fixed+float.3.4-.cxx | 2 - .../Templates/vnl_svd_fixed+float.4.4-.cxx | 2 - .../Templates/vnl_svd_fixed+float.5.5-.cxx | 2 - .../Templates/vnl_svd_fixed+float.6.6-.cxx | 2 - .../Templates/vnl_svd_fixed+float.7.7-.cxx | 2 - .../Templates/vnl_svd_fixed+float.8.8-.cxx | 2 - .../Templates/vnl_svd_fixed+float.9.9-.cxx | 2 - .../vnl_svd_fixed+float.allsizes-.cxx | 15 +++ core/vnl/tests/test_complexify.cxx | 3 + core/vnl/tests/test_drand48.cpp | 2 +- core/vnl/tests/test_matrix_fixed.cxx | 3 +- core/vnl/vnl_T_n.h | 2 +- core/vnl/vnl_analytic_integrant.h | 2 +- core/vnl/vnl_complexify.h | 19 ++- core/vnl/vnl_cross_product_matrix.h | 2 +- core/vnl/vnl_diag_matrix_fixed.h | 8 +- core/vnl/vnl_diag_matrix_fixed.hxx | 15 +++ core/vnl/vnl_drand48.cpp | 2 +- core/vnl/vnl_drand48.h | 2 +- core/vnl/vnl_finite.h | 6 +- core/vnl/vnl_imag.h | 6 +- core/vnl/vnl_index_sort.h | 2 +- core/vnl/vnl_inverse.h | 20 +-- core/vnl/vnl_math.cxx | 1 + core/vnl/vnl_math.h | 1 + core/vnl/vnl_matrix.h | 18 +-- core/vnl/vnl_matrix.hxx | 25 ++++ core/vnl/vnl_matrix_fixed.h | 49 +++----- core/vnl/vnl_matrix_fixed.hxx | 53 ++++++++ core/vnl/vnl_na.h | 9 +- core/vnl/vnl_numeric_traits.h | 118 +++++++++--------- core/vnl/vnl_polynomial.h | 2 +- core/vnl/vnl_power.h | 4 +- core/vnl/vnl_quaternion.h | 2 +- core/vnl/vnl_real.h | 6 +- core/vnl/vnl_sym_matrix.h | 3 +- core/vnl/vnl_vector_fixed.h | 34 ++--- core/vnl/vnl_vector_fixed.hxx | 50 ++++++++ core/vnl/vnl_vector_ref.h | 26 ++-- core/vnl/vnl_vector_ref.hxx | 45 +++++++ core/vnl/xio/vnl_xio_matrix.h | 4 +- core/vxl_version.h | 2 +- 277 files changed, 768 insertions(+), 625 deletions(-) rename core/vnl/Templates/{vnl_det+vcl_complex+double--.cxx => vnl_det+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_det+vcl_complex+float--.cxx => vnl_det+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_det+vcl_complex+long_double--.cxx => vnl_det+complex+long_double--.cxx} (100%) rename core/vnl/Templates/{vnl_diag_matrix+vcl_complex+double--.cxx => vnl_diag_matrix+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_diag_matrix+vcl_complex+float--.cxx => vnl_diag_matrix+complex+float--.cxx} (100%) create mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+complex_double.allsizes-.cxx create mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+complex_float.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.1-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.10-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.2-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.3-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.4-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.5-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.6-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.7-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.8-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.9-.cxx create mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+double.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.1-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.10-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.2-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.3-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.4-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.5-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.6-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.7-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.8-.cxx delete mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.9-.cxx create mode 100644 core/vnl/Templates/vnl_diag_matrix_fixed+float.allsizes-.cxx rename core/vnl/Templates/{vnl_fortran_copy+vcl_complex+double--.cxx => vnl_fortran_copy+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_fortran_copy+vcl_complex+float--.cxx => vnl_fortran_copy+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_fortran_copy+vcl_complex+long_double--.cxx => vnl_fortran_copy+complex+long_double--.cxx} (100%) delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.10.10-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.3.3-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.3.4-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.4.4-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.5.5-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.6.6-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.7.7-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.8.8-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.9.9-.cxx create mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+double.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.10.10-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.3.3-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.3.4-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.4.4-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.5.5-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.6.6-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.7.7-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.8.8-.cxx delete mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.9.9-.cxx create mode 100644 core/vnl/Templates/vnl_fortran_copy_fixed+float.allsizes-.cxx rename core/vnl/Templates/{vnl_matlab_print+vcl_complex+double--.cxx => vnl_matlab_print+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_matlab_print+vcl_complex+float--.cxx => vnl_matlab_print+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_matlab_print+vcl_complex+long_double--.cxx => vnl_matlab_print+complex+long_double--.cxx} (100%) rename core/vnl/Templates/{vnl_matlab_print2+vnl_matrix+vcl_complex+double---.cxx => vnl_matlab_print2+vnl_matrix+complex+double---.cxx} (100%) rename core/vnl/Templates/{vnl_matlab_print2+vnl_vector+vcl_complex+double---.cxx => vnl_matlab_print2+vnl_vector+complex+double---.cxx} (100%) rename core/vnl/Templates/{vnl_matrix+vcl_complex+double--.cxx => vnl_matrix+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_matrix+vcl_complex+float--.cxx => vnl_matrix+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_matrix+vcl_complex+long_double--.cxx => vnl_matrix+complex+long_double--.cxx} (100%) delete mode 100644 core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.1.1--.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.2.2--.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.3.3--.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.4.4--.cxx create mode 100644 core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.allsizes-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed+complex_double.allsizes-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed+complex_float.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.1.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.1.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.1.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.10.10-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.11-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.8-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.2.9-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.3.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.3.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.3.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.3.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.3.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.3.9-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.4.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.4.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.4.20-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.4.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.4.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.5.5-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.6.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.6.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.6.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.6.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.7.7-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.8.8-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.9.9-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.1.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.1.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.10.10-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.2.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.2.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.2.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.3.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.3.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.3.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.3.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.3.5-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.4.20-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.4.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.4.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.5.5-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.6.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.7.7-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.8.8-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.9.9-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed+float.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+int.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+int.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+int.3.4-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed+int.allsizes-.cxx rename core/vnl/Templates/{vnl_matrix_fixed+vnl_bignum.3.3-.cxx => vnl_matrix_fixed+vnl_bignum.allsizes-.cxx} (100%) delete mode 100644 core/vnl/Templates/vnl_matrix_fixed+vnl_rational.4.4-.cxx rename core/vnl/Templates/{vnl_matrix_fixed+vnl_rational.3.3-.cxx => vnl_matrix_fixed+vnl_rational.allsizes-.cxx} (75%) delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.10.10-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.3.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.3.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.4.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.5.5-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.6.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.7.7-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.8.8-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.9.9-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+double.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.1.1-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.10.10-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.2.2-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.3.3-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.3.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.4.4-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.5.5-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.6.6-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.7.7-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.8.8-.cxx delete mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.9.9-.cxx create mode 100644 core/vnl/Templates/vnl_matrix_fixed_ref+float.allsizes-.cxx rename core/vnl/Templates/{vnl_sparse_matrix+vcl_complex+double--.cxx => vnl_sparse_matrix+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_sparse_matrix+vcl_complex+float--.cxx => vnl_sparse_matrix+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_sym_matrix+vcl_complex+double--.cxx => vnl_sym_matrix+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_sym_matrix+vcl_complex+float--.cxx => vnl_sym_matrix+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_sym_matrix+vcl_complex+long_double--.cxx => vnl_sym_matrix+complex+long_double--.cxx} (100%) rename core/vnl/Templates/{vnl_vector+vcl_complex+double--.cxx => vnl_vector+complex+double--.cxx} (100%) rename core/vnl/Templates/{vnl_vector+vcl_complex+float--.cxx => vnl_vector+complex+float--.cxx} (100%) rename core/vnl/Templates/{vnl_vector+vcl_complex+long_double--.cxx => vnl_vector+complex+long_double--.cxx} (100%) create mode 100644 core/vnl/Templates/vnl_vector_fixed+complex_double.allsizes-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+complex_float.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.1-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.10-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.2-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.20-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.3-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.4-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.5-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.6-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+double.9-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+double.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.1-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.10-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.16-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.2-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.3-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.4-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.5-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+float.9-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+float.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+int.1-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+int.2-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+int.3-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+int.4-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+int.allsizes-.cxx rename core/vnl/Templates/{vnl_vector_fixed+sshort.2-.cxx => vnl_vector_fixed+sshort.allsizes-.cxx} (100%) delete mode 100644 core/vnl/Templates/vnl_vector_fixed+uchar.16-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+uchar.allsizes-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+uint.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+ushort.2-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+ushort.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_bignum.2-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_bignum.3-.cxx rename core/vnl/Templates/{vnl_vector_fixed+vnl_bignum.1-.cxx => vnl_vector_fixed+vnl_bignum.allsizes-.cxx} (52%) delete mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_rational.1-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_rational.2-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_rational.3-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_rational.4-.cxx create mode 100644 core/vnl/Templates/vnl_vector_fixed+vnl_rational.allsizes-.cxx delete mode 100644 core/vnl/Templates/vnl_vector_fixed_ref+double.4-.cxx rename core/vnl/Templates/{vnl_vector_fixed_ref+double.3-.cxx => vnl_vector_fixed_ref+double.allsizes-.cxx} (65%) rename core/vnl/Templates/{vnl_vector_fixed_ref+float.3-.cxx => vnl_vector_fixed_ref+float.allsizes-.cxx} (100%) create mode 100644 core/vnl/Templates/vnl_vector_ref+alltypes.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+double.1-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+double.2-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+double.3-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+double.4-.cxx create mode 100644 core/vnl/algo/Templates/vnl_fft_base+double.allsizes-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+float.1-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+float.2-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+float.3-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_fft_base+float.4-.cxx create mode 100644 core/vnl/algo/Templates/vnl_fft_base+float.allsizes-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.1.1-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.10.10-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.2.2-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.3.3-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.3.4-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.4.4-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.5.5-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.6.6-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.7.7-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.8.8-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.9.9-.cxx create mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+double.allsizes-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.1.1-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.10.10-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.2.2-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.3.3-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.3.4-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.4.4-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.5.5-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.6.6-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.7.7-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.8.8-.cxx delete mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.9.9-.cxx create mode 100644 core/vnl/algo/Templates/vnl_svd_fixed+float.allsizes-.cxx create mode 100644 core/vnl/vnl_vector_ref.hxx diff --git a/core/vnl/Templates/vnl_det+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_det+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_det+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_det+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_det+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_det+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_det+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_det+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_det+vcl_complex+long_double--.cxx b/core/vnl/Templates/vnl_det+complex+long_double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_det+vcl_complex+long_double--.cxx rename to core/vnl/Templates/vnl_det+complex+long_double--.cxx diff --git a/core/vnl/Templates/vnl_diag_matrix+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_diag_matrix+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_diag_matrix+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_diag_matrix+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_diag_matrix+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_diag_matrix+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_diag_matrix+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_diag_matrix+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+complex_double.allsizes-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+complex_double.allsizes-.cxx new file mode 100644 index 00000000000..9ab0d43bb84 --- /dev/null +++ b/core/vnl/Templates/vnl_diag_matrix_fixed+complex_double.allsizes-.cxx @@ -0,0 +1,4 @@ +#include +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(std::complex, 2); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(std::complex, 3); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(std::complex, 4); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+complex_float.allsizes-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+complex_float.allsizes-.cxx new file mode 100644 index 00000000000..da40c72fdc0 --- /dev/null +++ b/core/vnl/Templates/vnl_diag_matrix_fixed+complex_float.allsizes-.cxx @@ -0,0 +1,4 @@ +#include +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(std::complex, 2); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(std::complex, 3); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(std::complex, 4); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.1-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.1-.cxx deleted file mode 100644 index 1df3bec57e1..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 1); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.10-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.10-.cxx deleted file mode 100644 index 6cb5187fe7e..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 10); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.2-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.2-.cxx deleted file mode 100644 index 6a156eb6ec2..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 2); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.3-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.3-.cxx deleted file mode 100644 index de4ef1f4192..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 3); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.4-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.4-.cxx deleted file mode 100644 index fcdd926725b..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 4); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.5-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.5-.cxx deleted file mode 100644 index eec1f57742d..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 5); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.6-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.6-.cxx deleted file mode 100644 index d8e4c511d96..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 6); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.7-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.7-.cxx deleted file mode 100644 index d00da30fb2b..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 7); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.8-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.8-.cxx deleted file mode 100644 index d9063993896..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 8); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.9-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.9-.cxx deleted file mode 100644 index 4951b4386c5..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+double.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 9); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+double.allsizes-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+double.allsizes-.cxx new file mode 100644 index 00000000000..2d7409b20a9 --- /dev/null +++ b/core/vnl/Templates/vnl_diag_matrix_fixed+double.allsizes-.cxx @@ -0,0 +1,11 @@ +#include +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 1); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 2); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 3); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 4); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 5); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 6); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 7); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 8); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 9); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 10); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.1-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.1-.cxx deleted file mode 100644 index 24a6e92bc12..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 1); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.10-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.10-.cxx deleted file mode 100644 index 09b4dbdc11d..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 10); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.2-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.2-.cxx deleted file mode 100644 index 2a3e8007f4d..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 2); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.3-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.3-.cxx deleted file mode 100644 index f0ea32d3f2a..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 3); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.4-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.4-.cxx deleted file mode 100644 index bd316c1d55f..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 4); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.5-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.5-.cxx deleted file mode 100644 index 4995d9a71e2..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 5); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.6-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.6-.cxx deleted file mode 100644 index 0a65f98c429..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 6); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.7-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.7-.cxx deleted file mode 100644 index 9ec43d9efc5..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 7); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.8-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.8-.cxx deleted file mode 100644 index caedaa3419f..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 8); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.9-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.9-.cxx deleted file mode 100644 index d5cafecadd0..00000000000 --- a/core/vnl/Templates/vnl_diag_matrix_fixed+float.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 9); diff --git a/core/vnl/Templates/vnl_diag_matrix_fixed+float.allsizes-.cxx b/core/vnl/Templates/vnl_diag_matrix_fixed+float.allsizes-.cxx new file mode 100644 index 00000000000..319243fdbf3 --- /dev/null +++ b/core/vnl/Templates/vnl_diag_matrix_fixed+float.allsizes-.cxx @@ -0,0 +1,11 @@ +#include +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 1); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 2); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 3); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 4); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 5); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 6); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 7); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 8); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 9); +VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 10); diff --git a/core/vnl/Templates/vnl_fortran_copy+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_fortran_copy+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_fortran_copy+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_fortran_copy+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_fortran_copy+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_fortran_copy+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_fortran_copy+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_fortran_copy+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_fortran_copy+vcl_complex+long_double--.cxx b/core/vnl/Templates/vnl_fortran_copy+complex+long_double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_fortran_copy+vcl_complex+long_double--.cxx rename to core/vnl/Templates/vnl_fortran_copy+complex+long_double--.cxx diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.1.1-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.1.1-.cxx deleted file mode 100644 index 562a5684e65..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,1,1); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.10.10-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.10.10-.cxx deleted file mode 100644 index 9553e2e543f..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,10,10); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.2.2-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.2.2-.cxx deleted file mode 100644 index 94b97cea386..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,2,2); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.3.3-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.3.3-.cxx deleted file mode 100644 index 85185d3c510..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,3,3); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.3.4-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.3.4-.cxx deleted file mode 100644 index 3903a697bbc..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.3.4-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double , 3 , 4 ); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.4.4-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.4.4-.cxx deleted file mode 100644 index edd4d8eedcf..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,4,4); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.5.5-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.5.5-.cxx deleted file mode 100644 index 513cc243e8c..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,5,5); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.6.6-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.6.6-.cxx deleted file mode 100644 index e458fe532d9..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,6,6); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.7.7-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.7.7-.cxx deleted file mode 100644 index fe15cc97ddb..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,7,7); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.8.8-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.8.8-.cxx deleted file mode 100644 index d418845add2..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,8,8); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.9.9-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.9.9-.cxx deleted file mode 100644 index 93b415d7fbd..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+double.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,9,9); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+double.allsizes-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+double.allsizes-.cxx new file mode 100644 index 00000000000..6f3bd9e32ab --- /dev/null +++ b/core/vnl/Templates/vnl_fortran_copy_fixed+double.allsizes-.cxx @@ -0,0 +1,15 @@ +#include +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,1,1); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,2,2); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,2,3); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,3,2); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,3,3); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,3,4); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,4,3); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,4,4); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,5,5); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,6,6); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,7,7); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,8,8); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,9,9); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double,10,10); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.1.1-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.1.1-.cxx deleted file mode 100644 index a7995267b5c..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,1,1); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.10.10-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.10.10-.cxx deleted file mode 100644 index 22093f2a955..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,10,10); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.2.2-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.2.2-.cxx deleted file mode 100644 index 6740acf3b55..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,2,2); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.3.3-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.3.3-.cxx deleted file mode 100644 index 89103c9f8f3..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,3,3); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.3.4-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.3.4-.cxx deleted file mode 100644 index 6e073ae9973..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float, 3, 4); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.4.4-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.4.4-.cxx deleted file mode 100644 index 1a28b480b21..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,4,4); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.5.5-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.5.5-.cxx deleted file mode 100644 index e820381c5c9..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,5,5); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.6.6-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.6.6-.cxx deleted file mode 100644 index a974e558a52..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,6,6); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.7.7-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.7.7-.cxx deleted file mode 100644 index 3dad96e211e..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,7,7); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.8.8-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.8.8-.cxx deleted file mode 100644 index 5ca0923b18b..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,8,8); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.9.9-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.9.9-.cxx deleted file mode 100644 index 9a9c45d2a2d..00000000000 --- a/core/vnl/Templates/vnl_fortran_copy_fixed+float.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,9,9); diff --git a/core/vnl/Templates/vnl_fortran_copy_fixed+float.allsizes-.cxx b/core/vnl/Templates/vnl_fortran_copy_fixed+float.allsizes-.cxx new file mode 100644 index 00000000000..2711bd9f71e --- /dev/null +++ b/core/vnl/Templates/vnl_fortran_copy_fixed+float.allsizes-.cxx @@ -0,0 +1,15 @@ +#include +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,1,1); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,2,2); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,2,3); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,3,2); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,3,3); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,3,4); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,4,3); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,4,4); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,5,5); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,6,6); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,7,7); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,8,8); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,9,9); +VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float,10,10); diff --git a/core/vnl/Templates/vnl_matlab_print+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_matlab_print+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_matlab_print+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_matlab_print+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_matlab_print+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_matlab_print+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_matlab_print+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_matlab_print+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_matlab_print+vcl_complex+long_double--.cxx b/core/vnl/Templates/vnl_matlab_print+complex+long_double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_matlab_print+vcl_complex+long_double--.cxx rename to core/vnl/Templates/vnl_matlab_print+complex+long_double--.cxx diff --git a/core/vnl/Templates/vnl_matlab_print2+vnl_matrix+vcl_complex+double---.cxx b/core/vnl/Templates/vnl_matlab_print2+vnl_matrix+complex+double---.cxx similarity index 100% rename from core/vnl/Templates/vnl_matlab_print2+vnl_matrix+vcl_complex+double---.cxx rename to core/vnl/Templates/vnl_matlab_print2+vnl_matrix+complex+double---.cxx diff --git a/core/vnl/Templates/vnl_matlab_print2+vnl_vector+vcl_complex+double---.cxx b/core/vnl/Templates/vnl_matlab_print2+vnl_vector+complex+double---.cxx similarity index 100% rename from core/vnl/Templates/vnl_matlab_print2+vnl_vector+vcl_complex+double---.cxx rename to core/vnl/Templates/vnl_matlab_print2+vnl_vector+complex+double---.cxx diff --git a/core/vnl/Templates/vnl_matrix+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_matrix+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_matrix+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_matrix+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_matrix+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_matrix+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_matrix+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_matrix+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_matrix+vcl_complex+long_double--.cxx b/core/vnl/Templates/vnl_matrix+complex+long_double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_matrix+vcl_complex+long_double--.cxx rename to core/vnl/Templates/vnl_matrix+complex+long_double--.cxx diff --git a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.1.1--.cxx b/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.1.1--.cxx deleted file mode 100644 index a5973b985b0..00000000000 --- a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.1.1--.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -typedef vnl_matrix_fixed T; -VNL_MATRIX_EXP_INSTANTIATE( T ); diff --git a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.2.2--.cxx b/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.2.2--.cxx deleted file mode 100644 index c7097d914a6..00000000000 --- a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.2.2--.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -typedef vnl_matrix_fixed T; -VNL_MATRIX_EXP_INSTANTIATE( T ); diff --git a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.3.3--.cxx b/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.3.3--.cxx deleted file mode 100644 index 862d973a324..00000000000 --- a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.3.3--.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -typedef vnl_matrix_fixed T; -VNL_MATRIX_EXP_INSTANTIATE( T ); diff --git a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.4.4--.cxx b/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.4.4--.cxx deleted file mode 100644 index 5ac32a9281b..00000000000 --- a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.4.4--.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -typedef vnl_matrix_fixed T; -VNL_MATRIX_EXP_INSTANTIATE( T ); diff --git a/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.allsizes-.cxx new file mode 100644 index 00000000000..cd303c4032a --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_exp+vnl_matrix_fixed+double.allsizes-.cxx @@ -0,0 +1,14 @@ +#include +#include + +typedef vnl_matrix_fixed T11; +VNL_MATRIX_EXP_INSTANTIATE( T11 ); + +typedef vnl_matrix_fixed T22; +VNL_MATRIX_EXP_INSTANTIATE( T22 ); + +typedef vnl_matrix_fixed T33; +VNL_MATRIX_EXP_INSTANTIATE( T33 ); + +typedef vnl_matrix_fixed T44; +VNL_MATRIX_EXP_INSTANTIATE( T44 ); diff --git a/core/vnl/Templates/vnl_matrix_fixed+complex_double.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed+complex_double.allsizes-.cxx new file mode 100644 index 00000000000..6526087ea23 --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed+complex_double.allsizes-.cxx @@ -0,0 +1,5 @@ +#include +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 2, 2); +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 3, 3); +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 4, 4); +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 5, 5); diff --git a/core/vnl/Templates/vnl_matrix_fixed+complex_float.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed+complex_float.allsizes-.cxx new file mode 100644 index 00000000000..2286964006b --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed+complex_float.allsizes-.cxx @@ -0,0 +1,5 @@ +#include +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 2, 2); +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 3, 3); +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 4, 4); +VNL_MATRIX_FIXED_INSTANTIATE(std::complex, 5, 5); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.1.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.1.1-.cxx deleted file mode 100644 index 75fa451320e..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,1,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.1.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.1.2-.cxx deleted file mode 100644 index 0a69dc48815..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.1.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,1,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.1.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.1.3-.cxx deleted file mode 100644 index 766083d185d..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.1.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,1,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.1.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.1.6-.cxx deleted file mode 100644 index cd32ae38ec9..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.1.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,1,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.10.10-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.10.10-.cxx deleted file mode 100644 index a6ab93d784a..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,10,10); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.1-.cxx deleted file mode 100644 index c2769762f4e..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.11-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.11-.cxx deleted file mode 100644 index da36bc92fe8..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.11-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,11); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.2-.cxx deleted file mode 100644 index ed70515d9c8..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.3-.cxx deleted file mode 100644 index 4937b479fca..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.4-.cxx deleted file mode 100644 index 18e06425c90..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.6-.cxx deleted file mode 100644 index b05e6bf14e4..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.8-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.8-.cxx deleted file mode 100644 index c82831f16ee..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,8); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.2.9-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.2.9-.cxx deleted file mode 100644 index 4c44048e9b7..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.2.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,2,9); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.3.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.3.1-.cxx deleted file mode 100644 index c25043f8708..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.3.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,3,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.3.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.3.2-.cxx deleted file mode 100644 index cb25fcf49e8..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.3.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,3,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.3.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.3.3-.cxx deleted file mode 100644 index e3ea4b4440b..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,3,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.3.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.3.4-.cxx deleted file mode 100644 index b2a867b8e00..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,3,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.3.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.3.6-.cxx deleted file mode 100644 index 88e0d00077e..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.3.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,3,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.3.9-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.3.9-.cxx deleted file mode 100644 index e4d3ce749d6..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.3.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,3,9); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.4.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.4.1-.cxx deleted file mode 100644 index 0bb6af51019..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.4.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,4,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.4.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.4.2-.cxx deleted file mode 100644 index 3e1adf5545b..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.4.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,4,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.4.20-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.4.20-.cxx deleted file mode 100644 index 0c6d803c567..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.4.20-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,4,20); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.4.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.4.3-.cxx deleted file mode 100644 index 106e3925a7f..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.4.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,4,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.4.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.4.4-.cxx deleted file mode 100644 index baba02c1db1..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,4,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.5.5-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.5.5-.cxx deleted file mode 100644 index db2104ffd3d..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,5,5); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.6.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.6.1-.cxx deleted file mode 100644 index 86e8e7b98c0..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.6.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,6,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.6.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.6.2-.cxx deleted file mode 100644 index cc7fbc9e8c7..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.6.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,6,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.6.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.6.3-.cxx deleted file mode 100644 index 1c871145ac0..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.6.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,6,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.6.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.6.6-.cxx deleted file mode 100644 index d7931ea65b9..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,6,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.7.7-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.7.7-.cxx deleted file mode 100644 index ccc773e8d92..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,7,7); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.8.8-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.8.8-.cxx deleted file mode 100644 index 3248d3116a7..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,8,8); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.9.9-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.9.9-.cxx deleted file mode 100644 index d2946d5a5b9..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+double.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(double,9,9); diff --git a/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx new file mode 100644 index 00000000000..c47ae2f552d --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed+double.allsizes-.cxx @@ -0,0 +1,39 @@ +#include +VNL_MATRIX_FIXED_INSTANTIATE(double,1,1); +VNL_MATRIX_FIXED_INSTANTIATE(double,1,2); +VNL_MATRIX_FIXED_INSTANTIATE(double,1,3); +VNL_MATRIX_FIXED_INSTANTIATE(double,1,6); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,1); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,2); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,3); +VNL_MATRIX_FIXED_INSTANTIATE(double,1,4); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,4); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,6); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,8); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,9); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,11); +VNL_MATRIX_FIXED_INSTANTIATE(double,2,12); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,1); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,2); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,3); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,4); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,5); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,6); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,9); +VNL_MATRIX_FIXED_INSTANTIATE(double,3,12); +VNL_MATRIX_FIXED_INSTANTIATE(double,4,1); +VNL_MATRIX_FIXED_INSTANTIATE(double,4,2); +VNL_MATRIX_FIXED_INSTANTIATE(double,4,3); +VNL_MATRIX_FIXED_INSTANTIATE(double,4,4); +VNL_MATRIX_FIXED_INSTANTIATE(double,4,20); +VNL_MATRIX_FIXED_INSTANTIATE(double,5,5); +VNL_MATRIX_FIXED_INSTANTIATE(double,6,1); +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,8); +VNL_MATRIX_FIXED_INSTANTIATE(double,9,2); +VNL_MATRIX_FIXED_INSTANTIATE(double,9,9); +VNL_MATRIX_FIXED_INSTANTIATE(double,10,10); +VNL_MATRIX_FIXED_INSTANTIATE(double,12,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.1.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.1.1-.cxx deleted file mode 100644 index 3c7da315912..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,1,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.1.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.1.2-.cxx deleted file mode 100644 index fcf7c7bfe2e..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.1.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,1,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.1.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.1.3-.cxx deleted file mode 100644 index 2b6239f0137..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.1.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,1,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.10.10-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.10.10-.cxx deleted file mode 100644 index 84f7e7ed278..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,10,10); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.2.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.2.1-.cxx deleted file mode 100644 index 20112148ab6..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.2.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,2,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.2.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.2.2-.cxx deleted file mode 100644 index a86381b44fa..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,2,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.2.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.2.3-.cxx deleted file mode 100644 index 72ca2b82df0..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.2.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,2,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.2.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.2.4-.cxx deleted file mode 100644 index 4655509a1e1..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.2.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,2,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.3.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.3.1-.cxx deleted file mode 100644 index 00d0beddbc2..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.3.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,3,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.3.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.3.2-.cxx deleted file mode 100644 index fdf415935fe..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.3.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,3,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.3.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.3.3-.cxx deleted file mode 100644 index f7332e28e31..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,3,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.3.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.3.4-.cxx deleted file mode 100644 index ed33afddf68..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,3,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.3.5-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.3.5-.cxx deleted file mode 100644 index 34306e91396..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.3.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,3,5); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.4.20-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.4.20-.cxx deleted file mode 100644 index 3c50ef63190..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.4.20-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,4,20); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.4.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.4.3-.cxx deleted file mode 100644 index 4701fb57ad3..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.4.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,4,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.4.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.4.4-.cxx deleted file mode 100644 index edba88cef6f..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,4,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.5.5-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.5.5-.cxx deleted file mode 100644 index 34926b095e2..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,5,5); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.6.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.6.6-.cxx deleted file mode 100644 index 0258b9438a3..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,6,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.7.7-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.7.7-.cxx deleted file mode 100644 index ca5ca7bbea3..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,7,7); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.8.8-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.8.8-.cxx deleted file mode 100644 index 3eb15b09b97..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,8,8); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.9.9-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.9.9-.cxx deleted file mode 100644 index fa55d3a3883..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+float.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(float,9,9); diff --git a/core/vnl/Templates/vnl_matrix_fixed+float.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed+float.allsizes-.cxx new file mode 100644 index 00000000000..347c96d6df4 --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed+float.allsizes-.cxx @@ -0,0 +1,39 @@ +#include +VNL_MATRIX_FIXED_INSTANTIATE(float,1,1); +VNL_MATRIX_FIXED_INSTANTIATE(float,1,2); +VNL_MATRIX_FIXED_INSTANTIATE(float,1,3); +VNL_MATRIX_FIXED_INSTANTIATE(float,1,6); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,1); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,2); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,3); +VNL_MATRIX_FIXED_INSTANTIATE(float,1,4); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,4); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,6); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,8); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,9); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,11); +VNL_MATRIX_FIXED_INSTANTIATE(float,2,12); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,1); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,2); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,3); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,4); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,5); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,6); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,9); +VNL_MATRIX_FIXED_INSTANTIATE(float,3,12); +VNL_MATRIX_FIXED_INSTANTIATE(float,4,1); +VNL_MATRIX_FIXED_INSTANTIATE(float,4,2); +VNL_MATRIX_FIXED_INSTANTIATE(float,4,3); +VNL_MATRIX_FIXED_INSTANTIATE(float,4,4); +VNL_MATRIX_FIXED_INSTANTIATE(float,4,20); +VNL_MATRIX_FIXED_INSTANTIATE(float,5,5); +VNL_MATRIX_FIXED_INSTANTIATE(float,6,1); +VNL_MATRIX_FIXED_INSTANTIATE(float,6,2); +VNL_MATRIX_FIXED_INSTANTIATE(float,6,3); +VNL_MATRIX_FIXED_INSTANTIATE(float,6,6); +VNL_MATRIX_FIXED_INSTANTIATE(float,7,7); +VNL_MATRIX_FIXED_INSTANTIATE(float,8,8); +VNL_MATRIX_FIXED_INSTANTIATE(float,9,2); +VNL_MATRIX_FIXED_INSTANTIATE(float,9,9); +VNL_MATRIX_FIXED_INSTANTIATE(float,10,10); +VNL_MATRIX_FIXED_INSTANTIATE(float,12,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed+int.1.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed+int.1.1-.cxx deleted file mode 100644 index c063c52bd94..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+int.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(int,1,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed+int.2.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed+int.2.2-.cxx deleted file mode 100644 index a75f5273ecd..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+int.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(int,2,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+int.3.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+int.3.4-.cxx deleted file mode 100644 index e8183ddb4f3..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+int.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_INSTANTIATE(int,3,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+int.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed+int.allsizes-.cxx new file mode 100644 index 00000000000..ec02e8a3424 --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed+int.allsizes-.cxx @@ -0,0 +1,7 @@ +#include +VNL_MATRIX_FIXED_INSTANTIATE(int,1,1); +VNL_MATRIX_FIXED_INSTANTIATE(int,2,2); +VNL_MATRIX_FIXED_INSTANTIATE(int,2,8); +VNL_MATRIX_FIXED_INSTANTIATE(int,3,4); +VNL_MATRIX_FIXED_INSTANTIATE(int,4,4); +VNL_MATRIX_FIXED_INSTANTIATE(int,8,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed+vnl_bignum.3.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+vnl_bignum.allsizes-.cxx similarity index 100% rename from core/vnl/Templates/vnl_matrix_fixed+vnl_bignum.3.3-.cxx rename to core/vnl/Templates/vnl_matrix_fixed+vnl_bignum.allsizes-.cxx diff --git a/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.4.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.4.4-.cxx deleted file mode 100644 index 382bd2c30e0..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.4.4-.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include -#include - -VNL_MATRIX_FIXED_INSTANTIATE(vnl_rational,4,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.3.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.allsizes-.cxx similarity index 75% rename from core/vnl/Templates/vnl_matrix_fixed+vnl_rational.3.3-.cxx rename to core/vnl/Templates/vnl_matrix_fixed+vnl_rational.allsizes-.cxx index c047c549134..dcf8acb5e40 100644 --- a/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.3.3-.cxx +++ b/core/vnl/Templates/vnl_matrix_fixed+vnl_rational.allsizes-.cxx @@ -2,3 +2,4 @@ #include #include VNL_MATRIX_FIXED_INSTANTIATE(vnl_rational,3,3); +VNL_MATRIX_FIXED_INSTANTIATE(vnl_rational,4,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.1.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.1.1-.cxx deleted file mode 100644 index 17512116ef9..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,1,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.10.10-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.10.10-.cxx deleted file mode 100644 index a87b87443fd..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,10,10); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.2.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.2.2-.cxx deleted file mode 100644 index e4c24304765..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,2,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.3.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.3.3-.cxx deleted file mode 100644 index 42481369e75..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,3,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.3.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.3.4-.cxx deleted file mode 100644 index 535609d2c50..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,3,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.4.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.4.4-.cxx deleted file mode 100644 index f49e7f13113..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,4,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.5.5-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.5.5-.cxx deleted file mode 100644 index f035b07c080..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,5,5); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.6.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.6.6-.cxx deleted file mode 100644 index e40d1ae1a38..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,6,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.7.7-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.7.7-.cxx deleted file mode 100644 index 4cb4b17cf95..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,7,7); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.8.8-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.8.8-.cxx deleted file mode 100644 index 7c254eef9dc..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,8,8); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.9.9-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.9.9-.cxx deleted file mode 100644 index 6a9afb8ee26..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+double.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(double,9,9); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+double.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+double.allsizes-.cxx new file mode 100644 index 00000000000..a1177517ed4 --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed_ref+double.allsizes-.cxx @@ -0,0 +1,16 @@ +#include +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,1,1); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,2,2); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,2,3); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,3,2); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,3,3); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,3,4); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,3,12); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,4,3); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,4,4); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,5,5); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,6,6); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,7,7); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,8,8); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,9,9); +VNL_MATRIX_FIXED_REF_INSTANTIATE(double,10,10); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.1.1-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.1.1-.cxx deleted file mode 100644 index 2e3f17d3b30..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,1,1); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.10.10-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.10.10-.cxx deleted file mode 100644 index 5e9f9217fa5..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,10,10); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.2.2-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.2.2-.cxx deleted file mode 100644 index 870dbe3df9f..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,2,2); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.3.3-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.3.3-.cxx deleted file mode 100644 index e94faeb2019..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,3,3); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.3.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.3.4-.cxx deleted file mode 100644 index 1748e8e3c5a..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,3,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.4.4-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.4.4-.cxx deleted file mode 100644 index a6a09712b9f..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,4,4); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.5.5-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.5.5-.cxx deleted file mode 100644 index 1f2a155257a..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,5,5); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.6.6-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.6.6-.cxx deleted file mode 100644 index c0e6c67cd0b..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,6,6); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.7.7-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.7.7-.cxx deleted file mode 100644 index e710cd44cf4..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,7,7); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.8.8-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.8.8-.cxx deleted file mode 100644 index a0710d05448..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,8,8); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.9.9-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.9.9-.cxx deleted file mode 100644 index f770ce913cb..00000000000 --- a/core/vnl/Templates/vnl_matrix_fixed_ref+float.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_MATRIX_FIXED_REF_INSTANTIATE(float,9,9); diff --git a/core/vnl/Templates/vnl_matrix_fixed_ref+float.allsizes-.cxx b/core/vnl/Templates/vnl_matrix_fixed_ref+float.allsizes-.cxx new file mode 100644 index 00000000000..f688848df6e --- /dev/null +++ b/core/vnl/Templates/vnl_matrix_fixed_ref+float.allsizes-.cxx @@ -0,0 +1,16 @@ +#include +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,1,1); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,2,2); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,2,3); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,3,2); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,3,3); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,3,4); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,3,12); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,4,3); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,4,4); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,5,5); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,6,6); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,7,7); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,8,8); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,9,9); +VNL_MATRIX_FIXED_REF_INSTANTIATE(float,10,10); diff --git a/core/vnl/Templates/vnl_sparse_matrix+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_sparse_matrix+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_sparse_matrix+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_sparse_matrix+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_sparse_matrix+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_sparse_matrix+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_sparse_matrix+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_sparse_matrix+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_sym_matrix+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_sym_matrix+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_sym_matrix+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_sym_matrix+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_sym_matrix+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_sym_matrix+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_sym_matrix+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_sym_matrix+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_sym_matrix+vcl_complex+long_double--.cxx b/core/vnl/Templates/vnl_sym_matrix+complex+long_double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_sym_matrix+vcl_complex+long_double--.cxx rename to core/vnl/Templates/vnl_sym_matrix+complex+long_double--.cxx diff --git a/core/vnl/Templates/vnl_vector+vcl_complex+double--.cxx b/core/vnl/Templates/vnl_vector+complex+double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_vector+vcl_complex+double--.cxx rename to core/vnl/Templates/vnl_vector+complex+double--.cxx diff --git a/core/vnl/Templates/vnl_vector+vcl_complex+float--.cxx b/core/vnl/Templates/vnl_vector+complex+float--.cxx similarity index 100% rename from core/vnl/Templates/vnl_vector+vcl_complex+float--.cxx rename to core/vnl/Templates/vnl_vector+complex+float--.cxx diff --git a/core/vnl/Templates/vnl_vector+vcl_complex+long_double--.cxx b/core/vnl/Templates/vnl_vector+complex+long_double--.cxx similarity index 100% rename from core/vnl/Templates/vnl_vector+vcl_complex+long_double--.cxx rename to core/vnl/Templates/vnl_vector+complex+long_double--.cxx diff --git a/core/vnl/Templates/vnl_vector_fixed+complex_double.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+complex_double.allsizes-.cxx new file mode 100644 index 00000000000..79c967f38f4 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+complex_double.allsizes-.cxx @@ -0,0 +1,10 @@ +#include +#include +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 1); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 2); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 3); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 4); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 5); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 9); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 16); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 25); diff --git a/core/vnl/Templates/vnl_vector_fixed+complex_float.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+complex_float.allsizes-.cxx new file mode 100644 index 00000000000..2dd0e162050 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+complex_float.allsizes-.cxx @@ -0,0 +1,10 @@ +#include +#include +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 1); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 2); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 3); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 4); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 5); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 9); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 16); +VNL_VECTOR_FIXED_INSTANTIATE(std::complex, 25); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.1-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.1-.cxx deleted file mode 100644 index 3bea6ede5a2..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.1-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,1); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.10-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.10-.cxx deleted file mode 100644 index 0ad95d6613f..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.10-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,10); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.2-.cxx deleted file mode 100644 index d3946b2dc35..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.2-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,2); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.20-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.20-.cxx deleted file mode 100644 index 9fe8acaa72a..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.20-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,20); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.3-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.3-.cxx deleted file mode 100644 index e7aefd22411..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.3-.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,3); - diff --git a/core/vnl/Templates/vnl_vector_fixed+double.4-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.4-.cxx deleted file mode 100644 index b15ac9a062f..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.4-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,4); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.5-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.5-.cxx deleted file mode 100644 index eea03b6e171..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.5-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,5); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.6-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.6-.cxx deleted file mode 100644 index 64e065e6dea..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.6-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,6); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.9-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.9-.cxx deleted file mode 100644 index 507b27a10f0..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+double.9-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(double,9); diff --git a/core/vnl/Templates/vnl_vector_fixed+double.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+double.allsizes-.cxx new file mode 100644 index 00000000000..1a27d28c90e --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+double.allsizes-.cxx @@ -0,0 +1,32 @@ +#include +VNL_VECTOR_FIXED_INSTANTIATE(double, 1); +VNL_VECTOR_FIXED_INSTANTIATE(double, 2); +VNL_VECTOR_FIXED_INSTANTIATE(double, 3); +VNL_VECTOR_FIXED_INSTANTIATE(double, 4); +VNL_VECTOR_FIXED_INSTANTIATE(double, 5); +VNL_VECTOR_FIXED_INSTANTIATE(double, 6); +VNL_VECTOR_FIXED_INSTANTIATE(double, 7); +VNL_VECTOR_FIXED_INSTANTIATE(double, 8); +VNL_VECTOR_FIXED_INSTANTIATE(double, 9); +VNL_VECTOR_FIXED_INSTANTIATE(double, 10); +VNL_VECTOR_FIXED_INSTANTIATE(double, 11); +VNL_VECTOR_FIXED_INSTANTIATE(double, 12); +VNL_VECTOR_FIXED_INSTANTIATE(double, 15); +VNL_VECTOR_FIXED_INSTANTIATE(double, 16); +VNL_VECTOR_FIXED_INSTANTIATE(double, 18); +VNL_VECTOR_FIXED_INSTANTIATE(double, 20); +VNL_VECTOR_FIXED_INSTANTIATE(double, 21); +VNL_VECTOR_FIXED_INSTANTIATE(double, 22); +VNL_VECTOR_FIXED_INSTANTIATE(double, 24); +VNL_VECTOR_FIXED_INSTANTIATE(double, 25); +VNL_VECTOR_FIXED_INSTANTIATE(double, 27); +VNL_VECTOR_FIXED_INSTANTIATE(double, 36); +VNL_VECTOR_FIXED_INSTANTIATE(double, 49); +VNL_VECTOR_FIXED_INSTANTIATE(double, 64); +VNL_VECTOR_FIXED_INSTANTIATE(double, 80); +VNL_VECTOR_FIXED_INSTANTIATE(double, 81); +VNL_VECTOR_FIXED_INSTANTIATE(double, 96); +VNL_VECTOR_FIXED_INSTANTIATE(double,100); +VNL_VECTOR_FIXED_INSTANTIATE(double,125); +VNL_VECTOR_FIXED_INSTANTIATE(double,128); +VNL_VECTOR_FIXED_INSTANTIATE(double,15625); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.1-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.1-.cxx deleted file mode 100644 index ff7408e1cfc..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.1-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(float,1); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.10-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.10-.cxx deleted file mode 100644 index ecd4d3b3db7..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_VECTOR_FIXED_INSTANTIATE(float,10); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.16-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.16-.cxx deleted file mode 100644 index 76a32d1c306..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.16-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_VECTOR_FIXED_INSTANTIATE(float,16); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.2-.cxx deleted file mode 100644 index c1939adcc10..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.2-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(float,2); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.3-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.3-.cxx deleted file mode 100644 index 0e6196fa782..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.3-.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(float,3); - diff --git a/core/vnl/Templates/vnl_vector_fixed+float.4-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.4-.cxx deleted file mode 100644 index 9c7e87f8f38..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.4-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(float,4); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.5-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.5-.cxx deleted file mode 100644 index 08cb78c86b3..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_VECTOR_FIXED_INSTANTIATE(float,5); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.9-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.9-.cxx deleted file mode 100644 index d0715660b5e..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+float.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_VECTOR_FIXED_INSTANTIATE(float,9); diff --git a/core/vnl/Templates/vnl_vector_fixed+float.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+float.allsizes-.cxx new file mode 100644 index 00000000000..ba0965c8f43 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+float.allsizes-.cxx @@ -0,0 +1,32 @@ +#include +VNL_VECTOR_FIXED_INSTANTIATE(float, 1); +VNL_VECTOR_FIXED_INSTANTIATE(float, 2); +VNL_VECTOR_FIXED_INSTANTIATE(float, 3); +VNL_VECTOR_FIXED_INSTANTIATE(float, 4); +VNL_VECTOR_FIXED_INSTANTIATE(float, 5); +VNL_VECTOR_FIXED_INSTANTIATE(float, 6); +VNL_VECTOR_FIXED_INSTANTIATE(float, 7); +VNL_VECTOR_FIXED_INSTANTIATE(float, 8); +VNL_VECTOR_FIXED_INSTANTIATE(float, 9); +VNL_VECTOR_FIXED_INSTANTIATE(float, 10); +VNL_VECTOR_FIXED_INSTANTIATE(float, 11); +VNL_VECTOR_FIXED_INSTANTIATE(float, 12); +VNL_VECTOR_FIXED_INSTANTIATE(float, 15); +VNL_VECTOR_FIXED_INSTANTIATE(float, 16); +VNL_VECTOR_FIXED_INSTANTIATE(float, 18); +VNL_VECTOR_FIXED_INSTANTIATE(float, 20); +VNL_VECTOR_FIXED_INSTANTIATE(float, 21); +VNL_VECTOR_FIXED_INSTANTIATE(float, 22); +VNL_VECTOR_FIXED_INSTANTIATE(float, 24); +VNL_VECTOR_FIXED_INSTANTIATE(float, 25); +VNL_VECTOR_FIXED_INSTANTIATE(float, 27); +VNL_VECTOR_FIXED_INSTANTIATE(float, 36); +VNL_VECTOR_FIXED_INSTANTIATE(float, 49); +VNL_VECTOR_FIXED_INSTANTIATE(float, 64); +VNL_VECTOR_FIXED_INSTANTIATE(float, 80); +VNL_VECTOR_FIXED_INSTANTIATE(float, 81); +VNL_VECTOR_FIXED_INSTANTIATE(float, 96); +VNL_VECTOR_FIXED_INSTANTIATE(float,100); +VNL_VECTOR_FIXED_INSTANTIATE(float,125); +VNL_VECTOR_FIXED_INSTANTIATE(float,128); +VNL_VECTOR_FIXED_INSTANTIATE(float,15625); diff --git a/core/vnl/Templates/vnl_vector_fixed+int.1-.cxx b/core/vnl/Templates/vnl_vector_fixed+int.1-.cxx deleted file mode 100644 index c022467dd31..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+int.1-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(int,1); diff --git a/core/vnl/Templates/vnl_vector_fixed+int.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+int.2-.cxx deleted file mode 100644 index 672c9e254a2..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+int.2-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(int,2); diff --git a/core/vnl/Templates/vnl_vector_fixed+int.3-.cxx b/core/vnl/Templates/vnl_vector_fixed+int.3-.cxx deleted file mode 100644 index 23e5dafb2a4..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+int.3-.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(int,3); - diff --git a/core/vnl/Templates/vnl_vector_fixed+int.4-.cxx b/core/vnl/Templates/vnl_vector_fixed+int.4-.cxx deleted file mode 100644 index 008714e66b0..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+int.4-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(int,4); diff --git a/core/vnl/Templates/vnl_vector_fixed+int.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+int.allsizes-.cxx new file mode 100644 index 00000000000..801ee331e3f --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+int.allsizes-.cxx @@ -0,0 +1,27 @@ +#include +VNL_VECTOR_FIXED_INSTANTIATE(int,1); +VNL_VECTOR_FIXED_INSTANTIATE(int,2); +VNL_VECTOR_FIXED_INSTANTIATE(int,3); +VNL_VECTOR_FIXED_INSTANTIATE(int,4); +VNL_VECTOR_FIXED_INSTANTIATE(int,5); +VNL_VECTOR_FIXED_INSTANTIATE(int,6); +VNL_VECTOR_FIXED_INSTANTIATE(int,7); +VNL_VECTOR_FIXED_INSTANTIATE(int,8); +VNL_VECTOR_FIXED_INSTANTIATE(int,9); +VNL_VECTOR_FIXED_INSTANTIATE(int,10); +VNL_VECTOR_FIXED_INSTANTIATE(int,11); +VNL_VECTOR_FIXED_INSTANTIATE(int,12); +VNL_VECTOR_FIXED_INSTANTIATE(int,15); +VNL_VECTOR_FIXED_INSTANTIATE(int,16); +VNL_VECTOR_FIXED_INSTANTIATE(int,18); +VNL_VECTOR_FIXED_INSTANTIATE(int,20); +VNL_VECTOR_FIXED_INSTANTIATE(int,22); +VNL_VECTOR_FIXED_INSTANTIATE(int,25); +VNL_VECTOR_FIXED_INSTANTIATE(int,27); +VNL_VECTOR_FIXED_INSTANTIATE(int,36); +VNL_VECTOR_FIXED_INSTANTIATE(int,49); +VNL_VECTOR_FIXED_INSTANTIATE(int,64); +VNL_VECTOR_FIXED_INSTANTIATE(int,80); +VNL_VECTOR_FIXED_INSTANTIATE(int,81); +VNL_VECTOR_FIXED_INSTANTIATE(int,96); +VNL_VECTOR_FIXED_INSTANTIATE(int,100); diff --git a/core/vnl/Templates/vnl_vector_fixed+sshort.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+sshort.allsizes-.cxx similarity index 100% rename from core/vnl/Templates/vnl_vector_fixed+sshort.2-.cxx rename to core/vnl/Templates/vnl_vector_fixed+sshort.allsizes-.cxx diff --git a/core/vnl/Templates/vnl_vector_fixed+uchar.16-.cxx b/core/vnl/Templates/vnl_vector_fixed+uchar.16-.cxx deleted file mode 100644 index 8bcaf443843..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+uchar.16-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,16); diff --git a/core/vnl/Templates/vnl_vector_fixed+uchar.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+uchar.allsizes-.cxx new file mode 100644 index 00000000000..5826388c838 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+uchar.allsizes-.cxx @@ -0,0 +1,12 @@ +#include +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,1); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,2); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,3); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,4); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,5); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,6); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,7); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,8); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,9); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,10); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned char,16); diff --git a/core/vnl/Templates/vnl_vector_fixed+uint.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+uint.allsizes-.cxx new file mode 100644 index 00000000000..79283e50c13 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+uint.allsizes-.cxx @@ -0,0 +1,11 @@ +#include + +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,2); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,3); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,4); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,5); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,6); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,7); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,8); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,9); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned int,10); diff --git a/core/vnl/Templates/vnl_vector_fixed+ushort.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+ushort.2-.cxx deleted file mode 100644 index 8575b11f0f6..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+ushort.2-.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include - -VNL_VECTOR_FIXED_INSTANTIATE(unsigned short,2); diff --git a/core/vnl/Templates/vnl_vector_fixed+ushort.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+ushort.allsizes-.cxx new file mode 100644 index 00000000000..62de36ed490 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+ushort.allsizes-.cxx @@ -0,0 +1,6 @@ +#include + +VNL_VECTOR_FIXED_INSTANTIATE(unsigned short,2); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned short,3); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned short,4); +VNL_VECTOR_FIXED_INSTANTIATE(unsigned short,8); diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.2-.cxx deleted file mode 100644 index 70da8b80092..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.2-.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include -#include -VNL_VECTOR_FIXED_INSTANTIATE(vnl_bignum,2); diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.3-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.3-.cxx deleted file mode 100644 index 567622958cd..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.3-.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include -#include -VNL_VECTOR_FIXED_INSTANTIATE(vnl_bignum,3); - diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.1-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.allsizes-.cxx similarity index 52% rename from core/vnl/Templates/vnl_vector_fixed+vnl_bignum.1-.cxx rename to core/vnl/Templates/vnl_vector_fixed+vnl_bignum.allsizes-.cxx index d86b41843e1..90feca979ba 100644 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.1-.cxx +++ b/core/vnl/Templates/vnl_vector_fixed+vnl_bignum.allsizes-.cxx @@ -2,3 +2,6 @@ #include #include VNL_VECTOR_FIXED_INSTANTIATE(vnl_bignum,1); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_bignum,2); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_bignum,3); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_bignum,9); diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.1-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_rational.1-.cxx deleted file mode 100644 index d0cd5e1d9b5..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.1-.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include -#include -VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,1); diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.2-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_rational.2-.cxx deleted file mode 100644 index 32626a8820e..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.2-.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include -#include -VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,2); diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.3-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_rational.3-.cxx deleted file mode 100644 index 0c8b66f9278..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.3-.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include -#include -VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,3); - diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.4-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_rational.4-.cxx deleted file mode 100644 index 5faddb85775..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.4-.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include -#include -VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,4); - diff --git a/core/vnl/Templates/vnl_vector_fixed+vnl_rational.allsizes-.cxx b/core/vnl/Templates/vnl_vector_fixed+vnl_rational.allsizes-.cxx new file mode 100644 index 00000000000..d42811c66d9 --- /dev/null +++ b/core/vnl/Templates/vnl_vector_fixed+vnl_rational.allsizes-.cxx @@ -0,0 +1,9 @@ +#include +#include +#include +VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,1); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,2); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,3); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,4); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,9); +VNL_VECTOR_FIXED_INSTANTIATE(vnl_rational,16); diff --git a/core/vnl/Templates/vnl_vector_fixed_ref+double.4-.cxx b/core/vnl/Templates/vnl_vector_fixed_ref+double.4-.cxx deleted file mode 100644 index c12bfed58e6..00000000000 --- a/core/vnl/Templates/vnl_vector_fixed_ref+double.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_VECTOR_FIXED_REF_INSTANTIATE(double,4); diff --git a/core/vnl/Templates/vnl_vector_fixed_ref+double.3-.cxx b/core/vnl/Templates/vnl_vector_fixed_ref+double.allsizes-.cxx similarity index 65% rename from core/vnl/Templates/vnl_vector_fixed_ref+double.3-.cxx rename to core/vnl/Templates/vnl_vector_fixed_ref+double.allsizes-.cxx index 0360e3853b0..34be213670d 100644 --- a/core/vnl/Templates/vnl_vector_fixed_ref+double.3-.cxx +++ b/core/vnl/Templates/vnl_vector_fixed_ref+double.allsizes-.cxx @@ -1,2 +1,3 @@ #include VNL_VECTOR_FIXED_REF_INSTANTIATE(double,3); +VNL_VECTOR_FIXED_REF_INSTANTIATE(double,4); diff --git a/core/vnl/Templates/vnl_vector_fixed_ref+float.3-.cxx b/core/vnl/Templates/vnl_vector_fixed_ref+float.allsizes-.cxx similarity index 100% rename from core/vnl/Templates/vnl_vector_fixed_ref+float.3-.cxx rename to core/vnl/Templates/vnl_vector_fixed_ref+float.allsizes-.cxx diff --git a/core/vnl/Templates/vnl_vector_ref+alltypes.cxx b/core/vnl/Templates/vnl_vector_ref+alltypes.cxx new file mode 100644 index 00000000000..5a0ffe17cec --- /dev/null +++ b/core/vnl/Templates/vnl_vector_ref+alltypes.cxx @@ -0,0 +1,23 @@ +#include +#include +VNL_VECTOR_REF_INSTANTIATE(std::complex); +VNL_VECTOR_REF_INSTANTIATE(std::complex); + +VNL_VECTOR_REF_INSTANTIATE(double); +VNL_VECTOR_REF_INSTANTIATE(float); +VNL_VECTOR_REF_INSTANTIATE(signed int); +VNL_VECTOR_REF_INSTANTIATE(unsigned int); +VNL_VECTOR_REF_INSTANTIATE(signed short); +VNL_VECTOR_REF_INSTANTIATE(unsigned short); +VNL_VECTOR_REF_INSTANTIATE(char); +VNL_VECTOR_REF_INSTANTIATE(unsigned char); +VNL_VECTOR_REF_INSTANTIATE(signed char); +VNL_VECTOR_REF_INSTANTIATE(unsigned long); +VNL_VECTOR_REF_INSTANTIATE(signed long); + +#include +#include +VNL_VECTOR_REF_INSTANTIATE(vnl_bignum); +#include +#include +VNL_VECTOR_REF_INSTANTIATE(vnl_rational); diff --git a/core/vnl/algo/Templates/vnl_fft_base+double.1-.cxx b/core/vnl/algo/Templates/vnl_fft_base+double.1-.cxx deleted file mode 100644 index a9b781fb84b..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+double.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(1, double); diff --git a/core/vnl/algo/Templates/vnl_fft_base+double.2-.cxx b/core/vnl/algo/Templates/vnl_fft_base+double.2-.cxx deleted file mode 100644 index 1e422c9e30a..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+double.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(2, double); diff --git a/core/vnl/algo/Templates/vnl_fft_base+double.3-.cxx b/core/vnl/algo/Templates/vnl_fft_base+double.3-.cxx deleted file mode 100644 index 4b986976a90..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+double.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(3, double); diff --git a/core/vnl/algo/Templates/vnl_fft_base+double.4-.cxx b/core/vnl/algo/Templates/vnl_fft_base+double.4-.cxx deleted file mode 100644 index ce68d4d14da..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+double.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(4, double); diff --git a/core/vnl/algo/Templates/vnl_fft_base+double.allsizes-.cxx b/core/vnl/algo/Templates/vnl_fft_base+double.allsizes-.cxx new file mode 100644 index 00000000000..29948934a28 --- /dev/null +++ b/core/vnl/algo/Templates/vnl_fft_base+double.allsizes-.cxx @@ -0,0 +1,8 @@ +#include +VNL_FFT_BASE_INSTANTIATE(1, double); +#include +VNL_FFT_BASE_INSTANTIATE(2, double); +#include +VNL_FFT_BASE_INSTANTIATE(3, double); +#include +VNL_FFT_BASE_INSTANTIATE(4, double); diff --git a/core/vnl/algo/Templates/vnl_fft_base+float.1-.cxx b/core/vnl/algo/Templates/vnl_fft_base+float.1-.cxx deleted file mode 100644 index a9427488986..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+float.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(1, float); diff --git a/core/vnl/algo/Templates/vnl_fft_base+float.2-.cxx b/core/vnl/algo/Templates/vnl_fft_base+float.2-.cxx deleted file mode 100644 index b082768e46c..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+float.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(2, float); diff --git a/core/vnl/algo/Templates/vnl_fft_base+float.3-.cxx b/core/vnl/algo/Templates/vnl_fft_base+float.3-.cxx deleted file mode 100644 index d9768716f94..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+float.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(3, float); diff --git a/core/vnl/algo/Templates/vnl_fft_base+float.4-.cxx b/core/vnl/algo/Templates/vnl_fft_base+float.4-.cxx deleted file mode 100644 index 6dd5df16b8a..00000000000 --- a/core/vnl/algo/Templates/vnl_fft_base+float.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_FFT_BASE_INSTANTIATE(4, float); diff --git a/core/vnl/algo/Templates/vnl_fft_base+float.allsizes-.cxx b/core/vnl/algo/Templates/vnl_fft_base+float.allsizes-.cxx new file mode 100644 index 00000000000..9f96faa2bde --- /dev/null +++ b/core/vnl/algo/Templates/vnl_fft_base+float.allsizes-.cxx @@ -0,0 +1,8 @@ +#include +VNL_FFT_BASE_INSTANTIATE(1, float); +#include +VNL_FFT_BASE_INSTANTIATE(2, float); +#include +VNL_FFT_BASE_INSTANTIATE(3, float); +#include +VNL_FFT_BASE_INSTANTIATE(4, float); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.1.1-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.1.1-.cxx deleted file mode 100644 index 991df8cfca7..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 1, 1); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.10.10-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.10.10-.cxx deleted file mode 100644 index 8e2512a21fe..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 10, 10); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.2.2-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.2.2-.cxx deleted file mode 100644 index 1a4e5914ded..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 2, 2); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.3.3-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.3.3-.cxx deleted file mode 100644 index e9c4677e3df..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 3, 3); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.3.4-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.3.4-.cxx deleted file mode 100644 index 103cf2e6f37..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 3, 4); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.4.4-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.4.4-.cxx deleted file mode 100644 index 351d0d19fe1..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 4, 4); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.5.5-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.5.5-.cxx deleted file mode 100644 index c25a95dde36..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 5, 5); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.6.6-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.6.6-.cxx deleted file mode 100644 index 15967ab5a62..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 6, 6); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.7.7-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.7.7-.cxx deleted file mode 100644 index e25daeb8359..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 7, 7); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.8.8-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.8.8-.cxx deleted file mode 100644 index 74663b9e938..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 8, 8); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.9.9-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.9.9-.cxx deleted file mode 100644 index db044d4e9b5..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+double.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(double, 9, 9); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+double.allsizes-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+double.allsizes-.cxx new file mode 100644 index 00000000000..854d10557c3 --- /dev/null +++ b/core/vnl/algo/Templates/vnl_svd_fixed+double.allsizes-.cxx @@ -0,0 +1,15 @@ +#include +VNL_SVD_FIXED_INSTANTIATE(double, 1, 1); +VNL_SVD_FIXED_INSTANTIATE(double, 2, 2); +VNL_SVD_FIXED_INSTANTIATE(double, 2, 3); +VNL_SVD_FIXED_INSTANTIATE(double, 3, 2); +VNL_SVD_FIXED_INSTANTIATE(double, 3, 3); +VNL_SVD_FIXED_INSTANTIATE(double, 3, 4); +VNL_SVD_FIXED_INSTANTIATE(double, 4, 3); +VNL_SVD_FIXED_INSTANTIATE(double, 4, 4); +VNL_SVD_FIXED_INSTANTIATE(double, 5, 5); +VNL_SVD_FIXED_INSTANTIATE(double, 6, 6); +VNL_SVD_FIXED_INSTANTIATE(double, 7, 7); +VNL_SVD_FIXED_INSTANTIATE(double, 8, 8); +VNL_SVD_FIXED_INSTANTIATE(double, 9, 9); +VNL_SVD_FIXED_INSTANTIATE(double, 10, 10); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.1.1-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.1.1-.cxx deleted file mode 100644 index ba1164f1ccd..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.1.1-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 1, 1); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.10.10-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.10.10-.cxx deleted file mode 100644 index c9780186a35..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.10.10-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 10, 10); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.2.2-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.2.2-.cxx deleted file mode 100644 index 4426d28dd9d..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.2.2-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 2, 2); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.3.3-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.3.3-.cxx deleted file mode 100644 index 1252b212c8e..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.3.3-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 3, 3); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.3.4-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.3.4-.cxx deleted file mode 100644 index 973d8beb431..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.3.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 3, 4); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.4.4-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.4.4-.cxx deleted file mode 100644 index 0124c976862..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.4.4-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 4, 4); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.5.5-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.5.5-.cxx deleted file mode 100644 index a9ae56072f0..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.5.5-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 5, 5); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.6.6-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.6.6-.cxx deleted file mode 100644 index 6dd8ebcba61..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.6.6-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 6, 6); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.7.7-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.7.7-.cxx deleted file mode 100644 index 6640c928697..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.7.7-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 7, 7); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.8.8-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.8.8-.cxx deleted file mode 100644 index cbd471cb2f3..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.8.8-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 8, 8); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.9.9-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.9.9-.cxx deleted file mode 100644 index 9c985e06e29..00000000000 --- a/core/vnl/algo/Templates/vnl_svd_fixed+float.9.9-.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include -VNL_SVD_FIXED_INSTANTIATE(float, 9, 9); diff --git a/core/vnl/algo/Templates/vnl_svd_fixed+float.allsizes-.cxx b/core/vnl/algo/Templates/vnl_svd_fixed+float.allsizes-.cxx new file mode 100644 index 00000000000..a94f72b692e --- /dev/null +++ b/core/vnl/algo/Templates/vnl_svd_fixed+float.allsizes-.cxx @@ -0,0 +1,15 @@ +#include +VNL_SVD_FIXED_INSTANTIATE(float, 1, 1); +VNL_SVD_FIXED_INSTANTIATE(float, 2, 2); +VNL_SVD_FIXED_INSTANTIATE(float, 2, 3); +VNL_SVD_FIXED_INSTANTIATE(float, 3, 2); +VNL_SVD_FIXED_INSTANTIATE(float, 3, 3); +VNL_SVD_FIXED_INSTANTIATE(float, 3, 4); +VNL_SVD_FIXED_INSTANTIATE(float, 4, 3); +VNL_SVD_FIXED_INSTANTIATE(float, 4, 4); +VNL_SVD_FIXED_INSTANTIATE(float, 5, 5); +VNL_SVD_FIXED_INSTANTIATE(float, 6, 6); +VNL_SVD_FIXED_INSTANTIATE(float, 7, 7); +VNL_SVD_FIXED_INSTANTIATE(float, 8, 8); +VNL_SVD_FIXED_INSTANTIATE(float, 9, 9); +VNL_SVD_FIXED_INSTANTIATE(float, 10, 10); diff --git a/core/vnl/tests/test_complexify.cxx b/core/vnl/tests/test_complexify.cxx index 3c011c1fc16..074788e4503 100644 --- a/core/vnl/tests/test_complexify.cxx +++ b/core/vnl/tests/test_complexify.cxx @@ -3,10 +3,13 @@ #include #include +#include #include #include #include + + template static void diff --git a/core/vnl/tests/test_drand48.cpp b/core/vnl/tests/test_drand48.cpp index becc3cfa912..d01e68460a2 100644 --- a/core/vnl/tests/test_drand48.cpp +++ b/core/vnl/tests/test_drand48.cpp @@ -21,4 +21,4 @@ int main(int, char*[]) std::cout << stdlib_value << " = " << vxl_value << std::endl; } return EXIT_SUCCESS; -} \ No newline at end of file +} diff --git a/core/vnl/tests/test_matrix_fixed.cxx b/core/vnl/tests/test_matrix_fixed.cxx index cd9425f1139..69e68473c25 100644 --- a/core/vnl/tests/test_matrix_fixed.cxx +++ b/core/vnl/tests/test_matrix_fixed.cxx @@ -4,7 +4,8 @@ #include #include -#include +#include + #include #include #include diff --git a/core/vnl/vnl_T_n.h b/core/vnl/vnl_T_n.h index 88b4630dc86..dac23295f06 100644 --- a/core/vnl/vnl_T_n.h +++ b/core/vnl/vnl_T_n.h @@ -25,7 +25,7 @@ //: this macro defines the class. // e.g. use vnl_T_n_impl(int,2) to implement class vnl_int_2. #define vnl_T_n_class_impl(T,n) \ -class VNL_EXPORT vnl_##T##_##n : public vnl_vector_fixed \ +class vnl_##T##_##n : public vnl_vector_fixed \ { \ public: \ vnl_##T##_##n() { } \ diff --git a/core/vnl/vnl_analytic_integrant.h b/core/vnl/vnl_analytic_integrant.h index a94762d82b7..095509baeee 100644 --- a/core/vnl/vnl_analytic_integrant.h +++ b/core/vnl/vnl_analytic_integrant.h @@ -8,7 +8,7 @@ #include "vnl_integrant_fnct.h" #include "vnl/vnl_export.h" -class VNL_EXPORT vnl_analytic_integrant : public vnl_integrant_fnct +class vnl_analytic_integrant : public vnl_integrant_fnct { public: vnl_analytic_integrant() = default; diff --git a/core/vnl/vnl_complexify.h b/core/vnl/vnl_complexify.h index 43aec210d94..0b50bd0e066 100644 --- a/core/vnl/vnl_complexify.h +++ b/core/vnl/vnl_complexify.h @@ -48,9 +48,14 @@ template VNL_EXPORT vnl_vector > vnl_complexify(vnl_vector const& R); + +template VNL_EXPORT +vnl_vector_fixed, n> +vnl_complexify(vnl_vector_fixed const& R); + //: Return complexified version of real fixed vector R. // \relatesalso vnl_vector_fixed -template VNL_EXPORT +template vnl_vector_fixed,n> vnl_complexify(vnl_vector_fixed const& R) { @@ -68,6 +73,10 @@ vnl_matrix > //: Return complexified version of real fixed matrix R. // \relatesalso vnl_matrix_fixed template VNL_EXPORT +vnl_matrix_fixed, r, c > +vnl_complexify(vnl_matrix_fixed const& R); + +template vnl_matrix_fixed,r,c > vnl_complexify(vnl_matrix_fixed const& R) { @@ -84,7 +93,7 @@ vnl_diag_matrix > //: Return complexified version of real fixed diagonal matrix R. // \relatesalso vnl_diag_matrix_fixed -template VNL_EXPORT +template vnl_diag_matrix_fixed,n > vnl_complexify(vnl_diag_matrix_fixed const& R) { @@ -118,7 +127,7 @@ vnl_vector > //: Return complex fixed vector R+j*I from two real fixed vectors R and I. // \relatesalso vnl_vector_fixed -template VNL_EXPORT +template vnl_vector_fixed,n > vnl_complexify(vnl_vector_fixed const& R, vnl_vector_fixed const& I) { @@ -135,7 +144,7 @@ vnl_matrix > //: Return complex fixed matrix R+j*I from two real fixed matrices R and I. // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed,r,c> vnl_complexify(vnl_matrix_fixed const& R, vnl_matrix_fixed const& I) { @@ -152,7 +161,7 @@ vnl_diag_matrix > //: Return complex fixed diagonal matrix R+j*I from two real fixed diagonal matrices R and I. // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_diag_matrix_fixed,n> vnl_complexify(vnl_diag_matrix_fixed const& R, vnl_diag_matrix_fixed const& I) { diff --git a/core/vnl/vnl_cross_product_matrix.h b/core/vnl/vnl_cross_product_matrix.h index 1f9ac6dd958..fdcce2e5121 100644 --- a/core/vnl/vnl_cross_product_matrix.h +++ b/core/vnl/vnl_cross_product_matrix.h @@ -28,7 +28,7 @@ // e_3 0 -e_1 // -e_2 e_1 0 // \endverbatim -class VNL_EXPORT vnl_cross_product_matrix : public vnl_double_3x3 +class vnl_cross_product_matrix : public vnl_double_3x3 { public: typedef vnl_double_3x3 base; diff --git a/core/vnl/vnl_diag_matrix_fixed.h b/core/vnl/vnl_diag_matrix_fixed.h index 1eb39383f05..2519d465f2d 100644 --- a/core/vnl/vnl_diag_matrix_fixed.h +++ b/core/vnl/vnl_diag_matrix_fixed.h @@ -105,11 +105,11 @@ class VNL_EXPORT vnl_diag_matrix_fixed // iterators typedef typename vnl_vector_fixed::iterator iterator; - inline iterator begin() { return diagonal_.begin(); } - inline iterator end() { return diagonal_.end(); } + iterator begin(); + iterator end(); typedef typename vnl_vector_fixed::const_iterator const_iterator; - inline const_iterator begin() const { return diagonal_.begin(); } - inline const_iterator end() const { return diagonal_.end(); } + const_iterator begin() const; + const_iterator end() const; //: Return the total number of elements stored by the matrix. // Since vnl_diag_matrix_fixed only stores values on the diagonal diff --git a/core/vnl/vnl_diag_matrix_fixed.hxx b/core/vnl/vnl_diag_matrix_fixed.hxx index 0b0a21d166a..9c54e889fa7 100644 --- a/core/vnl/vnl_diag_matrix_fixed.hxx +++ b/core/vnl/vnl_diag_matrix_fixed.hxx @@ -11,6 +11,21 @@ # include #endif +template +typename vnl_diag_matrix_fixed::iterator +vnl_diag_matrix_fixed::begin() { return diagonal_.begin(); } + +template +typename vnl_diag_matrix_fixed::iterator +vnl_diag_matrix_fixed::end() { return diagonal_.end(); } + +template +typename vnl_diag_matrix_fixed::const_iterator +vnl_diag_matrix_fixed::begin() const { return diagonal_.begin(); } + +template +typename vnl_diag_matrix_fixed::const_iterator +vnl_diag_matrix_fixed::end() const { return diagonal_.end(); } //: Return inv(D) * b. template diff --git a/core/vnl/vnl_drand48.cpp b/core/vnl/vnl_drand48.cpp index 4eab54a3476..e4c096325a4 100644 --- a/core/vnl/vnl_drand48.cpp +++ b/core/vnl/vnl_drand48.cpp @@ -184,4 +184,4 @@ void vnl_srand48(long seed) _rand48_mult[1] = RAND48_MULT_1; _rand48_mult[2] = RAND48_MULT_2; _rand48_add = RAND48_ADD; -} \ No newline at end of file +} diff --git a/core/vnl/vnl_drand48.h b/core/vnl/vnl_drand48.h index 630aeb08cf0..eeac9900437 100644 --- a/core/vnl/vnl_drand48.h +++ b/core/vnl/vnl_drand48.h @@ -4,4 +4,4 @@ extern double vnl_drand48(); extern void vnl_srand48(long seed); -#endif \ No newline at end of file +#endif diff --git a/core/vnl/vnl_finite.h b/core/vnl/vnl_finite.h index a4dfdb070af..88e82bae339 100644 --- a/core/vnl/vnl_finite.h +++ b/core/vnl/vnl_finite.h @@ -49,7 +49,7 @@ // but all other operations remain valid. // template -class VNL_EXPORT vnl_finite_int +class vnl_finite_int { private: int val_; //!< value of this number (smallest nonnegative representation) @@ -182,7 +182,7 @@ class VNL_EXPORT vnl_finite_int //: Return true only when x is a unit in this ring. // In a field, all numbers except 0 are units. // The total number of units is given by the Euler totient function. - inline bool is_unit() const { return gcd(val_) == 1; } + bool is_unit() const { return gcd(val_) == 1; } //: Return true only when x is a zero divisor, i.e., is not a unit. inline bool is_zero_divisor() const { return gcd(val_) != 1; } @@ -428,7 +428,7 @@ namespace vnl_math // anything more than that. // template -class VNL_EXPORT vnl_finite_int_poly +class vnl_finite_int_poly { typedef vnl_finite_int_poly Base; typedef vnl_finite_int Scalar; diff --git a/core/vnl/vnl_imag.h b/core/vnl/vnl_imag.h index dd2e6095d6f..f29b4cd5458 100644 --- a/core/vnl/vnl_imag.h +++ b/core/vnl/vnl_imag.h @@ -44,7 +44,7 @@ vnl_imag(vnl_vector > const& C); //: Vector of imaginary parts of vnl_vector_fixed, N >. // \relatesalso vnl_vector_fixed -template VNL_EXPORT +template vnl_vector_fixed vnl_imag(vnl_vector_fixed, N > const& C) { @@ -64,7 +64,7 @@ vnl_imag(vnl_matrix > const& C); //: Matrix of imaginary parts of vnl_matrix_fixed,NRow,NCol >. // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_imag(vnl_matrix_fixed,NRow,NCol > const& C) { @@ -84,7 +84,7 @@ vnl_imag(vnl_diag_matrix > const& C); //: Matrix of imaginary parts of vnl_diag_matrix_fixed >. // \relatesalso vnl_diag_matrix_fixed -template VNL_EXPORT +template vnl_diag_matrix_fixed vnl_imag(vnl_diag_matrix_fixed,N > const& C) { diff --git a/core/vnl/vnl_index_sort.h b/core/vnl/vnl_index_sort.h index 1e7e58a0ae2..fd79d7143bc 100644 --- a/core/vnl/vnl_index_sort.h +++ b/core/vnl/vnl_index_sort.h @@ -15,7 +15,7 @@ #include "vnl/vnl_export.h" template -class VNL_EXPORT vnl_index_sort +class vnl_index_sort { public: diff --git a/core/vnl/vnl_inverse.h b/core/vnl/vnl_inverse.h index bc7070246b2..f0eaadab55a 100644 --- a/core/vnl/vnl_inverse.h +++ b/core/vnl/vnl_inverse.h @@ -35,7 +35,7 @@ // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) { return vnl_matrix_fixed(T(1)/m(0,0)); @@ -52,7 +52,7 @@ vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) { T det = vnl_det(m); @@ -78,7 +78,7 @@ vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) { T det = vnl_det(m); @@ -111,7 +111,7 @@ vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) { T det = vnl_det(m); @@ -167,7 +167,7 @@ vnl_matrix_fixed vnl_inverse(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix -template VNL_EXPORT +template vnl_matrix vnl_inverse(vnl_matrix const& m) { assert(m.rows() == m.columns()); @@ -195,7 +195,7 @@ vnl_matrix vnl_inverse(vnl_matrix const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) { return vnl_matrix_fixed(T(1)/m(0,0)); @@ -214,7 +214,7 @@ vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) { T det = vnl_det(m); @@ -242,7 +242,7 @@ vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) { T det = vnl_det(m); @@ -277,7 +277,7 @@ vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) { T det = vnl_det(m); @@ -335,7 +335,7 @@ vnl_matrix_fixed vnl_inverse_transpose(vnl_matrix_fixed const& m) // // \relatesalso vnl_matrix -template VNL_EXPORT +template vnl_matrix vnl_inverse_transpose(vnl_matrix const& m) { assert(m.rows() == m.columns()); diff --git a/core/vnl/vnl_math.cxx b/core/vnl/vnl_math.cxx index 1cec4a03ebb..73d85e87470 100644 --- a/core/vnl/vnl_math.cxx +++ b/core/vnl/vnl_math.cxx @@ -46,4 +46,5 @@ double angle_minuspi_to_pi(double angle) if (angle<-vnl_math::pi) angle += vnl_math::twopi; return angle; } + }; // end namespace vnl_math diff --git a/core/vnl/vnl_math.h b/core/vnl/vnl_math.h index b011160a489..082a5f19323 100644 --- a/core/vnl/vnl_math.h +++ b/core/vnl/vnl_math.h @@ -36,6 +36,7 @@ #include #include +#include #ifdef _MSC_VER # include #endif diff --git a/core/vnl/vnl_matrix.h b/core/vnl/vnl_matrix.h index 34acbc30bb9..ab3c7e20a37 100644 --- a/core/vnl/vnl_matrix.h +++ b/core/vnl/vnl_matrix.h @@ -202,25 +202,11 @@ class VNL_EXPORT vnl_matrix //: Access an element for reading or writing // There are assert style boundary checks - #define NDEBUG to turn them off. - T & operator()(unsigned r, unsigned c) - { -#if VNL_CONFIG_CHECK_BOUNDS - assert(rdata[r][c]; - } + T & operator()(unsigned r, unsigned c); //: Access an element for reading // There are assert style boundary checks - #define NDEBUG to turn them off. - T const & operator()(unsigned r, unsigned c) const - { -#if VNL_CONFIG_CHECK_BOUNDS - assert(rdata[r][c]; - } + T const & operator()(unsigned r, unsigned c) const; // ----------------------- Filling and copying ----------------------- diff --git a/core/vnl/vnl_matrix.hxx b/core/vnl/vnl_matrix.hxx index 444fabbd903..50a57cb7e3f 100644 --- a/core/vnl/vnl_matrix.hxx +++ b/core/vnl/vnl_matrix.hxx @@ -449,6 +449,31 @@ vnl_matrix& vnl_matrix::set_diagonal(vnl_vector const& diag) return *this; } +//: Access an element for reading or writing +// There are assert style boundary checks - #define NDEBUG to turn them off. +template +T & vnl_matrix::operator()(unsigned r, unsigned c) +{ +#if VNL_CONFIG_CHECK_BOUNDS + assert(r < rows()); // Check the row index is valid + assert(c < cols()); // Check the column index is valid +#endif + return this->data[r][c]; +} + +//: Access an element for reading +// There are assert style boundary checks - #define NDEBUG to turn them off. +template +T const & vnl_matrix::operator()(unsigned r, unsigned c) const +{ +#if VNL_CONFIG_CHECK_BOUNDS + assert(r < rows()); // Check the row index is valid + assert(c < cols()); // Check the column index is valid +#endif + return this->data[r][c]; +} + + //: Copies all elements of rhs matrix into lhs matrix. O(m*n). // If needed, the arrays in lhs matrix are freed up, and new arrays are // allocated to match the dimensions of the rhs matrix. diff --git a/core/vnl/vnl_matrix_fixed.h b/core/vnl/vnl_matrix_fixed.h index d152f5467cf..dcd31085ac6 100644 --- a/core/vnl/vnl_matrix_fixed.h +++ b/core/vnl/vnl_matrix_fixed.h @@ -147,8 +147,6 @@ class VNL_EXPORT vnl_matrix_fixed std::memcpy(data_[0], datablck, num_rows*num_cols*sizeof(T)); } - - //: Construct an m*n Matrix and copy rhs into it. // Abort if rhs is not the same size. vnl_matrix_fixed(const vnl_matrix& rhs) @@ -160,16 +158,11 @@ class VNL_EXPORT vnl_matrix_fixed //: Set all elements to value v // Complexity $O(r.c)$ - vnl_matrix_fixed& operator= (T const&v) { fill(v); return *this; } + vnl_matrix_fixed& operator= (T const&v); //: Copy a vnl_matrix into this. // Abort if rhs is not the same size. - vnl_matrix_fixed& operator=(const vnl_matrix& rhs) - { - assert(rhs.rows() == num_rows && rhs.columns() == num_cols); - std::memcpy(data_[0], rhs.data_block(), num_rows*num_cols*sizeof(T)); - return *this; - } + vnl_matrix_fixed& operator=(const vnl_matrix& rhs); // Basic 2D-Array functionality------------------------------------------- @@ -225,25 +218,11 @@ class VNL_EXPORT vnl_matrix_fixed //: Access an element for reading or writing // There are assert style boundary checks - #define NDEBUG to turn them off. - T & operator() (unsigned r, unsigned c) - { -#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) - assert(rdata_[r][c]; - } + T & operator() (unsigned r, unsigned c); //: Access an element for reading // There are assert style boundary checks - #define NDEBUG to turn them off. - T const & operator() (unsigned r, unsigned c) const - { -#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) - assert(rdata_[r][c]; - } + T const & operator() (unsigned r, unsigned c) const; // ----------------------- Filling and copying ----------------------- @@ -661,11 +640,11 @@ class VNL_EXPORT vnl_matrix_fixed //: Access the contiguous block storing the elements in the matrix row-wise. O(1). // 1d array, row-major order. - T const* data_block () const { return data_[0]; } + T const* data_block() const; //: Access the contiguous block storing the elements in the matrix row-wise. O(1). // 1d array, row-major order. - T * data_block () { return data_[0]; } + T * data_block(); //---------------------------------------------------------------------- @@ -681,23 +660,23 @@ class VNL_EXPORT vnl_matrix_fixed // for vnl_matrix but not for vnl_matrix_fixed. There is also a // conversion operator that should work most of the time. // \sa vnl_matrix_ref::non_const - vnl_matrix_ref as_ref() { return vnl_matrix_ref( num_rows, num_cols, data_block() ); } + inline vnl_matrix_ref as_ref() { return vnl_matrix_ref( num_rows, num_cols, data_block() ); } //: Explicit conversion to a vnl_matrix_ref. // This is a cheap conversion for those functions that have an interface // for vnl_matrix but not for vnl_matrix_fixed. There is also a // conversion operator that should work most of the time. // \sa vnl_matrix_ref::non_const - const vnl_matrix_ref as_ref() const { return vnl_matrix_ref( num_rows, num_cols, const_cast(data_block()) ); } + inline const vnl_matrix_ref as_ref() const { return vnl_matrix_ref( num_rows, num_cols, const_cast(data_block()) ); } //: Cheap conversion to vnl_matrix_ref // Sometimes, such as with templated functions, the compiler cannot // use this user-defined conversion. For those cases, use the // explicit as_ref() method instead. - operator const vnl_matrix_ref() const { return vnl_matrix_ref( num_rows, num_cols, const_cast(data_block()) ); } + inline operator const vnl_matrix_ref() const { return vnl_matrix_ref( num_rows, num_cols, const_cast(data_block()) ); } //: Convert to a vnl_matrix. - const vnl_matrix as_matrix() const { return vnl_matrix(const_cast(data_block()),num_rows,num_cols); } + inline const vnl_matrix as_matrix() const { return vnl_matrix(const_cast(data_block()),num_rows,num_cols); } //---------------------------------------------------------------------- @@ -706,16 +685,16 @@ class VNL_EXPORT vnl_matrix_fixed //: Iterators typedef T *iterator; //: Iterator pointing to start of data - iterator begin() { return data_[0]; } + inline iterator begin() { return data_[0]; } //: Iterator pointing to element beyond end of data - iterator end() { return begin() + size(); } + inline iterator end() { return begin() + size(); } //: Const iterators typedef T const *const_iterator; //: Iterator pointing to start of data - const_iterator begin() const { return data_[0]; } + inline const_iterator begin() const { return data_[0]; } //: Iterator pointing to element beyond end of data - const_iterator end() const { return begin() + size(); } + inline const_iterator end() const { return begin() + size(); } //-------------------------------------------------------------------------------- diff --git a/core/vnl/vnl_matrix_fixed.hxx b/core/vnl/vnl_matrix_fixed.hxx index d2b1b61ba82..cc138d18efd 100644 --- a/core/vnl/vnl_matrix_fixed.hxx +++ b/core/vnl/vnl_matrix_fixed.hxx @@ -15,8 +15,47 @@ #include #include +#include //vnl_math functions for complex variables #include +template +vnl_matrix_fixed& +vnl_matrix_fixed::operator= (T const&v) +{ + fill(v); return *this; +} + +template +vnl_matrix_fixed & +vnl_matrix_fixed::operator=(const vnl_matrix& rhs) +{ + assert(rhs.rows() == num_rows && rhs.columns() == num_cols); + std::memcpy(data_[0], rhs.data_block(), num_rows*num_cols * sizeof(T)); + return *this; +} + +template +T & +vnl_matrix_fixed::operator() (unsigned r, unsigned c) +{ +#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) + assert(r < rows()); // Check the row index is valid + assert(c < cols()); // Check the column index is valid +#endif + return this->data_[r][c]; +} + +template +T const & +vnl_matrix_fixed::operator() (unsigned r, unsigned c) const +{ +#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) + assert(r < rows()); // Check the row index is valid + assert(c < cols()); // Check the column index is valid +#endif + return this->data_[r][c]; +} + template void vnl_matrix_fixed::add( const T* a, const T* b, T* r ) @@ -845,6 +884,20 @@ vnl_matrix_fixed::inplace_transpose() return *this; } +template +T const* +vnl_matrix_fixed::data_block() const +{ + return data_[0]; +} + +template +T * +vnl_matrix_fixed::data_block() +{ + return data_[0]; +} + template vnl_matrix_fixed outer_product(vnl_vector_fixed const& a, vnl_vector_fixed const& b) diff --git a/core/vnl/vnl_na.h b/core/vnl/vnl_na.h index d5b6725e19f..e21909b5c47 100644 --- a/core/vnl/vnl_na.h +++ b/core/vnl/vnl_na.h @@ -89,21 +89,24 @@ VNL_EXPORT void vnl_na_insert(std::ostream &is, float x); //: Wrapper around a double or float that handles streaming NA. -template struct VNL_EXPORT vnl_na_stream_t +template +struct vnl_na_stream_t { T& x_; vnl_na_stream_t(T& x): x_(x) {} }; //: Wrapper around a double or float that handles streaming NA. -template struct VNL_EXPORT vnl_na_stream_const_t +template +struct vnl_na_stream_const_t { const T& x_; vnl_na_stream_const_t(const T& x): x_(x) {} }; //: Wrap a double or float to handle streaming NA. -template inline vnl_na_stream_t vnl_na_stream(T& x) +template +inline vnl_na_stream_t vnl_na_stream(T& x) { return vnl_na_stream_t(x); } diff --git a/core/vnl/vnl_numeric_traits.h b/core/vnl/vnl_numeric_traits.h index 197616613c9..6feb8c19780 100644 --- a/core/vnl/vnl_numeric_traits.h +++ b/core/vnl/vnl_numeric_traits.h @@ -47,13 +47,13 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr vnl_numeric_traits_not_a_valid_type zero; + static constexpr vnl_numeric_traits_not_a_valid_type zero; //: Multiplicative identity - static VNL_EXPORT constexpr vnl_numeric_traits_not_a_valid_type one; + static constexpr vnl_numeric_traits_not_a_valid_type one; //: Maximum value which this type can assume - static VNL_EXPORT constexpr vnl_numeric_traits_not_a_valid_type maxval; + static constexpr vnl_numeric_traits_not_a_valid_type maxval; //: Return value of abs() typedef vnl_numeric_traits_not_a_valid_type abs_t; @@ -72,11 +72,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr bool zero = false; + static constexpr bool zero = false; //: Multiplicative identity - static VNL_EXPORT constexpr bool one = true; + static constexpr bool one = true; //: Maximum value which this type can assume - static VNL_EXPORT constexpr bool maxval = true; + static constexpr bool maxval = true; //: Return value of abs() typedef unsigned int abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -94,19 +94,19 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr char zero = 0; + static constexpr char zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr char one = 1; + static constexpr char one = 1; //: Maximum value which this type can assume. // It is 127 (and not 255) since "char" is not guaranteed to be unsigned. #ifdef _MSC_VER #ifdef _CHAR_UNSIGNED - static VNL_EXPORT constexpr char maxval = 255; + static constexpr char maxval = 255; #else - static VNL_EXPORT constexpr char maxval = 127; + static constexpr char maxval = 127; #endif #else - static VNL_EXPORT constexpr char maxval = (char(255) { public: //: Additive identity - static VNL_EXPORT constexpr unsigned char zero = 0; + static constexpr unsigned char zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr unsigned char one = 1; + static constexpr unsigned char one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr unsigned char maxval = 255; + static constexpr unsigned char maxval = 255; //: Return value of abs() typedef unsigned char abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -145,11 +145,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr signed char zero = 0; + static constexpr signed char zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr signed char one = 1; + static constexpr signed char one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr signed char maxval = 127; + static constexpr signed char maxval = 127; //: Return value of abs() typedef unsigned char abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -166,11 +166,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr short zero = 0; + static constexpr short zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr short one = 1; + static constexpr short one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr short maxval = 0x7fff; // = 0x7fff; + static constexpr short maxval = 0x7fff; // = 0x7fff; //: Return value of abs() typedef unsigned short abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -187,11 +187,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr unsigned short zero = 0; + static constexpr unsigned short zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr unsigned short one = 1; + static constexpr unsigned short one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr unsigned short maxval = 0xffff; // = 0xffff; + static constexpr unsigned short maxval = 0xffff; // = 0xffff; //: Return value of abs() typedef unsigned short abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -208,11 +208,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr int zero = 0; + static constexpr int zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr int one = 1; + static constexpr int one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr int maxval = 0x7fffffff; // = 0x7fffffff; + static constexpr int maxval = 0x7fffffff; // = 0x7fffffff; //: Return value of abs() typedef unsigned int abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -229,11 +229,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr unsigned int zero = 0; + static constexpr unsigned int zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr unsigned int one = 1; + static constexpr unsigned int one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr unsigned int maxval = 0xffffffff; // = 0xffffffff; + static constexpr unsigned int maxval = 0xffffffff; // = 0xffffffff; //: Return value of abs() typedef unsigned int abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -250,11 +250,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr long zero = 0; + static constexpr long zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr long one = 1; + static constexpr long one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr long maxval = sizeof(long)==8?(vxl_uint_64)(-1)/2:0x7fffffffL; // = 0x7fffffffL or 0x7fffffffffffffffL; + static constexpr long maxval = sizeof(long)==8?(vxl_uint_64)(-1)/2:0x7fffffffL; // = 0x7fffffffL or 0x7fffffffffffffffL; //: Return value of abs() typedef unsigned long abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -271,11 +271,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr unsigned long zero = 0; + static constexpr unsigned long zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr unsigned long one = 1; + static constexpr unsigned long one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr unsigned long maxval = sizeof(unsigned long)==8?((vxl_uint_64)(-1)):0xffffffffL ; + static constexpr unsigned long maxval = sizeof(unsigned long)==8?((vxl_uint_64)(-1)):0xffffffffL ; // = 0xffffffffL or 0xffffffffffffffffL; //: Return value of abs() typedef unsigned long abs_t; @@ -295,11 +295,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr long long zero = 0; + static constexpr long long zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr long long one = 1; + static constexpr long long one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr long long maxval = sizeof(long long)==8?((vxl_uint_64)(-1))/2:0x7fffffffL ; + static constexpr long long maxval = sizeof(long long)==8?((vxl_uint_64)(-1))/2:0x7fffffffL ; //: Return value of abs() typedef unsigned long long abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -316,11 +316,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr unsigned long long zero = 0; + static constexpr unsigned long long zero = 0; //: Multiplicative identity - static VNL_EXPORT constexpr unsigned long long one = 1; + static constexpr unsigned long long one = 1; //: Maximum value which this type can assume - static VNL_EXPORT constexpr unsigned long long maxval = sizeof(unsigned long long)==8?(vxl_uint_64)(-1):0xffffffffL; + static constexpr unsigned long long maxval = sizeof(unsigned long long)==8?(vxl_uint_64)(-1):0xffffffffL; //: Return value of abs() typedef unsigned long long abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -338,11 +338,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr float zero = 0.0F; + static constexpr float zero = 0.0F; //: Multiplicative identity - static VNL_EXPORT constexpr float one = 1.0F; + static constexpr float one = 1.0F; //: Maximum value which this type can assume - static VNL_EXPORT constexpr float maxval = 3.40282346638528860e+38F; + static constexpr float maxval = 3.40282346638528860e+38F; //: Return value of abs() typedef float abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -359,11 +359,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr double zero = 0.0; + static constexpr double zero = 0.0; //: Multiplicative identity - static VNL_EXPORT constexpr double one = 1.0; + static constexpr double one = 1.0; //: Maximum value which this type can assume - static VNL_EXPORT constexpr double maxval = 1.7976931348623157E+308; + static constexpr double maxval = 1.7976931348623157E+308; //: Return value of abs() typedef double abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -380,11 +380,11 @@ class VNL_EXPORT vnl_numeric_traits { public: //: Additive identity - static VNL_EXPORT constexpr long double zero = 0.0; + static constexpr long double zero = 0.0; //: Multiplicative identity - static VNL_EXPORT constexpr long double one = 1.0; + static constexpr long double one = 1.0; //: Maximum value which this type can assume - static VNL_EXPORT constexpr long double maxval = 1.7976931348623157E+308; + static constexpr long double maxval = 1.7976931348623157E+308; //: Return value of abs() typedef long double abs_t; //: Name of a type twice as long as this one for accumulators and products. @@ -401,11 +401,11 @@ class VNL_EXPORT vnl_numeric_traits< std::complex > { public: //: Additive identity - static VNL_EXPORT const std::complex zero; + static const std::complex zero; //: Multiplicative identity - static VNL_EXPORT const std::complex one; + static const std::complex one; // Maximum value which this type can assume; makes no sense for this type - //static VNL_EXPORT const std::complex maxval; + //static const std::complex maxval; //: Return value of abs() typedef float abs_t; @@ -423,11 +423,11 @@ class VNL_EXPORT vnl_numeric_traits< std::complex > { public: //: Additive identity - static VNL_EXPORT const std::complex zero; + static const std::complex zero; //: Multiplicative identity - static VNL_EXPORT const std::complex one; + static const std::complex one; // Maximum value which this type can assume; makes no sense for this type - //static VNL_EXPORT const std::complex maxval; + //static const std::complex maxval; //: Return value of abs() typedef double abs_t; @@ -445,11 +445,11 @@ class VNL_EXPORT vnl_numeric_traits< std::complex > { public: //: Additive identity - static VNL_EXPORT const std::complex zero; + static const std::complex zero; //: Multiplicative identity - static VNL_EXPORT const std::complex one; + static const std::complex one; // Maximum value which this type can assume; makes no sense for this type - //static VNL_EXPORT const std::complex maxval; + //static const std::complex maxval; //: Return value of abs() typedef long double abs_t; diff --git a/core/vnl/vnl_polynomial.h b/core/vnl/vnl_polynomial.h index c91e1b6b3b1..f5059881805 100644 --- a/core/vnl/vnl_polynomial.h +++ b/core/vnl/vnl_polynomial.h @@ -164,7 +164,7 @@ class VNL_EXPORT vnl_polynomial std::vector coeffs_; }; -template VNL_EXPORT +template std::ostream& operator<<(std::ostream& os, vnl_polynomial const& p) { p.print(os); return os; } #define VNL_POLYNOMIAL_INSTANTIATE(T) extern "please #include vnl/vnl_polynomial.hxx instead" diff --git a/core/vnl/vnl_power.h b/core/vnl/vnl_power.h index cfb505b6aff..a7d6ef92d98 100644 --- a/core/vnl/vnl_power.h +++ b/core/vnl/vnl_power.h @@ -32,7 +32,7 @@ // // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_power(vnl_matrix_fixed const& m, int n) { assert(n >= 0 || d <= 4); // to allow the use of vnl_inverse() @@ -59,7 +59,7 @@ vnl_matrix_fixed vnl_power(vnl_matrix_fixed const& m, int n) // // \relatesalso vnl_matrix -template VNL_EXPORT +template vnl_matrix vnl_power(vnl_matrix const& m, int n) { assert(m.rows() == m.columns()); diff --git a/core/vnl/vnl_quaternion.h b/core/vnl/vnl_quaternion.h index c584c311943..0f4bd1ebe54 100644 --- a/core/vnl/vnl_quaternion.h +++ b/core/vnl/vnl_quaternion.h @@ -172,7 +172,7 @@ class VNL_EXPORT vnl_quaternion : public vnl_vector_fixed //: operator<< // \relatesalso vnl_quaternion -template VNL_EXPORT +template std::istream& operator>> (std::istream& is, vnl_quaternion &q) { vnl_vector_fixed v; diff --git a/core/vnl/vnl_real.h b/core/vnl/vnl_real.h index 779a1a635d3..af1719d6066 100644 --- a/core/vnl/vnl_real.h +++ b/core/vnl/vnl_real.h @@ -44,7 +44,7 @@ vnl_real(vnl_vector > const& C); //: Vector of real parts of vnl_vector_fixed, N >. // \relatesalso vnl_vector_fixed -template VNL_EXPORT +template vnl_vector_fixed vnl_real(vnl_vector_fixed, N > const& C) { @@ -64,7 +64,7 @@ vnl_real(vnl_matrix > const& C); //: Matrix of real parts of vnl_matrix_fixed,NRow,NCol >. // \relatesalso vnl_matrix_fixed -template VNL_EXPORT +template vnl_matrix_fixed vnl_real(vnl_matrix_fixed,NRow,NCol > const& C) { @@ -84,7 +84,7 @@ vnl_real(vnl_diag_matrix > const& C); //: Matrix of real parts of vnl_diag_matrix_fixed >. // \relatesalso vnl_diag_matrix_fixed -template VNL_EXPORT +template vnl_diag_matrix_fixed vnl_real(vnl_diag_matrix_fixed,N > const& C) { diff --git a/core/vnl/vnl_sym_matrix.h b/core/vnl/vnl_sym_matrix.h index 6e801b795d6..0a81bf2f4e6 100644 --- a/core/vnl/vnl_sym_matrix.h +++ b/core/vnl/vnl_sym_matrix.h @@ -265,8 +265,7 @@ bool operator==(const vnl_matrix &a, const vnl_sym_matrix &b); //: Swap the contents of a and b. // \relatesalso vnl_sym_matrix -template VNL_EXPORT -void swap(vnl_sym_matrix &a, vnl_sym_matrix &b) +template void swap(vnl_sym_matrix &a, vnl_sym_matrix &b) { a.swap(b); } #endif // vnl_sym_matrix_h_ diff --git a/core/vnl/vnl_vector_fixed.h b/core/vnl/vnl_vector_fixed.h index afaad6eac1b..6118fc27d7e 100644 --- a/core/vnl/vnl_vector_fixed.h +++ b/core/vnl/vnl_vector_fixed.h @@ -196,14 +196,7 @@ class VNL_EXPORT vnl_vector_fixed } //: Get value at element i - inline T get (unsigned int i) const - { -#if VNL_CONFIG_CHECK_BOUNDS - if (i >= this->size()) // If invalid index specified - vnl_error_vector_index("get", i); // Raise exception -#endif - return this->data_[i]; - } + T get(unsigned int i) const; //: Set all values to v vnl_vector_fixed& fill( T const& v ) @@ -236,39 +229,28 @@ class VNL_EXPORT vnl_vector_fixed //: Return reference to the element at specified index. // There are assert style boundary checks - #define NDEBUG to turn them off. - T & operator() (unsigned int i) - { -#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) - assert(i // for vnl_math::isfinite +template +T & +vnl_vector_fixed::operator() (unsigned int i) + { +#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) + assert(i < n); // Check the index is valid. +#endif + return data_[i]; + } + +template +T const & +vnl_vector_fixed::operator() (unsigned int i) const +{ +#if VNL_CONFIG_CHECK_BOUNDS && (!defined NDEBUG) + assert(i < n); // Check the index is valid +#endif + return data_[i]; +} + +template +T& +vnl_vector_fixed::operator[] (const size_t i) +{ return data_[i]; } + +template +const T& +vnl_vector_fixed::operator[] (const size_t i) const +{ return data_[i]; } + +template +T const* +vnl_vector_fixed::data_block() const +{ return data_; } + +template +T * +vnl_vector_fixed::data_block() +{ return data_; } + template vnl_vector_fixed vnl_vector_fixed::apply( T (*f)(T) ) @@ -111,6 +151,16 @@ vnl_vector_fixed::print(std::ostream& s) const s << ' ' << (*this)[i]; } +template +T +vnl_vector_fixed::get(unsigned int i) const +{ +#if VNL_CONFIG_CHECK_BOUNDS + if (i >= this->size()) // If invalid index specified + vnl_error_vector_index("get", i); // Raise exception +#endif + return this->data_[i]; +} // we don't need to explicitly instantiate all the operator+ and such // since they appear in the .h file and are inline. diff --git a/core/vnl/vnl_vector_ref.h b/core/vnl/vnl_vector_ref.h index c7eb20da308..884b8bafaa8 100644 --- a/core/vnl/vnl_vector_ref.h +++ b/core/vnl/vnl_vector_ref.h @@ -24,28 +24,20 @@ template class VNL_EXPORT vnl_vector_ref : public vnl_vector { public: - typedef vnl_vector Base; + using Base = vnl_vector; //: Constructor // Do \e not call anything else than the default constructor of vnl_vector - vnl_vector_ref(unsigned n, T *space) : vnl_vector() { - Base::data = space; - Base::num_elmts = n; - } + vnl_vector_ref(unsigned n, T *space); //: Copy constructor // Do \e not call anything else than the default constructor of vnl_vector // (That is why the default copy constructor is \e not good.) - vnl_vector_ref(vnl_vector_ref const& v) : vnl_vector() { - Base::data = const_cast(v.data_block()); // const incorrect! - Base::num_elmts = v.size(); - } + vnl_vector_ref(vnl_vector_ref const& v); //: Destructor // Prevents base destructor from releasing memory we don't own - ~vnl_vector_ref() { - Base::data = nullptr; - } + ~vnl_vector_ref(); //: Reference to self to make non-const temporaries. // This is intended for passing vnl_vector_fixed objects to @@ -61,13 +53,11 @@ class VNL_EXPORT vnl_vector_ref : public vnl_vector // \attention Use this only to pass the reference to a // function. Otherwise, the underlying object will be destructed and // you'll be left with undefined behaviour. - vnl_vector_ref& non_const() { return *this; } - - private: - - //: Copy constructor from vnl_vector is disallowed: - vnl_vector_ref(vnl_vector const&) {} + vnl_vector_ref& non_const(); + //: Copy and move constructor from vnl_vector is disallowed: + vnl_vector_ref(vnl_vector const&) = delete; + vnl_vector_ref(vnl_vector && ) = delete; }; //: Create a reference vector with part of an existing vector. diff --git a/core/vnl/vnl_vector_ref.hxx b/core/vnl/vnl_vector_ref.hxx new file mode 100644 index 00000000000..6dbb62803ad --- /dev/null +++ b/core/vnl/vnl_vector_ref.hxx @@ -0,0 +1,45 @@ +// This is core/vnl/vnl_vector_ref.hxx +#ifndef vnl_vector_ref_hxx_ +#define vnl_vector_ref_hxx_ +#include +#include +#include +#include "vnl_vector_ref.h" +#include +#ifdef _MSC_VER +# include +#endif +#include // for vnl_math::isfinite + + +//------------------------------------------------------------ +template +vnl_vector_ref::vnl_vector_ref(unsigned n, T *space) : vnl_vector() +{ + Base::data = space; + Base::num_elmts = n; +} + +template +vnl_vector_ref::vnl_vector_ref(vnl_vector_ref const& v) : vnl_vector() +{ + Base::data = const_cast(v.data_block()); // const incorrect! + Base::num_elmts = v.size(); +} + +template +vnl_vector_ref::~vnl_vector_ref() +{ + Base::data = nullptr; +} + +template +vnl_vector_ref& vnl_vector_ref::non_const() +{ + return *this; +} + +#define VNL_VECTOR_REF_INSTANTIATE(T) \ +template class vnl_vector_ref + +#endif // vnl_vector_ref_hxx_ diff --git a/core/vnl/xio/vnl_xio_matrix.h b/core/vnl/xio/vnl_xio_matrix.h index e1925413a3a..af0d66e5b6c 100644 --- a/core/vnl/xio/vnl_xio_matrix.h +++ b/core/vnl/xio/vnl_xio_matrix.h @@ -31,13 +31,13 @@ //: XML save vnl_matrix to stream. // \relatesalso vnl_matrix template -void x_write(std::ostream & os, vnl_matrix const& v, +void VNL_EXPORT x_write(std::ostream & os, vnl_matrix const& v, std::string name="vnl_matrix"); //: XML save vnl_matrix as a 3-level tree to stream. // \relatesalso vnl_matrix template -void x_write_tree(std::ostream & os, vnl_matrix const& v, +void VNL_EXPORT x_write_tree(std::ostream & os, vnl_matrix const& v, std::string name="vnl_matrix"); #define VNL_XIO_MATRIX_INSTANTIATE(T) extern "Please #include first" diff --git a/core/vxl_version.h b/core/vxl_version.h index ef4309f9dd1..f513cf4138d 100644 --- a/core/vxl_version.h +++ b/core/vxl_version.h @@ -13,7 +13,7 @@ // Formats are year=CCYY, month=MM, day=DD #define VXL_VERSION_DATE_YEAR 2018 #define VXL_VERSION_DATE_MONTH 11 -#define VXL_VERSION_DATE_DAY 08 +#define VXL_VERSION_DATE_DAY 14 //: Helper macros to create strings with the preprocessor. #define VXL_VERSION_TO_STRING(s) VXL_VERSION_TO_STRING0(s) From 4cac570f37b30fa13e5ab1732de27d651610b5ea Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Tue, 13 Nov 2018 13:13:50 -0600 Subject: [PATCH 2/2] ENH: VXL 2.0.0 provides all instantiations needed by ITK There is no longer a need to have separate instantiations only in ITK. --- .../VNLInstantiation/src/CMakeLists.txt | 17 ++--------------- .../src/libraryplaceholder.cxx | 8 ++++++++ .../vnl_fortran_copy_fixed+double.2.3-.cxx | 19 ------------------- .../vnl_fortran_copy_fixed+double.3.2-.cxx | 19 ------------------- .../src/vnl_fortran_copy_fixed+float.2.3-.cxx | 19 ------------------- .../src/vnl_fortran_copy_fixed+float.3.2-.cxx | 19 ------------------- .../src/vnl_matrix_fixed+double.3.12-.cxx | 19 ------------------- .../src/vnl_matrix_fixed_ref+double.2.3-.cxx | 19 ------------------- .../src/vnl_matrix_fixed_ref+double.3.12-.cxx | 19 ------------------- .../src/vnl_matrix_fixed_ref+double.4.3-.cxx | 19 ------------------- .../src/vnl_svd_fixed+double.2.3-.cxx | 19 ------------------- .../src/vnl_svd_fixed+double.3.2-.cxx | 19 ------------------- .../src/vnl_svd_fixed+float.2.3-.cxx | 19 ------------------- .../src/vnl_svd_fixed+float.3.2-.cxx | 19 ------------------- 14 files changed, 10 insertions(+), 243 deletions(-) create mode 100644 Modules/ThirdParty/VNLInstantiation/src/libraryplaceholder.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.2.3-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.3.2-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.2.3-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.3.2-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed+double.3.12-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.2.3-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.3.12-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.4.3-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.2.3-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.3.2-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.2.3-.cxx delete mode 100644 Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.3.2-.cxx diff --git a/Modules/ThirdParty/VNLInstantiation/src/CMakeLists.txt b/Modules/ThirdParty/VNLInstantiation/src/CMakeLists.txt index 694487ba6b2..4c1094da99e 100644 --- a/Modules/ThirdParty/VNLInstantiation/src/CMakeLists.txt +++ b/Modules/ThirdParty/VNLInstantiation/src/CMakeLists.txt @@ -1,19 +1,6 @@ - set(ITKVNLInstantiation_SRCS -vnl_svd_fixed+double.2.3-.cxx -vnl_svd_fixed+double.3.2-.cxx -vnl_svd_fixed+float.2.3-.cxx -vnl_svd_fixed+float.3.2-.cxx -vnl_fortran_copy_fixed+double.2.3-.cxx -vnl_fortran_copy_fixed+double.3.2-.cxx -vnl_fortran_copy_fixed+float.2.3-.cxx -vnl_fortran_copy_fixed+float.3.2-.cxx - -vnl_matrix_fixed+double.3.12-.cxx -vnl_matrix_fixed_ref+double.2.3-.cxx -vnl_matrix_fixed_ref+double.3.12-.cxx -vnl_matrix_fixed_ref+double.4.3-.cxx - ) + libraryplaceholder.cxx +) itk_module_add_library(ITKVNLInstantiation ${ITKVNLInstantiation_SRCS}) target_link_libraries(ITKVNLInstantiation LINK_PUBLIC ${ITKVNL_LIBRARIES}) diff --git a/Modules/ThirdParty/VNLInstantiation/src/libraryplaceholder.cxx b/Modules/ThirdParty/VNLInstantiation/src/libraryplaceholder.cxx new file mode 100644 index 00000000000..9727638edcd --- /dev/null +++ b/Modules/ThirdParty/VNLInstantiation/src/libraryplaceholder.cxx @@ -0,0 +1,8 @@ + +/* This file has one symbol that is exported in order to create a valid + * library for backwards compatibility in linking applications that may + * depend on the existence of the VNLInstantiation library + */ + +extern bool dummy_placeholder_variable_to_avoid_empty_library_warnings; +bool dummy_placeholder_variable_to_avoid_empty_library_warnings = true; diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.2.3-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.2.3-.cxx deleted file mode 100644 index 4bc4b877534..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.2.3-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_fortran_copy_fixed.hxx" -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double, 2, 3); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.3.2-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.3.2-.cxx deleted file mode 100644 index 2e4ac73be64..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+double.3.2-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_fortran_copy_fixed.hxx" -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double, 3, 2); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.2.3-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.2.3-.cxx deleted file mode 100644 index b0a75496c09..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.2.3-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_fortran_copy_fixed.hxx" -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float, 2, 3); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.3.2-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.3.2-.cxx deleted file mode 100644 index 03b9fa49f6a..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_fortran_copy_fixed+float.3.2-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_fortran_copy_fixed.hxx" -VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float, 3, 2); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed+double.3.12-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed+double.3.12-.cxx deleted file mode 100644 index 954b9117753..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed+double.3.12-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_matrix_fixed.hxx" -VNL_MATRIX_FIXED_INSTANTIATE(double, 3, 12); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.2.3-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.2.3-.cxx deleted file mode 100644 index f1623f89227..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.2.3-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_matrix_fixed_ref.hxx" -VNL_MATRIX_FIXED_REF_INSTANTIATE(double, 2, 3); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.3.12-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.3.12-.cxx deleted file mode 100644 index 79ef56f1660..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.3.12-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_matrix_fixed_ref.hxx" -VNL_MATRIX_FIXED_REF_INSTANTIATE(double, 3, 12); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.4.3-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.4.3-.cxx deleted file mode 100644 index d8c1284d260..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_matrix_fixed_ref+double.4.3-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/vnl_matrix_fixed_ref.hxx" -VNL_MATRIX_FIXED_REF_INSTANTIATE(double, 4, 3); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.2.3-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.2.3-.cxx deleted file mode 100644 index 02f0747c84e..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.2.3-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/algo/vnl_svd_fixed.hxx" -VNL_SVD_FIXED_INSTANTIATE(double, 2, 3); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.3.2-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.3.2-.cxx deleted file mode 100644 index 1e218ed21d3..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+double.3.2-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/algo/vnl_svd_fixed.hxx" -VNL_SVD_FIXED_INSTANTIATE(double, 3, 2); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.2.3-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.2.3-.cxx deleted file mode 100644 index 5545a89f535..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.2.3-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/algo/vnl_svd_fixed.hxx" -VNL_SVD_FIXED_INSTANTIATE(float, 2, 3); diff --git a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.3.2-.cxx b/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.3.2-.cxx deleted file mode 100644 index 266fef6c414..00000000000 --- a/Modules/ThirdParty/VNLInstantiation/src/vnl_svd_fixed+float.3.2-.cxx +++ /dev/null @@ -1,19 +0,0 @@ -/*========================================================================= - * - * Copyright Insight Software Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ -#include "vnl/algo/vnl_svd_fixed.hxx" -VNL_SVD_FIXED_INSTANTIATE(float, 3, 2);