Solve pb when structure (list, map, ...) is empty.

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 08e6a9c027a5962c161aedfb643232d3143a66c7..73486bc72fbed3adddd83fb5b0690717769e7856 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/17 17:27:03 $
-  Version:   $Revision: 1.193 $
+  Date:      $Date: 2005/01/18 08:01:41 $
+  Version:   $Revision: 1.195 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -703,12 +703,12 @@ std::string Document::GetEntry(uint16_t group, uint16_t elem)
  */
 std::string Document::GetEntryVR(uint16_t group, uint16_t elem)
 {
-   DocEntry *elem = GetDocEntry(group, elem);
-   if ( !elem )
+   DocEntry *element = GetDocEntry(group, elem);
+   if ( !element )
    {
       return GDCM_UNFOUND;
    }
-   return elem->GetVR();
+   return element->GetVR();
 }
 
 /**
@@ -721,12 +721,12 @@ std::string Document::GetEntryVR(uint16_t group, uint16_t elem)
  */
 int Document::GetEntryLength(uint16_t group, uint16_t elem)
 {
-   DocEntry *elem =  GetDocEntry(group, elem);
-   if ( !elem )
+   DocEntry *element =  GetDocEntry(group, elem);
+   if ( !element )
    {
       return -2;  //magic number
    }
-   return elem->GetLength();
+   return element->GetLength();
 }
 
 /**
@@ -2977,10 +2977,7 @@ int Document::ComputeGroup0002Length( FileType filetype )
    bool found0002 = false;   
   
    // for each zero-level Tag in the DCM Header
-   DocEntry *entry;
-
-   InitTraversal();
-   entry = GetNextEntry();
+   DocEntry *entry = GetFirstEntry();
    while(entry)
    {
       gr = entry->GetGroup();