X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FrtkXRadImageIO.cxx;h=fb02952016ed37ce421de70ea8dd312694974167;hb=d55f025b18f68066a52b8f33c2dc6481e82c2580;hp=f7903569e43ec8139a001190ea2c5ca7d92e4a4e;hpb=bf4b9657cd6577fe1276b9d3f5fc9f40dbb4d13c;p=clitk.git

diff --git a/common/rtkXRadImageIO.cxx b/common/rtkXRadImageIO.cxx
index f790356..fb02952 100644
--- a/common/rtkXRadImageIO.cxx
+++ b/common/rtkXRadImageIO.cxx
@@ -32,18 +32,18 @@ void rtk::XRadImageIO::ReadImageInformation()
     itkExceptionMacro(<<"Could not open file " << m_FileName);
 
   SetNumberOfDimensions(3);
+  std::string section="";
   while(!is.eof())
     {
     std::string line;
-    std::string section;
     std::getline(is, line);
-    if(line.find('[')!=std::string::npos)
+    if(line.find('[') != std::string::npos)
       {
       unsigned int pos1 = line.find('[');
       unsigned int pos2 = line.find(']');
       section = line.substr(pos1+1, pos2-pos1-1);
       }
-    if(line.find('=')!=std::string::npos)
+    if(line.find('=') != std::string::npos)
       {
       unsigned int pos       = line.find('=');
       std::string paramName  = line.substr(0,pos);
@@ -57,24 +57,24 @@ void rtk::XRadImageIO::ReadImageInformation()
         SetDimensions(2, atoi(paramValue.c_str()));
       else if(paramName == std::string("CBCT.DimensionalAttributes.DataSize"))
         {
-        if(atoi(paramValue.c_str())!=3)
-          {
-          itkExceptionMacro(<<"Was expecting CBCT.DimensionalAttributes.DataSize==3");
-          }
+        if(atoi(paramValue.c_str()) == 3)
+          SetComponentType(itk::ImageIOBase::FLOAT);
+        if(atoi(paramValue.c_str()) == 6)
+          SetComponentType(itk::ImageIOBase::USHORT);
         }
       else if(paramName == std::string("CBCT.DimensionalAttributes.PixelDimension_I_cm"))
         {
-        double spacing = 0.1*atof(paramValue.c_str());
+        double spacing = 10*atof(paramValue.c_str());
         SetSpacing(0, (spacing==0.)?1.:spacing);
         }
       else if(paramName == std::string("CBCT.DimensionalAttributes.PixelDimension_J_cm"))
         {
-        double spacing = 0.1*atof(paramValue.c_str());
+        double spacing = 10*atof(paramValue.c_str());
         SetSpacing(1, (spacing==0.)?1.:spacing);
         }
       else if(paramName == std::string("CBCT.DimensionalAttributes.PixelDimension_K_cm"))
         {
-        double spacing = 0.1*atof(paramValue.c_str());
+        double spacing = 10*atof(paramValue.c_str());
         SetSpacing(2, (spacing==0.)?1.:spacing);
         }
       else
@@ -87,7 +87,6 @@ void rtk::XRadImageIO::ReadImageInformation()
       }
 
     }
-  SetComponentType(itk::ImageIOBase::FLOAT);
 } ////
 
 //--------------------------------------------------------------------
@@ -144,19 +143,19 @@ void rtk::XRadImageIO::Read(void * buffer)
 
 //--------------------------------------------------------------------
 // Write Image Information
-void rtk::XRadImageIO::WriteImageInformation(bool keepOfStream)
+void rtk::XRadImageIO::WriteImageInformation(bool itkNotUsed(keepOfStream))
 {
 }
 
 //--------------------------------------------------------------------
 // Write Image Information
-bool rtk::XRadImageIO::CanWriteFile(const char* FileNameToWrite)
+bool rtk::XRadImageIO::CanWriteFile(const char* itkNotUsed(FileNameToWrite))
 {
   return false;
 }
 
 //--------------------------------------------------------------------
 // Write Image
-void rtk::XRadImageIO::Write(const void * buffer)
+void rtk::XRadImageIO::Write(const void * itkNotUsed(buffer))
 {
 } ////