Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:49 $
- Version: $Revision: 1.70 $
+ Date: $Date: 2005/10/20 15:24:09 $
+ Version: $Revision: 1.75 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
ImplicitVR = false;
DicomDict = in;
- SetKey( in->GetKey( ) );
Offset = 0 ; // To avoid further missprinting
// init some variables
ReadLength = 0;
Length = 0;
+
+ gdcmAssertMacro(DicomDict);
+ DicomDict->Register();
+}
+
+/**
+ * \brief Destructor from a given DictEntry
+ */
+DocEntry::~DocEntry()
+{
+ gdcmAssertMacro(DicomDict);
+
+ DicomDict->Unregister();
}
//-----------------------------------------------------------------------------
binary_write( *fp, el); //element number
// Dicom V3 group 0x0002 is *always* Explicit VR !
- if ( filetype == ExplicitVR || group == 0x0002 )
+ if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
{
// Special case of delimiters:
if (group == 0xfffe)
uint16_t zero = 0;
uint16_t shortLgr = (uint16_t)lgth;
- if (vr == GDCM_UNKNOWN)
+ if( IsVRUnknown() )
{
- // GDCM_UNKNOWN was stored in the Entry VR;
+ // GDCM_VRUNKNOWN was stored in the Entry VR;
// deal with Entry as if TS were Implicit VR
// FIXME : troubles expected on big endian processors :
}
else
{
- binary_write(*fp, vr);
- gdcmAssertMacro( vr.size() == 2 );
+ binary_write(*fp, vr.str());
if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
{
size_t o;
std::string st;
TSKey v;
- std::string d2, vr;
+ std::string d2;
+ VRKey vr;
std::ostringstream s;
uint32_t lgth;
o = GetOffset();
vr = GetVR();
- if ( vr==GDCM_UNKNOWN )
- vr=" ";
+ if ( vr == GDCM_VRUNKNOWN )
+ vr = " ";
s << DictEntry::TranslateToKey(GetGroup(),GetElement());