ENH: Yet another pass to get RLE stuff similar to JPEG. I am still unhappy with the...

[gdcm.git] / src / gdcmSQItem.cxx

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 0431202ca3bbf3c16c1f69236af1d0baa5c45fb6..945ad0b2db8ec6d223fb04e5bc8e620eaf3df961 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 15:44:24 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/01/30 17:30:57 $
+  Version:   $Revision: 1.62 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -161,7 +161,6 @@ void SQItem::ClearEntry()
 bool SQItem::AddEntry(DocEntry *entry)
 {
    DocEntries.push_back(entry);
-   //TODO : check if it worked
    return true;
 }   
 
@@ -170,7 +169,7 @@ bool SQItem::AddEntry(DocEntry *entry)
  * @param   entryToRemove Entry to remove AND delete.
  * @return true if the entry was found and removed; false otherwise
  */
-bool SQItem::RemoveEntry( DocEntry* entryToRemove)
+bool SQItem::RemoveEntry( DocEntry *entryToRemove)
 {
    for(ListDocEntry::iterator it = DocEntries.begin();
        it != DocEntries.end();
@@ -193,7 +192,7 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove)
  * @param   entryToRemove Entry to remove.
  * @return true if the entry was found and removed; false otherwise
  */
-bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
 {
    for(ListDocEntry::iterator it = DocEntries.begin();
        it != DocEntries.end();
@@ -216,7 +215,7 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove)
  * \brief   Get the first Dicom entry while visiting the SQItem
  * \return  The first DocEntry if found, otherwhise 0
  */
-DocEntry * SQItem::GetFirstEntry()
+DocEntry *SQItem::GetFirstEntry()
 {
    ItDocEntries = DocEntries.begin();
    if (ItDocEntries != DocEntries.end())
@@ -230,13 +229,10 @@ DocEntry * SQItem::GetFirstEntry()
  */
 DocEntry *SQItem::GetNextEntry()
 {
-  // gdcmAssertMacro (ItDocEntries != DocEntries.end());
-   {
-      ++ItDocEntries;
-      if (ItDocEntries != DocEntries.end())
-         return  *ItDocEntries;
-      return NULL;
-   }
+   ++ItDocEntries;
+   if (ItDocEntries != DocEntries.end())
+      return  *ItDocEntries;
+   return NULL;
 }
 
 /**
@@ -250,7 +246,7 @@ DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem)
    for(ListDocEntry::iterator i = DocEntries.begin();
                               i != DocEntries.end(); ++i)
    {
-      if ( (*i)->GetGroup()==group && (*i)->GetElement()==elem )
+      if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem )
          return *i;
    }
    return NULL;