*** empty log message ***

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 560e304..4a16b6e 100644 (file)
--- 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 (file)
--- 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 "<<dim);
+       return typeid(void);
       }
+    return typeid(void);
   }
 
 

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 3975620..a10ed0f 100644 (file)
--- a/packages/itk/src/bbitkImageProperties.cxx
+++ b/packages/itk/src/bbitkImageProperties.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/19 09:46:44 $
-  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
@@ -63,17 +63,17 @@ namespace bbitk
 
     const typename itkImageType::IndexType& ind = r.GetIndex();
     std::vector<int> vind;
-    for (int i=0;i<dim;++i) vind.push_back(ind[i]);
+    for (unsigned int i=0;i<dim;++i) vind.push_back(ind[i]);
     bbSetOutputIndex(vind);
 
     const typename itkImageType::SizeType& sz = r.GetSize();
     std::vector<int> vsz;
-    for (int i=0;i<dim;++i) vsz.push_back(sz[i]);
+    for (unsigned int i=0;i<dim;++i) vsz.push_back(sz[i]);
     bbSetOutputSize(vsz);
 
     typename itkImageType::SpacingType sp = im->GetSpacing();
     std::vector<float> vsp;
-    for (int i=0;i<dim;++i) vsp.push_back(sp[i]);
+    for (unsigned int i=0;i<dim;++i) vsp.push_back(sp[i]);
     bbSetOutputSpacing(vsp);
 
     bbtkDebugDecTab("Core",9);

diff --git a/packages/itk/src/bbitkImageProperties.h b/packages/itk/src/bbitkImageProperties.h
index 25053b2..09312bf 100644 (file)
--- a/packages/itk/src/bbitkImageProperties.h
+++ b/packages/itk/src/bbitkImageProperties.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:50 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/07/23 12:02:15 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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,8 @@
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
-=========================================================================*//**
+=========================================================================*/
+
 /**
  * \file 
  * \brief class ITKImageProperties : generic ITKImage reader

diff --git a/packages/itk/src/bbitkImageReader.h b/packages/itk/src/bbitkImageReader.h
index 3d9e490..50c9de3 100644 (file)
--- a/packages/itk/src/bbitkImageReader.h
+++ b/packages/itk/src/bbitkImageReader.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageReader.h,v $
   Language:  C++
-  Date:      $Date: 2008/06/26 09:09:47 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/07/23 12:02:15 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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 ITKImageReader : generic ITKImage reader

diff --git a/packages/itk/src/bbitkImageSeriesReader.h b/packages/itk/src/bbitkImageSeriesReader.h
index 0564d56..2a718cf 100644 (file)
--- a/packages/itk/src/bbitkImageSeriesReader.h
+++ b/packages/itk/src/bbitkImageSeriesReader.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageSeriesReader.h,v $
   Language:  C++
-  Date:      $Date: 2008/06/26 07:55:12 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/07/23 12:02:15 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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,8 @@
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
-=========================================================================*//**
+=========================================================================*/
+
 /**
  * \file 
  * \brief class ITKImageSeriesReader : generic ITKImage reader

diff --git a/packages/itk/src/bbitkImageWriter.h b/packages/itk/src/bbitkImageWriter.h
index d5b025f..f886dc2 100644 (file)
--- a/packages/itk/src/bbitkImageWriter.h
+++ b/packages/itk/src/bbitkImageWriter.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageWriter.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:50 $
-  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 ITKImageWriter : generic ITKImage reader

diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h
index 54be167..cabf483 100644 (file)
--- a/packages/itk/src/bbitkResampleImageFilter.h
+++ b/packages/itk/src/bbitkResampleImageFilter.h
@@ -81,7 +81,7 @@ namespace bbitk
     LPR = in->GetLargestPossibleRegion();
     size = LPR.GetSize();
     //    origin = LPR.GetIndex(); //in->GetOrigin();
-     for (int i=0;i<Dimension;++i) 
+     for (unsigned int i=0;i<Dimension;++i) 
       {
        origin[i] = LPR.GetIndex()[i]*in->GetSpacing()[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 (file)
--- 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 (file)
--- 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 (executable)
--- 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;