Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/11/29 17:21:34 $
- Version: $Revision: 1.332 $
+ Date: $Date: 2005/12/14 10:00:28 $
+ Version: $Revision: 1.334 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
bool delim_mode_intern = delim_mode;
bool first = true;
gdcmDebugMacro( "Enter in ParseDES, delim-mode " << delim_mode
- << " at offset " << std::hex << offset );
+ << " at offset " << std::hex << "0x(" << offset << ")" );
while (true)
{
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
gdcmDebugMacro( "in ParseDES : cannot add a DataEntry "
<< newDataEntry->GetKey()
- << " (at offset : "
- << newDataEntry->GetOffset() << " )" );
+ << " (at offset : 0x("
+ << newDataEntry->GetOffset() << ") )" );
used=false;
}
else
// Load only if we can add (not a duplicate key)
LoadDocEntry( newDataEntry );
}
-
if ( newDataEntry->GetElement() == 0x0000 ) // if on group length
{
if ( newDataEntry->GetGroup()%2 != 0 ) // if Shadow Group
if ( LoadMode & LD_NOSHADOW ) // if user asked to skip shad.gr
{
std::string strLgrGroup = newDataEntry->GetString();
+
int lgrGroup;
- if ( newDataEntry->IsUnfound() )
+ //if ( newDataEntry->IsUnfound() ) /?!? JPR
{
lgrGroup = atoi(strLgrGroup.c_str());
Fp->seekg(lgrGroup, std::ios::cur);
{ // Don't try to parse zero-length sequences
gdcmDebugMacro( "Entry in ParseSQ, delim " << delim_mode_intern
- << " at offset " << std::hex
- << newDocEntry->GetOffset() );
+ << " at offset 0x(" << std::hex
+ << newDocEntry->GetOffset() << ")");
ParseSQ( newSeqEntry,
newDocEntry->GetOffset(),
{
gdcmWarningMacro( "in ParseDES : cannot add a SeqEntry "
<< newSeqEntry->GetKey()
- << " (at offset : "
- << newSeqEntry->GetOffset() << " )" );
+ << " (at offset : 0x("
+ << newSeqEntry->GetOffset() << ") )" );
used = false;
}
else
long offset = PreviousDocEntry->GetOffset();
gdcmDebugMacro( "Backtrack :" << std::hex << group
- << "|" << elem
- << " at offset " << offset );
+ << "|" << elem
+ << " at offset 0x(" <<offset << ")" );
RemoveEntry( PreviousDocEntry );
// forge the Seq Entry
if ( CurrentGroup != 0xfffe )
gdcmWarningMacro( "Unknown VR " << std::hex << "0x("
<< (unsigned int)vr[0] << "|" << (unsigned int)vr[1]
- << ") at offset :" << positionOnEntry );
+ << ") at offset : 0x(" << positionOnEntry<< ")" );
Fp->seekg(positionOnEntry, std::ios::beg);
return GDCM_VRUNKNOWN;
}