Skip to content

Commit

Permalink
Merge topic 'TranslationTransform1D'
Browse files Browse the repository at this point in the history
7dfe669 COMP: Support instantiation of a 1D TranslationTransform
  • Loading branch information
thewtex authored and kwrobot committed Sep 5, 2018
2 parents b2f5227 + 7dfe669 commit 8d74aad
Show file tree
Hide file tree
Showing 11 changed files with 244 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Modules/Core/Transform/test/itkTranslationTransformTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,9 @@ int itkTranslationTransformTest(int ,char *[] )
std::cout << "Back transform a vector :" << std::endl
<< v4[0] << " , " << v4[1] << std::endl;

using TranslationTransform1DType = itk::TranslationTransform< double, 1 >;
auto translationTransform1D = TranslationTransform1DType::New();
std::cout << "Translation Transform 1D: " << translationTransform1D << std::endl;

return any;
}
10 changes: 9 additions & 1 deletion Modules/ThirdParty/VNLInstantiation/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ set(ITKVNLInstantiation_SRCS
vnl_matrix_fixed+double.2.3-.cxx
vnl_matrix_fixed+double.10.10-.cxx
vnl_matrix_fixed+float.10.10-.cxx
vnl_matrix_fixed+float.1.1-.cxx
vnl_matrix_fixed+double.1.1-.cxx
vnl_c_vector+char-.cxx
vnl_c_vector+short-.cxx
vnl_matrix+short-.cxx
Expand All @@ -27,27 +29,33 @@ set(ITKVNLInstantiation_SRCS
vnl_c_vector+longlong-.cxx
vnl_vector+short-.cxx
vnl_matrix+ushort-.cxx
vnl_svd_fixed+double.1.1-.cxx
vnl_svd_fixed+double.2.2-.cxx
vnl_svd_fixed+double.2.3-.cxx
vnl_svd_fixed+double.3.2-.cxx
vnl_svd_fixed+double.4.4-.cxx
vnl_svd_fixed+double.10.10-.cxx
vnl_svd_fixed+float.1.1-.cxx
vnl_svd_fixed+float.2.2-.cxx
vnl_svd_fixed+float.2.3-.cxx
vnl_svd_fixed+float.4.4-.cxx
vnl_svd_fixed+float.10.10-.cxx
vnl_fortran_copy_fixed+double.1.1-.cxx
vnl_fortran_copy_fixed+double.2.2-.cxx
vnl_fortran_copy_fixed+double.2.3-.cxx
vnl_fortran_copy_fixed+double.3.2-.cxx
vnl_fortran_copy_fixed+double.4.4-.cxx
vnl_fortran_copy_fixed+double.10.10-.cxx
vnl_fortran_copy_fixed+float.4.4-.cxx
vnl_fortran_copy_fixed+float.1.1-.cxx
vnl_fortran_copy_fixed+float.2.2-.cxx
vnl_fortran_copy_fixed+float.2.3-.cxx
vnl_fortran_copy_fixed+float.3.2-.cxx
vnl_fortran_copy_fixed+float.4.4-.cxx
vnl_fortran_copy_fixed+float.10.10-.cxx
vnl_diag_matrix_fixed+double.1-.cxx
vnl_diag_matrix_fixed+double.2-.cxx
vnl_diag_matrix_fixed+double.10-.cxx
vnl_diag_matrix_fixed+float.1-.cxx
vnl_diag_matrix_fixed+float.2-.cxx
vnl_diag_matrix_fixed+float.10-.cxx
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_diag_matrix_fixed.txx"
#else
#include "vnl/vnl_diag_matrix_fixed.hxx"
#endif
#include "vnl_export_override.h"
VNL_DIAG_MATRIX_FIXED_INSTANTIATE(double, 1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_diag_matrix_fixed.txx"
#else
#include "vnl/vnl_diag_matrix_fixed.hxx"
#endif
#include "vnl_export_override.h"
VNL_DIAG_MATRIX_FIXED_INSTANTIATE(float, 1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_fortran_copy_fixed.txx"
#else
#include "vnl/vnl_fortran_copy_fixed.hxx"
#endif
#include "vnl_export_override.h"
VNL_FORTRAN_COPY_FIXED_INSTANTIATE(double, 1, 1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_fortran_copy_fixed.txx"
#else
#include "vnl/vnl_fortran_copy_fixed.hxx"
#endif
#include "vnl_export_override.h"
VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float, 1, 1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_fortran_copy_fixed.txx"
#else
#include "vnl/vnl_fortran_copy_fixed.hxx"
#endif
#include "vnl_export_override.h"
VNL_FORTRAN_COPY_FIXED_INSTANTIATE(float, 3, 2);
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_matrix_fixed.txx"
#include "vnl/vnl_matlab_print.txx"
#else
#include "vnl/vnl_matrix_fixed.hxx"
#include "vnl/vnl_matlab_print.hxx"
#endif
#include "vnl_export_override.h"
VNL_MATRIX_FIXED_INSTANTIATE(double, 1, 1);
template VNL_EXPORT std::ostream &vnl_matlab_print(std::ostream &, vnl_matrix_fixed<double,1,1> const&, char const*, vnl_matlab_print_format);
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/vnl_matrix_fixed.txx"
#include "vnl/vnl_matlab_print.txx"
#else
#include "vnl/vnl_matrix_fixed.hxx"
#include "vnl/vnl_matlab_print.hxx"
#endif
#include "vnl_export_override.h"
VNL_MATRIX_FIXED_INSTANTIATE(float, 1, 1);
template VNL_EXPORT std::ostream &vnl_matlab_print(std::ostream &, vnl_matrix_fixed<float,1,1> const&, char const*, vnl_matlab_print_format);
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/algo/vnl_svd_fixed.txx"
#else
#include "vnl/algo/vnl_svd_fixed.hxx"
#endif
#include "vnl_algo_export_override.h"
VNL_SVD_FIXED_INSTANTIATE(double, 1, 1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*=========================================================================
*
* 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 <vxl_version.h>
#if VXL_VERSION_DATE_FULL < 20160229
#include "vnl/algo/vnl_svd_fixed.txx"
#else
#include "vnl/algo/vnl_svd_fixed.hxx"
#endif
#include "vnl_algo_export_override.h"
VNL_SVD_FIXED_INSTANTIATE(float, 1, 1);

0 comments on commit 8d74aad

Please sign in to comment.