X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.cxx;h=4acf845f0f04b459068ec8b8837c4a4cf696983c;hb=a48bf3d21a4f9a6b54792b965878c7f69c2099f4;hp=397562063e7a7c94204577351ef4ba741dd74f95;hpb=6bbabb32cba07ce95376c2cdcb804ee97050d453;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 3975620..4acf845 100644
--- a/packages/itk/src/bbitkImageProperties.cxx
+++ b/packages/itk/src/bbitkImageProperties.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/19 09:46:44 $
-  Version:   $Revision: 1.4 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2009/07/23 12:27:35 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief 
@@ -32,7 +45,20 @@ namespace bbitk
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageProperties);
 
-
+	//-----------------------------------------------------------------	
+	void ImageProperties::bbUserSetDefaultValues()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void ImageProperties::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void ImageProperties::bbUserFinalizeProcessing()
+	{
+	}
 
 
   void ImageProperties::DoIt()
@@ -53,7 +79,7 @@ namespace bbitk
 			<<">()"<<std::endl);
 
 
-	itkImageType* im = bbGetInputIn().get<itkImageType*>();
+    itkImageType* im = bbGetInputIn().get<itkImageType*>();
     unsigned int dim = im->GetImageDimension();
 
     bbSetOutputTypeName(bbtk::TypeName<typename itkImageType::PixelType>());
@@ -63,17 +89,30 @@ 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]);
+    
+    // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
+    if (dim<3) 
+       vsz.push_back(1);
+    
     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]);
+       
+    // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
+    if (dim<3) 
+       vsp.push_back(1);    
+     
     bbSetOutputSpacing(vsp);
 
     bbtkDebugDecTab("Core",9);
@@ -81,9 +120,6 @@ namespace bbitk
 
 
 
-
-
-
 }
 // eo namespace bbtk