From 8384566019af2b9625646827e4de339869352c43 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Wed, 4 Jan 2012 16:47:51 +0100 Subject: [PATCH] Provide ADD_DEFAULT_VEC_IMAGE_TYPES for generic VF filters --- common/clitkImageToImageGenericFilterBase.h | 3 +++ tools/clitkCatImageGenericFilter.txx | 4 +--- tools/clitkVFResampleGenericFilter.cxx | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/clitkImageToImageGenericFilterBase.h b/common/clitkImageToImageGenericFilterBase.h index 03b4f4a..3a568c6 100644 --- a/common/clitkImageToImageGenericFilterBase.h +++ b/common/clitkImageToImageGenericFilterBase.h @@ -137,6 +137,9 @@ namespace clitk { ADD_IMAGE_TYPE(DIM, int); \ ADD_IMAGE_TYPE(DIM, float); \ ADD_IMAGE_TYPE(DIM, double); +#define ADD_DEFAULT_VEC_IMAGE_TYPES ADD_VEC_IMAGE_TYPE(2,2,float); \ + ADD_VEC_IMAGE_TYPE(2,3,float); \ + ADD_VEC_IMAGE_TYPE(3,3,float); //#include "clitkImageToImageGenericFilterBase.txx" diff --git a/tools/clitkCatImageGenericFilter.txx b/tools/clitkCatImageGenericFilter.txx index 0355bff..f8f81f9 100644 --- a/tools/clitkCatImageGenericFilter.txx +++ b/tools/clitkCatImageGenericFilter.txx @@ -43,9 +43,7 @@ template void CatImageGenericFilter::InitializeImageType() { ADD_DEFAULT_IMAGE_TYPES(Dim); - ADD_VEC_IMAGE_TYPE(2,2,float); - ADD_VEC_IMAGE_TYPE(2,3,float); - ADD_VEC_IMAGE_TYPE(3,3,float); + ADD_DEFAULT_VEC_IMAGE_TYPES; } //-------------------------------------------------------------------- diff --git a/tools/clitkVFResampleGenericFilter.cxx b/tools/clitkVFResampleGenericFilter.cxx index 1339c89..4175215 100644 --- a/tools/clitkVFResampleGenericFilter.cxx +++ b/tools/clitkVFResampleGenericFilter.cxx @@ -41,7 +41,7 @@ void clitk::VFResampleGenericFilter::InitializeImageType() { //typedef itk::Vector v3f; //ADD_IMAGE_TYPE(Dim, v3f); - ADD_VEC_IMAGE_TYPE(Dim, Dim, float) + ADD_DEFAULT_VEC_IMAGE_TYPES } //-------------------------------------------------------------------- -- 2.46.1