FIX gdcmParser::ReplaceOrCreateByNumber shouldn't seg fault any more (hope so...)

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index fb566c629744cdda1fbc37418442a2c1e35e7c18..0ae781076657270c9f3d5ebd39e5c6334a74a3ab 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -446,13 +446,13 @@ void gdcmDicomDir::CheckBoundaries()
             itImage = ((*itSerie)->GetDicomDirImages()).begin();
             while (itImage != (*itSerie)->GetDicomDirImages().end() ) {
                (*itImage)->ResetBoundaries(1);
-               ++itImage;
-       }
-       ++itSerie;
-         }
-      ++itStudy;
-      } 
-      ++itPatient;     
+              ++itImage;
+            }
+            ++itSerie;
+        }
+        ++itStudy;
+     } 
+     ++itPatient;     
    }
 } 
 

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 2ae2bd0974f56f11139cbdb2f3928b8d42833701..4477a95d9b2539debacf3d25caaefd619de89018 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -721,7 +721,6 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
    
    //PixelElement->SetPrintLevel(2);
    //PixelElement->Print();    
- 
    Header->Write(fp1, type);
 
    // --------------------------------------------------------------

diff --git a/src/gdcmHeaderEntry.h b/src/gdcmHeaderEntry.h
index 6242cba258a1294293e127a90f7c0fb683a88ab1..1dbc5cd2f5bfdde9511e1273f81429cb6725274a 100644 (file)
--- a/src/gdcmHeaderEntry.h
+++ b/src/gdcmHeaderEntry.h
@@ -132,7 +132,7 @@ public:
     * \brief   Sets the value (string)
     *          of the current Dicom Header Entry
     */         
-   inline void         SetValue(std::string val) { value = val;      };
+   inline void         SetValue(std::string val) {  value = val; };
 
    /**
     * \ingroup gdcmHeaderEntry

diff --git a/src/gdcmObject.cxx b/src/gdcmObject.cxx
index f9a4760655cefb6d3c3762ef916b167ed40d44f0..d4527bc1449dc9e5f58601fb2adc29a91e4cf5b7 100644 (file)
--- a/src/gdcmObject.cxx
+++ b/src/gdcmObject.cxx
@@ -105,8 +105,7 @@ void gdcmObject::ResetBoundaries(int flag) {
   // upwards again to fffe,e000   
    if (fin()== (--(plistEntries->end())) )  // Don't try anything more when end 
        return;                              // of Chained List is reached   
-       
-                                    
+                                           
    for( i=j=fin();
         ((*i)->GetGroup() != 0xfffe)  && ((*i)->GetElement() != 0xe000);
        --i,j--) {          

diff --git a/src/gdcmObject.h b/src/gdcmObject.h
index e3be05aa2a031f2ab7c922a28418181b4490bc18..a7b0665b20fd19e138714add5bbb89c2f484ad6e 100644 (file)
--- a/src/gdcmObject.h
+++ b/src/gdcmObject.h
@@ -63,7 +63,6 @@ protected:
               TagHeaderEntryHT *ptagHT, ListTag *plistEntries); 
    ~gdcmObject(void);
 
-
    void FillObject(std::list<gdcmElement> elemList);
 
 /**

diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx
index d75aae58f79d7a057f6c70dfcc3803658b036ea1..8c650206a640ec1d821fe1d461b8ffbce5fc69cf 100644 (file)
--- a/src/gdcmParser.cxx
+++ b/src/gdcmParser.cxx
@@ -401,7 +401,7 @@ gdcmHeaderEntry * gdcmParser::ReplaceOrCreateByNumber(
    gdcmHeaderEntry* a;
    a = GetHeaderEntryByNumber( Group, Elem);
    if (a == NULL) {
-      gdcmHeaderEntry *a = NewHeaderEntryByNumber(Group, Elem);
+      a =NewHeaderEntryByNumber(Group, Elem);
       if (a == NULL) 
          return NULL;
       AddHeaderEntry(a);
@@ -1099,7 +1099,7 @@ bool gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type)
 bool gdcmParser::WriteEntries(FILE *_fp,FileType type)
 {   
    // TODO (?) tester les echecs en ecriture (apres chaque fwrite)
-   
+     
    for (ListTag::iterator tag2=listEntries.begin();
                           tag2 != listEntries.end();
                           ++tag2)