ENH: avoid writing illegal images with a double dots.

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 4d7f80e782755d7d62849489603bf8c5383cb1ec..747a1479b3370de7ca792caef152d77de03e98bf 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/08/28 09:29:26 $
-  Version:   $Revision: 1.92 $
+  Date:      $Date: 2007/10/30 09:14:42 $
+  Version:   $Revision: 1.96 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,7 @@ namespace GDCM_NAME_SPACE
 
 // Constructor / Destructor
 /**
- * \brief   Constructor from a given DictEntry
+ * \brief   Constructor from a given DocEntry
  * @param   group Group number
  * @param   elem Element number
  * @param   vr VR 
@@ -42,7 +42,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr)
 {
    ImplicitVR = false;
    DicomDict  = 0;   
-   Offset     = 0 ; // To avoid further missprinting
+   Offset     = 0 ; // To avoid further misprinting
 
    // init some variables
    ReadLength = 0;
@@ -53,7 +53,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr)
 }
 
 /**
- * \brief   Destructor from a given DictEntry
+ * \brief   Destructor from a given DocEntry
  */
 DocEntry::~DocEntry()
 {
@@ -71,7 +71,7 @@ DocEntry::~DocEntry()
  * @param fp already open ofstream pointer
  * @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();
@@ -135,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")
@@ -222,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)
       }
@@ -255,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
  */
@@ -304,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  << "] ";