X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIODicomImageReader.cpp;h=9390d1704a55acc790762864ef78eb34b4bcdcbe;hb=a00e6172593c713640aaa9bf1e61db6200231a0f;hp=96d56724d04446da73144a5af94445602c1c06d2;hpb=a67d921cdc10d438852b48c2985f14d91320e016;p=creaImageIO.git

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 96d5672..9390d17 100644
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -1,11 +1,12 @@
 #include <creaImageIODicomImageReader.h>
-#include <gdcmFile.h> 
+
 #include <vtkGdcmReader.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
 #include <creaImageIOTreeAttributeDescriptor.h>
 #include <vtkStringArray.h>
+#include <creaImageIOGimmick.h>
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -30,8 +31,7 @@ namespace creaImageIO
   //=====================================================================  
   bool DicomImageReader::CanRead(const std::string& filename)
   { 
-    
-	GDCM_NAME_SPACE::Document*doc;
+    GDCM_NAME_SPACE::Document*doc;
     GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
     file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
     file->SetFileName(filename.c_str());
@@ -50,7 +50,6 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* DicomImageReader::ReadImage(const std::string& filename)
   {
-    
     vtkImageData* im = 0;
     try
       {
@@ -66,7 +65,7 @@ namespace creaImageIO
       }
     return im;
   }
-  
+
   //=====================================================================
   void DicomImageReader::PushBackExtensions(std::vector<std::string>& v)
   {
@@ -78,43 +77,45 @@ namespace creaImageIO
   //========================================================================
   std::string irclean(const std::string& str)
   {
-    if (str == "GDCM::Unfound") 
-      {
-	return "";
-      }
-    if (str[str.size()-1]==' ')
-      {
-	return str.substr(0,str.size()-1);
-      }
-    if (str[str.size()-1]==0)
-      {
-	return str.substr(0,str.size()-1);
-      }
+	  if(str.size() > 0)
+	  {
+		if (str == "GDCM::Unfound") 
+		  {
+		return "";
+		  }
+		if (str[str.size()-1]==' ')
+		  {
+		return irclean(str.substr(0,str.size()-1));
+		  }
+		if (str[str.size()-1]==0)
+		  {
+		return irclean(str.substr(0,str.size()-1));
+		  }
+	  }
     
     return str;
   }
   //========================================================================
-
+ 
   //=====================================================================
   void DicomImageReader::ReadAttributes(const std::string& filename, 
 		      std::map<std::string,std::string>& attr)
   {
- 
     GimmickMessage(2,"Reading attributes from DICOM file '"
 		   <<filename<<"'"<<std::endl);
-    
-	GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
 
-	GDCM_NAME_SPACE::Document *doc= GDCM_NAME_SPACE::File::New();
-	doc->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
+    //GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
+	boost::shared_ptr<GDCM_NAME_SPACE::File> file(GDCM_NAME_SPACE::File::New(), DicomImageReader::deleter());
+
+    GDCM_NAME_SPACE::Document *doc= GDCM_NAME_SPACE::File::New();
+    doc->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
     doc->SetFileName(filename.c_str());
     doc->Load();
     file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
     file->SetFileName(filename.c_str());
     file->Load();
-    if (file->IsReadable() ||((GDCM_NAME_SPACE::Document*) file)->IsReadable())
+    if (file->IsReadable())// ||((GDCM_NAME_SPACE::Document*) file)->IsReadable())
       {
-	
 	std::map<std::string,std::string>::iterator i;
 	for (i=attr.begin();i!=attr.end();++i)
 	  {
@@ -136,20 +137,20 @@ namespace creaImageIO
 	      }
 	    else
 	      {
-		uint16_t gr;
 		uint16_t el;
+		uint16_t gr;
+		
 		tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
 		if ( ( gr!=0 ) && ( el!=0 ) )
 		  {
-		    std::string val = file->GetEntryString(gr,el);
+		    std::string val =  file->GetEntryString(gr,el);
 		    i->second = irclean(val);
 		  }
 	      }
 	  }
       }
-    file->Delete();
   }
-  
+
   //=====================================================================
   
 } // namespace creaImageIO