X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=18dfdf57283f902f49313d24a8fed41af2af3035;hb=d72d6930415f074ed002b44291cd568ece0a2849;hp=729fe8cccece0a618d5ace6c15bb1f5aa54095e1;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 729fe8cc..18dfdf57 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 08:35:49 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2005/10/20 07:29:43 $
+  Version:   $Revision: 1.74 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,6 @@ DocEntry::DocEntry(DictEntry *in)
 {
    ImplicitVR = false;
    DicomDict  = in;
-   SetKey( in->GetKey( ) );
    Offset     = 0 ; // To avoid further missprinting
 
    // init some variables
@@ -76,7 +75,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write( *fp, el);    //element number
 
    // Dicom V3 group 0x0002 is *always* Explicit VR !
-   if ( filetype == ExplicitVR || group == 0x0002 )
+   if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
    {
       // Special case of delimiters:
       if (group == 0xfffe)
@@ -97,9 +96,9 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       uint16_t zero = 0;
       uint16_t shortLgr = (uint16_t)lgth;
 
-      if (vr == GDCM_UNKNOWN)
+      if( IsVRUnknown() )
       {
-         // GDCM_UNKNOWN was stored in the Entry VR;
+         // GDCM_VRUNKNOWN was stored in the Entry VR;
          // deal with Entry as if TS were Implicit VR
  
          // FIXME : troubles expected on big endian processors :
@@ -113,8 +112,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       }
       else
       {
-         binary_write(*fp, vr);
-         gdcmAssertMacro( vr.size() == 2 );
+         binary_write(*fp, vr.str());
                   
          if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
          {
@@ -232,14 +230,15 @@ 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());