BUG: There was two bombs at the same time. Guess what what I found them all

[gdcm.git] / src / gdcmObject.cxx

diff --git a/src/gdcmObject.cxx b/src/gdcmObject.cxx
index 25cba3b529467488347a2d931d5401dbc93eed43..331c41073a2369334946ab8d4e6a5bd7c45e946f 100644 (file)
--- a/src/gdcmObject.cxx
+++ b/src/gdcmObject.cxx
@@ -1,5 +1,21 @@
-// gdcmObject.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmObject.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/07/17 22:47:01 $
+  Version:   $Revision: 1.22 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmObject.h"
 #include "gdcmGlobal.h"
 #include "gdcmDebug.h"
@@ -50,25 +66,9 @@ TagDocEntryHT gdcmObject::GetEntry(void) {
    return(HT);
 }
 
-/**
- * \ingroup gdcmObject
- * \brief   Builds a Chained List containing 
- *          pointers to all Header Entries (i.e Dicom Element)
- *          related to this 'object'
- * @return
- */
- 
- // FIXME : what was it used for ?!?
- /* 
-ListTag gdcmObject::GetListEntry(void) {
-   return(GetDocEntries());
-}
-*/
-
 //-----------------------------------------------------------------------------
 // Protected
 /**
- * \ingroup gdcmObject
  * \brief   add the 'Object' related Dicom Elements to the listEntries
  *          of a partially created DICOMDIR
  */
@@ -77,7 +77,7 @@ void gdcmObject::FillObject(std::list<gdcmElement> elemList) {
   // FillObject rempli le SQItem qui sera accroche au bon endroit
 
    std::list<gdcmElement>::iterator it;
-   guint16 tmpGr,tmpEl;
+   uint16_t tmpGr,tmpEl;
    gdcmDictEntry *dictEntry;
    gdcmValEntry *entry;
    
@@ -96,30 +96,25 @@ void gdcmObject::FillObject(std::list<gdcmElement> elemList) {
       // dealing with value length ...
   
       if(dictEntry->GetGroup()==0xfffe) 
-        {
-            entry->SetLength(entry->GetValue().length());       
-        }
+      {
+         entry->SetLength(entry->GetValue().length());
+      }
       else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") ) 
-         {
-            entry->SetLength(4);
-         } 
+      {
+         entry->SetLength(4);
+      } 
       else if( (dictEntry->GetVR()=="US") || (dictEntry->GetVR()=="SS") ) 
-         {
-            entry->SetLength(2); 
-         } 
+      {
+         entry->SetLength(2); 
+      } 
       else if(dictEntry->GetVR()=="SQ") 
-         {
-            entry->SetLength(0xffffffff);
-         }
+      {
+         entry->SetLength(0xffffffff);
+      }
       else
-         {
-            entry->SetLength(entry->GetValue().length()); 
-         }                                
-      //docEntries->insert(debInsertion ,entry); // ??? // add at the begining of the Patient list
-      AddDocEntry(entry);                                         
+      {
+         entry->SetLength(entry->GetValue().length()); 
+      }                                
+      AddDocEntry(entry);
    }   
 }   
-//-----------------------------------------------------------------------------
-// Private
-
-//-----------------------------------------------------------------------------