From 6bb9f03efacd4a16feea0b43acf0d818abac7969 Mon Sep 17 00:00:00 2001 From: Leonardo Florez Date: Sat, 5 Nov 2016 13:58:19 -0500 Subject: [PATCH] ... --- lib/Instances/ImageFiltersBases.i | 3 +++ lib/Instances/ImageNeighborhoodIterators.i | 1 + lib/Instances/Meshes.i | 6 ++++-- plugins/ImageGradientFilters/GulsunTekImageFilter.cxx | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Instances/ImageFiltersBases.i b/lib/Instances/ImageFiltersBases.i index 8b8805d..ba3c732 100644 --- a/lib/Instances/ImageFiltersBases.i +++ b/lib/Instances/ImageFiltersBases.i @@ -2,6 +2,8 @@ header #define ITK_MANUAL_INSTANTIATION define in_scalar_pixels=#scalar_pixels# define out_scalar_pixels=#scalar_pixels# +define in_real_pixels=#real_types# +define out_real_pixels=#real_types# define filters=ImageToImageFilter;InPlaceImageFilter tinclude itkImageSource:h|hxx @@ -23,5 +25,6 @@ instances itk::ImageSource< itk::Image< itk::Offset< #process_dims# >, #process_ instances itk::#filters#< itk::Image< #in_scalar_pixels#, #process_dims# >, itk::Image< #out_scalar_pixels#, #process_dims# > > instances itk::#filters#< itk::Image< itk::#color_pixels#< #in_scalar_pixels# >, #process_dims# >, itk::Image< itk::#color_pixels#< #out_scalar_pixels# >, #process_dims# > > +instances itk::#filters#< itk::Image< itk::#vectors#< #in_real_pixels#, #process_dims# >, #process_dims# >, itk::Image< itk::#vectors#< #out_real_pixels#, #process_dims# >, #process_dims# > > ** eof - $RCSfile$ diff --git a/lib/Instances/ImageNeighborhoodIterators.i b/lib/Instances/ImageNeighborhoodIterators.i index a2e692c..4749004 100644 --- a/lib/Instances/ImageNeighborhoodIterators.i +++ b/lib/Instances/ImageNeighborhoodIterators.i @@ -16,6 +16,7 @@ cinclude itk#diff_tensors#.h cinclude itk#matrices#.h instances itk::Neighborhood< #scalar_pixels#, #process_dims#, itk::NeighborhoodAllocator< #scalar_pixels# > > +instances itk::Neighborhood< #scalar_pixels#*, #process_dims#, itk::NeighborhoodAllocator< #scalar_pixels#* > > instances itk::Neighborhood< std::complex< #real_types# >, #process_dims#, itk::NeighborhoodAllocator< std::complex< #real_types# > > > instances itk::Neighborhood< itk::#color_pixels#< #scalar_pixels# >, #process_dims#, itk::NeighborhoodAllocator< itk::#color_pixels#< #scalar_pixels# > > > instances itk::Neighborhood< itk::#vectors#< #real_types#, #process_dims# >, #process_dims#, itk::NeighborhoodAllocator< itk::#vectors#< #real_types#, #process_dims# > > > diff --git a/lib/Instances/Meshes.i b/lib/Instances/Meshes.i index fd098bd..dd7fc01 100644 --- a/lib/Instances/Meshes.i +++ b/lib/Instances/Meshes.i @@ -6,11 +6,13 @@ tinclude itkMesh:h|hxx tinclude itkPointSet:h|hxx tinclude itk#cells#Cell:h|hxx tinclude itkCellInterface:h|hxx +tinclude itkVectorContainer:h|hxx cinclude itkMapContainer.hxx -cinclude itkVectorContainer.hxx -itk::CellInterface< #real_types#, itk::CellTraitsInfo< #visual_dims#, float, float, unsigned long, unsigned long, unsigned long, itk::Point< float, #visual_dims# >, itk::VectorContainer< unsigned long, itk::Point< float, #visual_dims# > >, std::set< unsigned long, std::less< unsigned long >, std::allocator< unsigned long > > > > +instances itk::VectorContainer< unsigned long, itk::Point< #real_types#, #visual_dims# > > +instances itk::CellInterface< #real_types#, itk::CellTraitsInfo< #visual_dims#, float, float, unsigned long, unsigned long, unsigned long, itk::Point< float, #visual_dims# >, itk::VectorContainer< unsigned long, itk::Point< float, #visual_dims# > >, std::set< unsigned long, std::less< unsigned long >, std::allocator< unsigned long > > > > +instances itk::VectorContainer< unsigned long, itk::CellInterface< #real_types#, itk::CellTraitsInfo< #visual_dims#, float, float, unsigned long, unsigned long, unsigned long, itk::Point< float, #visual_dims# >, itk::VectorContainer< unsigned long, itk::Point< float, #visual_dims# > >, std::set< unsigned long, std::less< unsigned long >, std::allocator< unsigned long > > > >* > instances itk::#cells#Cell< itk::CellInterface< #real_types#, itk::CellTraitsInfo< #visual_dims#, float, float, unsigned long, unsigned long, unsigned long, itk::Point< float, #visual_dims# >, itk::VectorContainer< unsigned long, itk::Point< float, #visual_dims# > >, std::set< unsigned long, std::less< unsigned long >, std::allocator< unsigned long > > > > > diff --git a/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx b/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx index 089b6d5..ccbca7c 100644 --- a/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx +++ b/plugins/ImageGradientFilters/GulsunTekImageFilter.cxx @@ -42,7 +42,7 @@ template< class _TImage > void cpPluginsImageGradientFilters::GulsunTekImageFilter:: _GD0( _TImage* image ) { - typedef itk::Image< bool, _TImage::ImageDimension > _TDummy; + typedef itk::Image< unsigned char, _TImage::ImageDimension > _TDummy; auto o = this->GetInputData( "Mask" ); cpPlugins_Demangle_Image_ScalarPixels_2( o, _GD1, _TImage::ImageDimension, image ) -- 2.45.0