Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2007/08/28 09:29:26 $
- Version: $Revision: 1.92 $
+ Date: $Date: 2007/09/14 08:22:19 $
+ Version: $Revision: 1.94 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* @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();
|| (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")
//-----------------------------------------------------------------------------
// 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
*/
s << st << " ";
s << std::setw(8) << o;
}
- if (PrintLevel >= 1)
+ //if (PrintLevel >= 1)
s << " ";
s << "[" << vr << "] ";