Set GDCM2 library as available DICOM Reader

[creaImageIO.git] / src2 / creaImageIOUltrasonixImageReader.cpp

diff --git a/src2/creaImageIOUltrasonixImageReader.cpp b/src2/creaImageIOUltrasonixImageReader.cpp
index 3d9093c932a9dc36223f2423f5268accda4f27e9..dde3e4f2655db5867c10d037db6b6ec37ab7f01c 100644 (file)
--- a/src2/creaImageIOUltrasonixImageReader.cpp
+++ b/src2/creaImageIOUltrasonixImageReader.cpp
@@ -3,7 +3,6 @@
 #include "creaImageIOUltrasonixImageReader.h"
 #include <creaVtk.h>
 #include <boost/filesystem/path.hpp>
-
 namespace creaImageIO
 {
 #define HEADER_SIZE    19
@@ -146,7 +145,7 @@ namespace creaImageIO
 
                fclose(Ultrasonix_file);  
 
-               im = crea::NewVtkImageDataFromRaw( dataB8, h.width, h.height, h.frame);
+       im = crea::NewVtkImageDataFromRaw( dataB8, h.width, h.height, h.frame);
        break;
 
        case TYPE_B32:
@@ -164,7 +163,7 @@ namespace creaImageIO
 
                fclose(Ultrasonix_file);  
 
-               im = crea::NewVtkImageDataFromRaw( dataB32, h.width, h.height, h.frame);
+       im = crea::NewVtkImageDataFromRaw( dataB32, h.width, h.height, h.frame);
        break;
     }
 
@@ -172,7 +171,7 @@ namespace creaImageIO
 }
   //=====================================================================
   
- 
+
   //=====================================================================
   void UltrasonixImageReader::PushBackExtensions(std::vector<std::string>& v)
   {
@@ -183,7 +182,7 @@ namespace creaImageIO
 
 
   //=====================================================================
- vold UltrasonixImageReader::ReadAttributes(const std::string& filename, 
+ void UltrasonixImageReader::ReadAttributes(const std::string& filename, 
                                      std::map<std::string,std::string>& attr)
  {
     GimmickMessage(2,"Reading attributes from '" << filename << std::endl);
@@ -194,7 +193,7 @@ namespace creaImageIO
        std::cout << "cannot open RF file [" << filename << "]" << std::endl;
        return;
     }
-       
+
     Ultrasonix_header h;
     if (!ReadHeader(Ultrasonix_file, h)) 
     {
@@ -202,7 +201,7 @@ namespace creaImageIO
         std::cout << "cannot read Ultrasonix Attributes for RF file [" << filename << "]" << std::endl;  
        return;
     }
-   
+
     fclose(Ultrasonix_file);  
   
     // Columns
@@ -225,33 +224,33 @@ namespace creaImageIO
     std::map<std::string,std::string>::iterator i;
     if ( (i = attr.find("FullFileName")) != attr.end())
     {
-       i->second = filename;
+          i->second = filename;
     }
     if ( (i = attr.find("D0004_1500")) != attr.end())
     {
-       boost::filesystem::path full_path(filename);
-       std::string f = full_path.leaf();
-       i->second = f;
+          boost::filesystem::path full_path(filename);
+          std::string f = full_path.leaf();
+          i->second = f;
     }
     if ( (i = attr.find("D0028_0010")) != attr.end())
     {
-       i->second = rows;
+          i->second = rows;
     }
     if ( (i = attr.find("D0028_0011")) != attr.end())
     {
-       i->second = cols;
+          i->second = cols;
     }
     if ( (i = attr.find("D0028_0012")) != attr.end())
     {
-       i->second = planes;
+          i->second = planes;
     }
     if ( (i = attr.find("D003a_001a")) != attr.end())
     {
-       i->second = samplingFrequency;
+       i->second = samplingFrequency;
     }
     if ( (i = attr.find("D0018_6030")) != attr.end())
     {
-       i->second = transducerFrequency;
+          i->second = transducerFrequency;
     }
     
     GimmickMessage(2,"Attributes map:"<<std::endl<<attr<<std::endl);