From: Leonardo Florez Date: Sun, 10 Apr 2016 04:08:49 +0000 (-0500) Subject: ... X-Git-Tag: v0.1~198 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=96e980b8c0d2829d7c266313228d573c42f7b360;p=cpPlugins.git ... --- diff --git a/lib/cpPlugins_Instances/BaseObjects.i b/lib/cpPlugins_Instances/BaseObjects.i index fb7b4d4..b2df0db 100644 --- a/lib/cpPlugins_Instances/BaseObjects.i +++ b/lib/cpPlugins_Instances/BaseObjects.i @@ -8,6 +8,7 @@ d #pixels=#ints;#uints;#floats t itk#itk_objs.h t itkArray.h t itkArray2D.h +t itkBoundingBox.h t itkSymmetricEigenAnalysis.h t itkSimpleDataObjectDecorator.h t itkVariableLengthVector.h @@ -23,5 +24,6 @@ c itk::Matrix< #floats, #dims, #dims > c itk::SimpleDataObjectDecorator< itk::@{CovariantVector;Point;Vector}< #floats, #dims > > c itk::SimpleDataObjectDecorator< itk::Matrix< #floats, #dims, #dims > > c itk::VectorContainer< unsigned long, itk::Point< #floats, #dims > > +c itk::BoundingBox< unsigned long, #dims, #floats, itk::VectorContainer< unsigned long, itk::Point< #floats, #dims > > > * eof - $RCSfile$ diff --git a/lib/cpPlugins_Instances/BaseObjects_extra.cxx b/lib/cpPlugins_Instances/BaseObjects_extra.cxx index aeaaaad..7b81bc7 100644 --- a/lib/cpPlugins_Instances/BaseObjects_extra.cxx +++ b/lib/cpPlugins_Instances/BaseObjects_extra.cxx @@ -1,23 +1,22 @@ #include #include -/* - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include -*/ +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + // ------------------------------------------------------------------------- -/* TODO - #define cpPlugins_Instances_BaseObjects_extra_SimpleArray( V, D ) \ +#define cpPlugins_Instances_BaseObjects_extra_SimpleArray( V, D ) \ template cpPlugins_Instances_BaseObjects_EXPORT \ std::ostream& itk::operator<< < D >( \ std::ostream& a, V< D > const& b \ @@ -27,7 +26,6 @@ cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 2 ); cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 3 ); cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 4 ); -*/ // ------------------------------------------------------------------------- #define cpPlugins_Instances_BaseObjects_extra_Array( V, T, D ) \ diff --git a/plugins/cpPluginsIO/CMakeLists.txt b/plugins/cpPluginsIO/CMakeLists.txt index ef17bd0..6d46d03 100644 --- a/plugins/cpPluginsIO/CMakeLists.txt +++ b/plugins/cpPluginsIO/CMakeLists.txt @@ -37,6 +37,7 @@ SET( SET( target_LIBRARIES + cpPlugins ${cpPlugins_LIBRARIES} ) diff --git a/plugins/cpPluginsImageFilters/CMakeLists.txt b/plugins/cpPluginsImageFilters/CMakeLists.txt index 9cabb8d..029f273 100644 --- a/plugins/cpPluginsImageFilters/CMakeLists.txt +++ b/plugins/cpPluginsImageFilters/CMakeLists.txt @@ -32,6 +32,7 @@ SET( SET( target_LIBRARIES + cpPlugins ${cpPlugins_LIBRARIES} ) diff --git a/plugins/cpPluginsImageMeshFilters/CMakeLists.txt b/plugins/cpPluginsImageMeshFilters/CMakeLists.txt index 2d7a8ef..af1b476 100644 --- a/plugins/cpPluginsImageMeshFilters/CMakeLists.txt +++ b/plugins/cpPluginsImageMeshFilters/CMakeLists.txt @@ -33,6 +33,7 @@ SET( SET( target_LIBRARIES cpExtensions + cpPlugins ${cpPlugins_LIBRARIES} ) diff --git a/plugins/cpPluginsMeshFilters/CMakeLists.txt b/plugins/cpPluginsMeshFilters/CMakeLists.txt index 7c87e89..3692c0f 100644 --- a/plugins/cpPluginsMeshFilters/CMakeLists.txt +++ b/plugins/cpPluginsMeshFilters/CMakeLists.txt @@ -33,6 +33,7 @@ SET( SET( target_LIBRARIES cpExtensions + cpPlugins ${cpPlugins_LIBRARIES} ) diff --git a/plugins/cpPluginsWidgets/CMakeLists.txt b/plugins/cpPluginsWidgets/CMakeLists.txt index 8c05b8b..330ffe6 100644 --- a/plugins/cpPluginsWidgets/CMakeLists.txt +++ b/plugins/cpPluginsWidgets/CMakeLists.txt @@ -33,6 +33,7 @@ SET( SET( target_LIBRARIES cpExtensions + cpPlugins ${cpPlugins_LIBRARIES} )