Forget to commit this one.

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 79103b0164324676c56294b98486f3979a196c14..8d5f308b2ce1875733c6ec9c91942d20e9d8ebc7 100644 (file)
--- 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/26 08:36:49 $
-  Version:   $Revision: 1.90 $
+  Date:      $Date: 2007/08/29 15:30:49 $
+  Version:   $Revision: 1.93 $
                                                                                 
   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();
       }      
@@ -150,9 +139,10 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMet
           ||  (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")
@@ -324,8 +314,13 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    uint16_t e = GetElement();
    if ( e == 0x0000 )
       name = "Group Length";
-   else if ( GetGroup()%2 == 1 && ( e >= 0x0010 && e <= 0x00ff ) )
-      name = "Private Creator";
+   else if ( GetGroup()%2 == 1 )
+   {
+      if ( e >= 0x0010 && e <= 0x00ff )
+         name = "Private Creator";
+      else if (e == 0x0001)
+         name = "Private Group Length To End";
+   }
    else
    {
       name = GetName();