X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=6a9a13ce201aa4ba3c7f86cf0a8a449bacb574e4;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=2c250b5a1e1c89741037059864fe37ae5bf8f7f9;hpb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 2c250b5a..6a9a13ce 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/10/19 13:17:04 $
-  Version:   $Revision: 1.73 $
+  Date:      $Date: 2005/11/03 08:47:51 $
+  Version:   $Revision: 1.77 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,6 +44,19 @@ DocEntry::DocEntry(DictEntry *in)
    // init some variables
    ReadLength = 0;
    Length = 0;
+
+   gdcmAssertMacro(DicomDict);
+   DicomDict->Register();
+}
+
+/**
+ * \brief   Destructor from a given DictEntry
+ */
+DocEntry::~DocEntry()
+{
+   gdcmAssertMacro(DicomDict);
+
+   DicomDict->Unregister();
 }
 
 //-----------------------------------------------------------------------------
@@ -71,13 +84,22 @@ 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
 
    // 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
@@ -101,13 +123,6 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          // GDCM_VRUNKNOWN was stored in the Entry VR;
          // deal with Entry as if TS were Implicit VR
  
-         // FIXME : troubles expected on big endian processors :
-         // let lgth = 0x00001234
-         // we write 34 12 00 00 on little endian proc (OK)
-         // we write 12 34 00 00 on big endian proc (KO)          
-         //binary_write(*fp, shortLgr);
-         //binary_write(*fp, zero);
-
          binary_write(*fp, lgth);
       }
       else
@@ -115,6 +130,8 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          binary_write(*fp, vr.str());
                   
          if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
+// FIXME : what is the status of VR = "UN"
+//         --> uncomment or remove comment !
          {
             binary_write(*fp, zero);
             if (vr == "SQ")
@@ -137,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);
@@ -238,7 +256,7 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    o  = GetOffset();
    vr = GetVR();
    if ( vr == GDCM_VRUNKNOWN )
-      vr="  ";
+      vr = "  ";
 
    s << DictEntry::TranslateToKey(GetGroup(),GetElement());