X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.cxx;h=94f5ca5b22b4895807937ffae513695655a7fc4c;hb=92967c3564074740715bcfd833bdd9f6a4e2220e;hp=f0fbb0cd9c199f3e24e5f241171d2c43de236104;hpb=afb4925bd3110d67669db7264f78a238d4fb9333;p=gdcm.git

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index f0fbb0cd..94f5ca5b 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/09 22:11:09 $
-  Version:   $Revision: 1.218 $
+  Date:      $Date: 2005/02/10 20:53:23 $
+  Version:   $Revision: 1.223 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -367,7 +367,8 @@ int File::GetZSize()
   */
 float File::GetXSpacing()
 {
-   float xspacing, yspacing;
+   float xspacing = 1.0;
+   float yspacing = 1.0;
    const std::string &strSpacing = GetEntryValue(0x0028,0x0030);
 
    if( strSpacing == GDCM_UNFOUND )
@@ -1159,47 +1160,40 @@ void File::AnonymizeNoLoad()
 {
    std::fstream *fp = new std::fstream(Filename.c_str(), 
                               std::ios::in | std::ios::out | std::ios::binary);
+ 
    // TODO : FIXME
    // how to white out disk space if longer than 50 ?
-   char spaces[50] = "                                               ";
+   
    
    gdcm::DocEntry *d;
    uint32_t offset;
    uint32_t lgth;
-   uint32_t lgtToWrite;
+   uint32_t valLgth = 0;
+   std::string *spaces;
    for (ListElements::iterator it = AnonymizeList.begin();  
                                it != AnonymizeList.end();
                              ++it)
-   {  
+   { 
       d = GetDocEntry( (*it).Group, (*it).Elem);
 
+      if ( d == NULL)
+         continue;
+
       if ( dynamic_cast<BinEntry *>(d)
         || dynamic_cast<SeqEntry *>(d) )
          continue;
 
-      if( d == NULL)
-        {
-         gdcmWarningMacro( "I have no idea why this is NULL but this solve the seg fault");
-         continue;
-        }
       offset = d->GetOffset();
       lgth =   d->GetLength();
-      fp->seekp( offset, std::ios::beg );
-
-      if ( (*it).Value == "" )
+      if (valLgth < lgth)
       {
-         lgtToWrite = lgth > 50 ? 50 : lgth;
-         fp->write( spaces, lgtToWrite );
-      }
-      else
-      {
-         // TODO : FIXME
-         // how to white out disk space if longer than 50 ?
-         (*it).Value = (*it).Value + spaces;
-         lgtToWrite = lgth > (*it).Value.length() ? (*it).Value.length() : lgth;
-         fp->write( (char *)(*it).Value.c_str(), lgtToWrite );
-
+         spaces = new std::string( lgth-valLgth, ' ');
+         (*it).Value = (*it).Value + *spaces;
+         delete spaces;
       }
+      fp->seekp( offset, std::ios::beg );
+      fp->write( (*it).Value.c_str(), lgth );
+     
    }
    fp->close();
    delete fp;
@@ -1211,7 +1205,7 @@ void File::AnonymizeNoLoad()
  */
 bool File::AnonymizeFile()
 {
-   // If Anonymisation list is empty, let's perform some basic anonymisation
+   // If Anonymisation list is empty, let's perform some basic anonymization
    if ( AnonymizeList.begin() == AnonymizeList.end() )
    {
       // If exist, replace by spaces
@@ -1243,6 +1237,9 @@ bool File::AnonymizeFile()
       {  
          d = GetDocEntry( (*it).Group, (*it).Elem);
 
+         if ( d == NULL)
+            continue;
+
          if ( dynamic_cast<BinEntry *>(d)
            || dynamic_cast<SeqEntry *>(d) )
             continue;