X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=f343fb60846218253972b1bf4c0bbb6c83e622b0;hb=5ac625c72835828d687ebdef878691d0913ae41b;hp=3653e9fe1c2c78a827504425dcb29a9e836b9732;hpb=5eaf401931c8671af4f8189c4a50f58e6bdd67ed;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 3653e9fe..f343fb60 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/05 08:32:57 $
-  Version:   $Revision: 1.66 $
+  Date:      $Date: 2005/11/29 12:48:46 $
+  Version:   $Revision: 1.79 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,18 +39,30 @@ DocEntry::DocEntry(DictEntry *in)
 {
    ImplicitVR = false;
    DicomDict  = in;
-   SetKey( in->GetKey( ) );
    Offset     = 0 ; // To avoid further missprinting
 
    // init some variables
    ReadLength = 0;
    Length = 0;
+
+   gdcmAssertMacro(DicomDict);
+   DicomDict->Register();
+}
+
+/**
+ * \brief   Destructor from a given DictEntry
+ */
+DocEntry::~DocEntry()
+{
+   gdcmAssertMacro(DicomDict);
+
+   DicomDict->Unregister();
 }
 
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \brief   Writes the common part of any ValEntry, BinEntry, SeqEntry
+ * \brief   Writes the common part of any DataEntry, SeqEntry
  * @param fp already open ofstream pointer
  * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
@@ -72,19 +84,30 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    //
    // ----------- Writes the common part
    //
+    // To avoid gdcm to propagate oddities.
+    // --> Don't forget to *write* an even length value   
+   if (lgth%2)
+      lgth ++;
+   
+ // ----------- Writes the common part : the Tag   
    binary_write( *fp, group); //group number
    binary_write( *fp, el);    //element number
 
-   if ( filetype == ExplicitVR )
+   // Dicom V3 group 0x0002 is *always* Explicit VR !
+   if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
    {
-      // Special case of delimiters:
+
+// ----------- Writes the common part : the VR + the length 
+  
+          // Special case of delimiters:
       if (group == 0xfffe)
       {
          // Delimiters have NO Value Representation
          // Hence we skip writing the VR.
+         //
          // In order to avoid further troubles, we choose to write them
          // as 'no-length' Item Delimitors (we pad by writing 0xffffffff)
-         // We shall force the end of a given Item by writting 
+         // We shall force the end of a given SeqItem by writting 
          //  a Item Delimitation Item (fffe, e00d)
 
          uint32_t ff = 0xffffffff;
@@ -92,24 +115,25 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          return;
       }
 
-      uint16_t z = 0;
+      uint16_t zero = 0;
       uint16_t shortLgr = (uint16_t)lgth;
 
-      if (vr == GDCM_UNKNOWN)
+      if( IsVRUnknown() )
       {
-         // Unknown was 'written'
-         // deal with Little Endian            
-         binary_write(*fp, shortLgr);
-         binary_write(*fp, z);
+         // GDCM_VRUNKNOWN was stored in the Entry VR;
+         // deal with Entry as if TS were Implicit VR
+ 
+         binary_write(*fp, lgth);
       }
       else
       {
-         binary_write(*fp, vr);
-         gdcmAssertMacro( vr.size() == 2 );
-                  
-         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
+         binary_write(*fp, vr.str());
+
+         // See PS 3.5-2004 page 33, 36                  
+         if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") 
+          ||  (vr == "UN") || (vr == "UT") )
          {
-            binary_write(*fp, z);
+            binary_write(*fp, zero);
             if (vr == "SQ")
             {
                // we set SQ length to ffffffff
@@ -130,6 +154,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    } 
    else // IMPLICIT VR 
    { 
+// ----------- Writes the common part : the VR  
       if (vr == "SQ")
       {
          binary_write(*fp, ffff);
@@ -194,7 +219,7 @@ bool DocEntry::IsSequenceDelimitor()
 }
 
 /**
- * \brief   Copies all the attributes from an other DocEntry 
+ * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
  */
 void DocEntry::Copy(DocEntry *doc)
@@ -214,7 +239,7 @@ void DocEntry::Copy(DocEntry *doc)
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \brief   Prints the common part of ValEntry, BinEntry, SeqEntry
+ * \brief   Prints the common part of DataEntry, SeqEntry
  * @param   os ostream we want to print in
  * @param indent Indentation string to be prepended during printing
  */
@@ -223,21 +248,22 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    size_t o;
    std::string st;
    TSKey v;
-   std::string d2, vr;
+   std::string d2;
+   VRKey vr;
    std::ostringstream s;
    uint32_t lgth;
 
    o  = GetOffset();
    vr = GetVR();
-   if ( vr==GDCM_UNKNOWN )
-      vr="  ";
+   if ( vr == GDCM_VRUNKNOWN )
+      vr = "  ";
 
    s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
 
    if (PrintLevel >= 2)
    {
       s << " lg : ";
-      lgth = GetReadLength(); // ReadLength, as opposed to Length
+      lgth = GetReadLength(); // ReadLength, as opposed to (usable) Length
       if (lgth == 0xffffffff)
       {
          st = " ffff ";