...

[cpPlugins.git] / plugins / ITKImageGenericFilters_1 / RegionOfInterestImageFilter.cxx

diff --git a/plugins/ITKImageGenericFilters_1/RegionOfInterestImageFilter.cxx b/plugins/ITKImageGenericFilters_1/RegionOfInterestImageFilter.cxx
index 9254bf4d83aa5a0c7f461938bf106b0e88aa71dd..52ec23bfcc22aa6daaa724ddb56ec053ea5914b0 100644 (file)
--- a/plugins/ITKImageGenericFilters_1/RegionOfInterestImageFilter.cxx
+++ b/plugins/ITKImageGenericFilters_1/RegionOfInterestImageFilter.cxx
@@ -1,7 +1,7 @@
 #include <ITKImageGenericFilters_1/RegionOfInterestImageFilter.h>
-#include <cpInstances/Image.h>
-#include <cpInstances/BoundingBox.h>
-#include <cpInstances/Image_Demanglers.h>
+#include <cpInstances/DataObjects/Image.h>
+#include <cpInstances/DataObjects/BoundingBox.h>
+#include <cpInstances/DataObjects/Image_Demanglers.h>
 
 #include <itkRGBPixel.h>
 #include <itkRGBAPixel.h>
@@ -12,8 +12,8 @@ cpPluginsITKImageGenericFilters_1::RegionOfInterestImageFilter::
 RegionOfInterestImageFilter( )
   : Superclass( )
 {
-  typedef cpInstances::Image _TImage;
-  typedef cpInstances::BoundingBox _TBBox;
+  typedef cpInstances::DataObjects::Image _TImage;
+  typedef cpInstances::DataObjects::BoundingBox _TBBox;
   this->_ConfigureInput< _TImage >( "Input", true, false );
   this->_ConfigureInput< _TBBox >( "BoundingBox", true, false );
   this->_ConfigureOutput< _TImage >( "Output" );
@@ -39,7 +39,7 @@ template< class _TImage >
 void cpPluginsITKImageGenericFilters_1::RegionOfInterestImageFilter::
 _GD0( _TImage* input )
 {
-  typedef cpInstances::BoundingBox _TBBox;
+  typedef cpInstances::DataObjects::BoundingBox _TBBox;
   typedef itk::RegionOfInterestImageFilter< _TImage, _TImage > _TFilter;
   typedef typename _TImage::IndexType  _TIndex;
   typedef typename _TImage::PointType  _TPoint;
@@ -48,13 +48,22 @@ _GD0( _TImage* input )
 
   auto bb = this->GetInput< _TBBox >( "BoundingBox" );
 
+  _TRegion in_region = input->GetRequestedRegion( );
+  _TIndex in_i0 = in_region.GetIndex( );
+  _TIndex in_i1 = in_i0 + in_region.GetSize( );
   _TIndex i0, i1;
   input->TransformPhysicalPointToIndex( bb->GetMinimum< _TPoint >( ), i0 );
   input->TransformPhysicalPointToIndex( bb->GetMaximum< _TPoint >( ), i1 );
+  for( unsigned int d = 0; d < _TImage::ImageDimension; ++d )
+  {
+    if( i0[ d ] < in_i0[ d ] ) i0[ d ] = in_i0[ d ];
+    if( i1[ d ] > in_i1[ d ] ) i1[ d ] = in_i1[ d ];
+
+  } // rof
 
   _TSize size;
   for( unsigned int d = 0; d < _TImage::ImageDimension; ++d )
-    size[ d ] = i1[ d ] - i0[ d ] + 1;
+    size[ d ] = i1[ d ] - i0[ d ];
 
   _TRegion region;
   region.SetIndex( i0 );