From b6844f8c036829543a361ac7069e3e7151e7793b Mon Sep 17 00:00:00 2001
From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Wed, 16 Dec 2009 14:50:22 +0000
Subject: [PATCH] correct sscan_f problems.

---
 src2/creaImageIODicomImageReader.cpp        |  6 +++---
 src2/creaImageIOGimmickView.cpp             |  2 --
 src2/creaImageIOTreeAttributeDescriptor.cpp | 15 ++++++++++-----
 src2/creaImageIOVtkImageReader.cpp          |  3 +--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 30c4209..8a5863b 100644
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -134,18 +134,18 @@ 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();
   }
 
   //=====================================================================
diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index f0080b0..6df7fc0 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -5,7 +5,6 @@
 #include <gdcmSerieHelper.h>
 #include <vtkGdcmReader.h>
 namespace fs = boost::filesystem;
-
 namespace creaImageIO
 {
 
@@ -286,7 +285,6 @@ namespace creaImageIO
 void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
 {
 	mReader.Stop();
-
 /* remember!
 
 #define GIMMICK_NO_IMAGE_SELECTION 0
diff --git a/src2/creaImageIOTreeAttributeDescriptor.cpp b/src2/creaImageIOTreeAttributeDescriptor.cpp
index c6a694f..86fb30a 100644
--- a/src2/creaImageIOTreeAttributeDescriptor.cpp
+++ b/src2/creaImageIOTreeAttributeDescriptor.cpp
@@ -100,12 +100,17 @@ namespace creaImageIO
       if ( (key.size()==10) &&
 	   (key[0] == 'D') &&
 	   (key[5] == '_') )
-	{
+	  {
 	  std::string g = key.substr(1,4);
-	  sscanf(key.c_str(),"D %04x _ %04x ",&group,&elem);  
-	  sscanf(g.c_str(),"%04x",&group);
-	  GimmickDebugMessage(3,"GetDicomGroupElementFromKey '"<<g<<"' : "
-			 <<group<<"|"<<elem<<std::endl);
+	  std::string e = key.substr(6,4);
+	  std::stringstream val;
+	  val <<  std::dec << g.c_str() ;
+	  val >> std::hex >> group;
+	  val.clear();
+	  val << std::dec << e.c_str();
+	  val >> std::hex >> elem;
+	  //sscanf_s(key.c_str(),"D%04x_%04x ",&group,&elem);  
+	  GimmickDebugMessage(3,"GetDicomGroupElementFromKey '"<<key<<"' : "			 <<group<<"|"<<elem<<std::endl);
 	}
       else 
 	{ 
diff --git a/src2/creaImageIOVtkImageReader.cpp b/src2/creaImageIOVtkImageReader.cpp
index 368fb7f..0d3780a 100644
--- a/src2/creaImageIOVtkImageReader.cpp
+++ b/src2/creaImageIOVtkImageReader.cpp
@@ -32,8 +32,7 @@ namespace creaImageIO{
   //=====================================================================
   VtkImageReader::~VtkImageReader()
   {
-    GimmickDebugMessage(5,"Destructing vtkImageReader : "<<GetName()
-			<<std::endl);
+
     mReader->Delete();
   }
   //=====================================================================
-- 
2.45.0