Fix some comments

diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx
index 46f4434b38f102df579bfeca51975cc68c82e3e5..d3a56c7aec6bffd073140307588c90746ba2d800 100644 (file)
--- a/src/gdcmDocEntrySet.cxx
+++ b/src/gdcmDocEntrySet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.74 $
+  Date:      $Date: 2007/07/27 21:21:48 $
+  Version:   $Revision: 1.75 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -417,18 +417,16 @@ bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem )
 
 /**
  * \brief   Build a new DataEntry from all the low level arguments. 
- *          Check for existence of dictionary entry, and build
- *          a default one when absent.
  * @param   group Group number   of the new Entry
  * @param   elem  Element number of the new Entry
  * @param   vr    V(alue) R(epresentation) of the new Entry 
  * \remarks The user of this method must destroy the DataEntry when unused
  */
-DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem,
+DataEntry *DocEntrySet::NewDataEntry(uint16_t group, uint16_t elem,
                                      VRKey const &vr) 
 {
 
-   DataEntry *newEntry = DataEntry::New(group,elem,vr);
+   DataEntry *newEntry = DataEntry::New(group, elem, vr);
    if (!newEntry) 
    {
       gdcmWarningMacro( "Failed to allocate DataEntry for ("
@@ -440,8 +438,6 @@ DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem,
 
 /**
  * \brief   Build a new SeqEntry from all the low level arguments. 
- *          Check for existence of dictionary entry, and build
- *          a default one when absent.
  * @param   group Group   number of the new Entry
  * @param   elem  Element number of the new Entry
  * \remarks The user of this method must destroy the SeqEntry when unused
@@ -451,7 +447,7 @@ SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group, uint16_t elem)
    //DictEntry *dictEntry = GetDictEntry(group, elem, "SQ");
 
    //SeqEntry *newEntry = SeqEntry::New( dictEntry );
-   SeqEntry *newEntry = SeqEntry::New( group,elem );
+   SeqEntry *newEntry = SeqEntry::New( group, elem );
    //dictEntry->Unregister(); // GetDictEntry register it
    if (!newEntry)
    {

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 115f3054c4c75eb777f0bfa71dbbe045cef8c534..d018e681bd5067c83d82959ba74db92e7291abeb 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: 2007/07/27 09:49:31 $
-  Version:   $Revision: 1.365 $
+  Date:      $Date: 2007/07/27 21:21:48 $
+  Version:   $Revision: 1.366 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2250,9 +2250,15 @@ DocEntry *Document::ReadNextDocEntry()
       else if (CurrentGroup%2 == 1 )
       { 
          if (CurrentElem >= 0x0010 && CurrentElem <=0x00ff )
-            // DICOM PS 3-5 7.8.1 a) states that those 
-            // (gggg-0010->00FF where gggg is odd) attributes have to be LO
+            // DICOM PS 3-5 7.8.1 a) states that :
+            // Private Creator Data Elements numbered (gggg,0010-00FF) (gggg is odd)
+            // attributes have to be LO (Long String) and the VM shall be equal to 1
             realVR = "LO";
+    
+           // Seems not to be true
+           // Still in gdcmtk, David Clunnie disagrees, Marco Eichelberg says it's OK ...
+           // We let it for a while? 
+           //(We should check length==4, for more security, but we don't have it yet !)
          else if ( CurrentElem == 0x0001)
             realVR = "UL"; // Private Group Length To End      
       }
@@ -2281,7 +2287,7 @@ DocEntry *Document::ReadNextDocEntry()
          // for VR = "UN", length is always stored on 4 bytes.
          changeFromUN=true;
          /// \todo : fixme If inside a supposed to be UN DataElement (but SQ according to a private dictionnary)
-         ///         there is some more supposed to UN DataElements, it will probabely fail.
+         ///         there is some more supposed to be UN DataElements, it will probabely fail.
          ///         --> find a -non time consuming- trick to store changeFromUN info at DataElement level,
          ///         not at the Document level.
       }   

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index 7991973685c578605dfaeb0c63b8e70bfcfa369e..3ff0b3065653557f51547fbbf126c10e8fd207cf 100644 (file)
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/05 10:53:48 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2007/07/27 21:21:48 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -184,6 +184,8 @@ protected:
    FileHelper( File *header );
    ~FileHelper();
 
+   /// \todo move all those 'protected' methods to 'privete'
+   ///       since FileHelper is not derived in anything!
    bool CheckWriteIntegrity();
 
    void SetWriteToRaw();