From 621819a771d434be46e3f33c5f76edd1cc7df249 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 23 Jul 2008 12:02:15 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkVtkBlackBoxMacros.h | 6 +++--- packages/itk/src/bbitkImage.h | 2 ++ packages/itk/src/bbitkImageProperties.cxx | 10 +++++----- packages/itk/src/bbitkImageProperties.h | 7 ++++--- packages/itk/src/bbitkImageReader.h | 6 +++--- packages/itk/src/bbitkImageSeriesReader.h | 7 ++++--- packages/itk/src/bbitkImageWriter.h | 6 +++--- packages/itk/src/bbitkResampleImageFilter.h | 20 +++++++++---------- .../src/bbitkvtkitkImage2vtkImageData.h | 6 +++--- .../src/bbitkvtkvtkImageData2itkImage.h | 6 +++--- packages/std/src/bbstdExecBbiCommand.cxx | 2 +- 11 files changed, 41 insertions(+), 37 deletions(-) diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h index 560e304..4a16b6e 100644 --- a/kernel/src/bbtkVtkBlackBoxMacros.h +++ b/kernel/src/bbtkVtkBlackBoxMacros.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkVtkBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2008/05/09 10:39:46 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/07/23 12:02:15 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -40,7 +40,7 @@ vtkParent::Delete(); \ } -// bbmDescriptorPointer.reset(); \ +// bbmDescriptorPointer.reset(); #define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKPARENT) \ BBTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX); \ diff --git a/packages/itk/src/bbitkImage.h b/packages/itk/src/bbitkImage.h index 88eea1a..7ff65a1 100644 --- a/packages/itk/src/bbitkImage.h +++ b/packages/itk/src/bbitkImage.h @@ -344,7 +344,9 @@ namespace bbitk else { //bbtkGlobalError("GetImageTypeInfoFromPixelTypeInfo : itk::Images not compiled for dim "< vind; - for (int i=0;i vsz; - for (int i=0;iGetSpacing(); std::vector vsp; - for (int i=0;iGetLargestPossibleRegion(); size = LPR.GetSize(); // origin = LPR.GetIndex(); //in->GetOrigin(); - for (int i=0;iGetSpacing()[i]; spacing[i] = bbGetInputSpacing()[i]; @@ -108,14 +108,8 @@ namespace bbitk filter->SetTransform ( transform ); - // Interpolation - if ( bbGetInputInterpolation() == "Linear" ) { - typedef itk::LinearInterpolateImageFunction < ImageType, double > InterpolatorType; - // We create an interpolator of the found type - typename InterpolatorType::Pointer interpolator = InterpolatorType::New(); - filter->SetInterpolator( interpolator ); - } - else if ( bbGetInputInterpolation() == "NearestNeighbor" ) { + + if ( bbGetInputInterpolation() == "NearestNeighbor" ) { typedef itk::NearestNeighborInterpolateImageFunction < ImageType, double > InterpolatorType; // We create an interpolator of the found type typename InterpolatorType::Pointer interpolator = InterpolatorType::New(); @@ -133,7 +127,13 @@ namespace bbitk // std::cout << "Warning! you're using unsigned data ! The interpolated value may result negative! "<< std::endl; // } } //end else if - + // Interpolation + else { // if ( bbGetInputInterpolation() == "Linear" ) { + typedef itk::LinearInterpolateImageFunction < ImageType, double > InterpolatorType; + // We create an interpolator of the found type + typename InterpolatorType::Pointer interpolator = InterpolatorType::New(); + filter->SetInterpolator( interpolator ); + } filter->Update(); filter->GetOutput()->Register(); diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h index b683f88..a5aba88 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.h,v $ Language: C++ - Date: $Date: 2008/05/14 07:01:00 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/07/23 12:02:15 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -14,7 +14,7 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. -=========================================================================*//** +=========================================================================*/ /** * \file * \brief class itkImage2vtkImageData : converts a generic itkImage to a vtkImageData diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h index 7eb37d0..1ee762b 100644 --- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h +++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkvtkImageData2itkImage.h,v $ Language: C++ - Date: $Date: 2008/05/14 07:01:00 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/07/23 12:02:15 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -14,7 +14,7 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. -=========================================================================*//** +=========================================================================*/ /** * \file * \brief class vtkImageData2itkImage : Converts a vtkImageData to a generic itkImage diff --git a/packages/std/src/bbstdExecBbiCommand.cxx b/packages/std/src/bbstdExecBbiCommand.cxx index ba7957c..903ea5d 100755 --- a/packages/std/src/bbstdExecBbiCommand.cxx +++ b/packages/std/src/bbstdExecBbiCommand.cxx @@ -39,7 +39,7 @@ namespace bbstd delete_inter = true; } - int i; + unsigned int i; bool ok=true; int pos1=0,pos2; -- 2.45.0