From: Esteban Correa <esteban@maurosc3ner.fedora>
Date: Tue, 16 Apr 2013 13:15:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=285ee5f1317074a4daec697ce27c9c53fdbf0793;hp=-c;p=bbtk.git

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk

Conflicts:
	packages/itk/src/bbitkImageProperties.h
---

285ee5f1317074a4daec697ce27c9c53fdbf0793
diff --combined packages/itk/src/bbitkImageProperties.cxx
index 2304ba8,8004f5c..7e5f47d
--- a/packages/itk/src/bbitkImageProperties.cxx
+++ b/packages/itk/src/bbitkImageProperties.cxx
@@@ -104,22 -104,11 +104,22 @@@ namespace bbit
     if (dim==2)
          vsz.push_back(1);
      bbSetOutputSize(vsz);
 +    
 +    const typename itkImageType::PointType& orgn = im->GetOrigin();
 +    std::vector<float> vog;
 +    for (unsigned int i=0;i<dim;++i) 
 +       vog.push_back(orgn[i]);
 +       
 + // brute hack to avoid failure of most black boxes that expects 3D images. // EC
 +    if (dim==2)
 +       vog.push_back(1.0);
 +  
 +    bbSetOutputOrigin(vog);
  
      typename itkImageType::SpacingType sp = im->GetSpacing();
-     std::vector<float> vsp;
+     std::vector<double> vsp;
      for (unsigned int i=0;i<dim;++i) 
-        vsp.push_back(sp[i]);
+        vsp.push_back(double(sp[i]));
         
   // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
      if (dim==2)
diff --combined packages/itk/src/bbitkImageProperties.h
index 4149e44,5782da9..f1bf25b
--- a/packages/itk/src/bbitkImageProperties.h
+++ b/packages/itk/src/bbitkImageProperties.h
@@@ -69,8 -69,7 +69,9 @@@ namespace bbit
      BBTK_DECLARE_OUTPUT(LargestPossibleRegion,anyImageRegion);
      BBTK_DECLARE_OUTPUT(Index,std::vector<int>);
      BBTK_DECLARE_OUTPUT(Size,std::vector<int>);
 +    BBTK_DECLARE_OUTPUT(Origin,std::vector<float>);
-     BBTK_DECLARE_OUTPUT(Spacing,std::vector<float>);
+     BBTK_DECLARE_OUTPUT(Spacing,std::vector<double>);
++
  	BBTK_DECLARE_OUTPUT(MinMax,std::vector<float>);
      BBTK_PROCESS(DoIt);
      void DoIt();
@@@ -92,10 -91,9 +93,10 @@@
    BBTK_OUTPUT(ImageProperties,TypeName,"Pixel type name",std::string,"pixel type");
    BBTK_OUTPUT(ImageProperties,Dimension,"Dimension",unsigned int,"image dimension");
    BBTK_OUTPUT(ImageProperties,LargestPossibleRegion,"Global extent of the image",anyImageRegion,"");
 -  BBTK_OUTPUT(ImageProperties,Index,"Origin of the image",std::vector<int>,"image index");
 +  BBTK_OUTPUT(ImageProperties,Index,"Index of the image",std::vector<int>,"image index");
    BBTK_OUTPUT(ImageProperties,Size,"Size in each dimension",std::vector<int>,"image size");
 +  BBTK_OUTPUT(ImageProperties,Origin,"Origin of the image",std::vector<float>,"image origin");
-   BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector<float>,"voxel size");
+   BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector<double>,"voxel size");
    BBTK_OUTPUT(ImageProperties,MinMax,"Minimum and the maximum intensity values of an image",std::vector<float>,"");
    BBTK_END_DESCRIBE_BLACK_BOX(ImageProperties);
    //=================================================================