X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=9768d484483c71018ee04d921aa9dc8fada081ac;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=afea104a6086d0d6e185d13f9d75e67b446a07bf;hpb=5a7f506da1ee16d6e742c4e95f7f1b09826d8980;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index afea104a..9768d484 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/07/27 09:49:31 $
-  Version:   $Revision: 1.91 $
+  Date:      $Date: 2007/09/25 16:06:46 $
+  Version:   $Revision: 1.95 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,9 +69,9 @@ DocEntry::~DocEntry()
 /**
  * \brief   Writes the common part of any DataEntry, SeqEntry
  * @param fp already open ofstream pointer
- * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, JPEG, JPEG2000...)
  */
-void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMetaElements)
+void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMetaElements, bool insideSequence)
 {
    uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();
@@ -125,20 +125,9 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMet
       uint16_t zero = 0;
       uint16_t shortLgr = (uint16_t)lgth;
 
-/*
-      if( IsVRUnknown() )
-      { 
-         // GDCM_VRUNKNOWN was stored in the Entry VR;
-         // deal with Entry as if TS were Implicit VR
-         binary_write(*fp, lgth);
-      }
-      else
-*/
       if( IsVRUnknown() )  
       {
-      // if VR was not set, we set it to "UN"
-      // (FileHelper::Write has no longer to switch to ImplicitVR 
-      // when undocumented VR DataElements exist!)
+      // if VR was not set by user, we set it to "UN"
          SetVR("UN");
          vr=GetVR();
       }      
@@ -146,13 +135,14 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMet
       //{
          binary_write(*fp, vr.str());
          // See PS 3.5-2004 page 33, 36                  
-         if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") 
+         if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OL") || (vr == "OF") 
           ||  (vr == "UN") || (vr == "UT") )
          {
             binary_write(*fp, zero);
-           if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010)
-            {
-               gdcmAssertMacro( GetVR() == "OW" );
+
+           if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010 && !insideSequence)
+            { 
+              // Only the 'true' Pixel Element may be compressed (hope so!)
                binary_write(*fp, ffff);
             }  
             else if (vr == "SQ")
@@ -233,7 +223,7 @@ uint32_t DocEntry::GetFullLength()
    }
    else
    {
-      if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="SQ" )
+      if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="OL" || GetVR()=="SQ" )
       {
          l = l + 12; // 2 (gr) + 2 (el) + 2 (vr) + 2 (unused) + 4 (lgth)
       }
@@ -266,7 +256,7 @@ void DocEntry::Copy(DocEntry *doc)
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \brief   Prints the common part of DataEntry, SeqEntry
+ * \brief   Prints the common part (vr [length offset] name) of DataEntry, SeqEntry
  * @param   os ostream we want to print in
  * @param indent Indentation string to be prepended during printing
  */
@@ -315,7 +305,7 @@ void DocEntry::Print(std::ostream &os, std::string const & )
       s << st << " ";
       s << std::setw(8) << o; 
    }
-   if (PrintLevel >= 1)
+   //if (PrintLevel >= 1)
       s << " ";
 
    s << "[" << vr  << "] ";