X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=535e3bc99267a3446588b3c8f9db86085c81ffc2;hb=725267b12a1928251820ad7a3fc363de5fcdf8dc;hp=a4011aa731b0fef048e8ec408ef6087f498088b4;hpb=8b7ccc5d0086fd3df994c18e2883bc0e3f7d1984;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index a4011aa7..535e3bc9 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/18 19:54:26 $
-  Version:   $Revision: 1.72 $
+  Date:      $Date: 2006/02/16 20:06:14 $
+  Version:   $Revision: 1.81 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,6 +17,7 @@
 =========================================================================*/
 
 #include "gdcmDocEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmTS.h"
 #include "gdcmVR.h"
 #include "gdcmGlobal.h"
@@ -39,12 +40,24 @@ 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();
 }
 
 //-----------------------------------------------------------------------------
@@ -58,26 +71,38 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
    uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();
+
+   ///\todo allow skipping Shadow groups 
+ 
    VRKey vr       = GetVR();
-   uint16_t el    = GetElement();
+   uint16_t elem  = GetElement();
    uint32_t lgth  = GetLength();
 
-   if ( group == 0xfffe && el == 0x0000 )
+   if ( group == 0xfffe && elem == 0x0000 )
    {
      // Fix in order to make some MR PHILIPS images e-film readable
      // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
      // we just *always* ignore spurious fffe|0000 tag !   
       return;
    }
+
    //
    // ----------- 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
+   binary_write( *fp, elem);  //element number
 
    // Dicom V3 group 0x0002 is *always* Explicit VR !
    if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
    {
+// ----------- Writes the common part : the VR + the length 
+  
       // Special case of delimiters:
       if (group == 0xfffe)
       {
@@ -102,20 +127,15 @@ 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
       {
          binary_write(*fp, vr.str());
-                  
-         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
+
+         // See PS 3.5-2004 page 33, 36                  
+         if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") 
+          ||  (vr == "UN") || (vr == "UT") )
          {
             binary_write(*fp, zero);
             if (vr == "SQ")
@@ -138,6 +158,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);
@@ -202,7 +223,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)
@@ -239,7 +260,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());