correct sscan_f problems.

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 30c420914cc2a7ca00c96aa8ce979fd666be0ddd..8a5863bf7413ad5fda0ad63521301573b53e29b5 100644 (file)
--- 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 f0080b04fa2684de870d8c2d3a3792cf8be09892..6df7fc0132413e211c5a4c9d9b326a009654dba2 100644 (file)
--- 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 c6a694f8cff678e267d621f9da6a8d7585e4c902..86fb30a8e8a8afee9da74efe4b414fbfde026672 100644 (file)
--- 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 368fb7ffd8c841997c3d90847573a7363dc7ccf7..0d3780ac827a22f80dc45bbce6feac23e104e77c 100644 (file)
--- 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();
   }
   //=====================================================================