Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/11/03 08:47:51 $
- Version: $Revision: 1.77 $
+ Date: $Date: 2006/02/16 20:06:14 $
+ Version: $Revision: 1.81 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmDocEntry.h"
+#include "gdcmDataEntry.h"
#include "gdcmTS.h"
#include "gdcmVR.h"
#include "gdcmGlobal.h"
{
uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
+
+ ///\todo allow skipping Shadow groups
+
VRKey vr = GetVR();
- uint16_t el = GetElement();
+ uint16_t elem = GetElement();
uint32_t lgth = GetLength();
- if ( group == 0xfffe && el == 0x0000 )
+ if ( group == 0xfffe && elem == 0x0000 )
{
// Fix in order to make some MR PHILIPS images e-film readable
// see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
// we just *always* ignore spurious fffe|0000 tag !
return;
}
+
//
// ----------- Writes the common part
//
// ----------- Writes the common part : the Tag
binary_write( *fp, group); //group number
- binary_write( *fp, el); //element number
+ binary_write( *fp, elem); //element number
// Dicom V3 group 0x0002 is *always* Explicit VR !
if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
{
-
// ----------- Writes the common part : the VR + the length
- // Special case of delimiters:
+ // Special case of delimiters:
if (group == 0xfffe)
{
// Delimiters have NO Value Representation
else
{
binary_write(*fp, vr.str());
-
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
-// FIXME : what is the status of VR = "UN"
-// --> uncomment or remove comment !
+
+ // See PS 3.5-2004 page 33, 36
+ if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF")
+ || (vr == "UN") || (vr == "UT") )
{
binary_write(*fp, zero);
if (vr == "SQ")
}
/**
- * \brief Copies all the attributes from an other DocEntry
+ * \brief Copies all the attributes from an other DocEntry
* @param doc entry to copy from
*/
void DocEntry::Copy(DocEntry *doc)