when UN stands for SQ : now we can read them correctly.
when UN stands for OB : no more infinite loop.
(a clever backtrack is still missing ...)
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2007/12/05 16:36:21 $
- Version: $Revision: 1.376 $
+ Date: $Date: 2008/01/02 10:48:52 $
+ Version: $Revision: 1.377 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
SwapCode = 1234;
Filetype = ExplicitVR;
CurrentOffsetPosition = 0;
SwapCode = 1234;
Filetype = ExplicitVR;
CurrentOffsetPosition = 0;
+ OffsetOfPreviousParseDES =0;
// Load will set it to true if sucessfull
Group0002Parsed = false;
IsDocumentAlreadyLoaded = false;
// Load will set it to true if sucessfull
Group0002Parsed = false;
IsDocumentAlreadyLoaded = false;
// Recursive call.
// Loading is done during parsing
// Recursive call.
// Loading is done during parsing
+ OffsetOfPreviousParseDES = beg;
ParseDES( this, beg, lgt, false); // delim_mode is first defaulted to false
if ( IsEmpty() )
ParseDES( this, beg, lgt, false); // delim_mode is first defaulted to false
if ( IsEmpty() )
{
///\todo FIXME : On 64 bits processors, tellg gives unexpected results after a while ?
{
///\todo FIXME : On 64 bits processors, tellg gives unexpected results after a while ?
- /// Probabely a bug in gdcm code somwhere (some memory erased ?)
+ /// Probabely a bug in gdcm code somewhere (some memory erased ?)
// Uncomment to track the bug
// Uncomment to track the bug
if( Debug::GetDebugFlag() )
std::cout << std::dec <<"(long)(Fp->tellg()) " << (long)(Fp->tellg()) // in Debug mode
<< std::hex << " 0x(" <<(long)(Fp->tellg()) << ")" << std::endl;
if( Debug::GetDebugFlag() )
std::cout << std::dec <<"(long)(Fp->tellg()) " << (long)(Fp->tellg()) // in Debug mode
<< std::hex << " 0x(" <<(long)(Fp->tellg()) << ")" << std::endl;
// if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) // Once per DocEntry
if ( !delim_mode ) // 'and then' doesn't exist in C++ :-(
// if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) // Once per DocEntry
if ( !delim_mode ) // 'and then' doesn't exist in C++ :-(
if ( !first && newDocEntry->IsItemStarter() )
{
// Debug message within the method !
if ( !first && newDocEntry->IsItemStarter() )
{
// Debug message within the method !
- newDocEntry = Backtrack(newDocEntry);
+ newDocEntry = Backtrack(newDocEntry, set);
+ // avoid infinite loop when Bad assumption was made on illegal 'unknown length' UN //JPRx
+
+ if (offsetStartCurrentSQItem <= OffsetOfPreviousParseDES)
+ {
+ gdcmWarningMacro("Bad assumption was made on illegal 'unknown length' UN!");
+ gdcmWarningMacro("OffsetOfPreviousParseDES " << std::hex << OffsetOfPreviousParseDES
+ << " offsetStartCurrentSQItem " << offsetStartCurrentSQItem);
+ /// \todo when "Bad assumption (SQ) on illegal 'unknown length' UN", Backtrack again + try OB
+ return false;
+ }
+ else
+ {
+ OffsetOfPreviousParseDES = offsetStartCurrentSQItem;
+ }
+
// fill up the current SQItem, starting at the beginning of fff0,e000
// fill up the current SQItem, starting at the beginning of fff0,e000
Fp->seekg(offsetStartCurrentSQItem, std::ios::beg); // Once per SQItem
ParseDES(itemSQ, offsetStartCurrentSQItem, l+8, dlm_mod);
offsetStartCurrentSQItem = Fp->tellg(); // Once per SQItem
Fp->seekg(offsetStartCurrentSQItem, std::ios::beg); // Once per SQItem
ParseDES(itemSQ, offsetStartCurrentSQItem, l+8, dlm_mod);
offsetStartCurrentSQItem = Fp->tellg(); // Once per SQItem
* Item Starter. We then backtrack to do the job.
* @param docEntry Item Starter that warned us
*/
* Item Starter. We then backtrack to do the job.
* @param docEntry Item Starter that warned us
*/
-DocEntry *Document::Backtrack(DocEntry *docEntry)
+DocEntry *Document::Backtrack(DocEntry *docEntry, DocEntrySet *set)
{
// delete the Item Starter, built erroneously out of any Sequence
// it's not yet in the HTable/chained list
{
// delete the Item Starter, built erroneously out of any Sequence
// it's not yet in the HTable/chained list
gdcmDebugMacro( "Backtrack :" << std::hex << group
<< "|" << elem
<< " at offset 0x(" <<offset << ")" );
gdcmDebugMacro( "Backtrack :" << std::hex << group
<< "|" << elem
<< " at offset 0x(" <<offset << ")" );
- RemoveEntry( PreviousDocEntry );
+
+ set->RemoveEntry( PreviousDocEntry );
// forge the Seq Entry
DocEntry *newEntry = NewSeqEntry(group, elem);
// forge the Seq Entry
DocEntry *newEntry = NewSeqEntry(group, elem);
// Move back to the beginning of the Sequence
Fp->seekg(offset, std::ios::beg); // Only for Shadow Implicit VR SQ
// Move back to the beginning of the Sequence
Fp->seekg(offset, std::ios::beg); // Only for Shadow Implicit VR SQ
+ return newEntry; // It will added where it has to be!
//if ( !CheckDocEntryVR(vr) ) // avoid useless function call
if ( !Global::GetVR()->IsValidVR(vr) )
//if ( !CheckDocEntryVR(vr) ) // avoid useless function call
if ( !Global::GetVR()->IsValidVR(vr) )
- {
-/*
-// std::cout << "================================================================Unknown VR"
- << std::hex << "0x("
- << (unsigned int)vr[0] << "|" << (unsigned int)vr[1]
- << ")" << "for : " << CurrentGroup
- << " at offset : 0x(" << positionOnEntry << ")"
- << std::endl;
-*/
- gdcmWarningMacro( "Unknown VR " << std::hex << "0x("
- << (unsigned int)vr[0] << "|" << (unsigned int)vr[1]
- << ")"
- << " at offset : 0x(" << CurrentOffsetPosition-4<< ") for group " << CurrentGroup
- );
+ gdcmWarningMacro( "Unknown VR " << vr.GetHexaRepresentation()
+ << " at offset : 0x(" << CurrentOffsetPosition-4
+ << ") for group " << std::hex << CurrentGroup );
+
//Fp->seekg(positionOnEntry, std::ios::beg); //JPRx
//Fp->seekg((long)-2, std::ios::cur);// only for unrecognized VR (?!?)
//see :MR_Philips_Intera_PrivateSequenceExplicitVR.dcm
//Fp->seekg(positionOnEntry, std::ios::beg); //JPRx
//Fp->seekg((long)-2, std::ios::cur);// only for unrecognized VR (?!?)
//see :MR_Philips_Intera_PrivateSequenceExplicitVR.dcm
- gdcmWarningMacro( "Warning : Tag with uneven length " << foundLength
- << " in x(" << std::hex << gr << "," << elem <<")");
+ gdcmWarningMacro( "Warning : Tag (" << std::hex << gr << "|" << elem << ") with uneven length "
+ << std::dec << foundLength << " 0x(" << std::hex << foundLength << ") "
+ //<< " at offset x(" << offset << ")"
+ );
//////// Fix for some naughty General Electric images.
// Allthough not recent many such GE corrupted images are still present
// on Creatis hard disks. Hence this fix shall remain when such images
//////// Fix for some naughty General Electric images.
// Allthough not recent many such GE corrupted images are still present
// on Creatis hard disks. Hence this fix shall remain when such images
}
else if ( CurrentElem == 0x0001)
{
}
else if ( CurrentElem == 0x0001)
{
- realVR = "UL"; // Private Group Length To Eng
+ realVR = "UL"; // Private Group Length To End
}
else // check the private dictionary for shadow elements when Implicit VR!
{
}
else // check the private dictionary for shadow elements when Implicit VR!
{
int offset = Fp->tellg();//Only when heuristic for Explicit/Implicit was wrong
gdcmWarningMacro("Entry (" << newEntry->GetKey() << ") at x("
int offset = Fp->tellg();//Only when heuristic for Explicit/Implicit was wrong
gdcmWarningMacro("Entry (" << newEntry->GetKey() << ") at x("
- << offset << ") should be Explicit VR");
+ << std::hex << offset << ") should be Explicit VR");
}
}
newEntry->SetImplicitVR();
}
}
newEntry->SetImplicitVR();
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2007/12/03 11:47:40 $
- Version: $Revision: 1.149 $
+ Date: $Date: 2008/01/02 10:48:52 $
+ Version: $Revision: 1.150 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
void HandleBrokenEndian (uint16_t &group, uint16_t &elem);
void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
void HandleBrokenEndian (uint16_t &group, uint16_t &elem);
void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
- DocEntry *Backtrack(DocEntry *docEntry);
+ DocEntry *Backtrack(DocEntry *docEntry, DocEntrySet *set);
bool changeFromUN;
/// \brief whether an unexpected EOF was encountered
bool UnexpectedEOF;
bool changeFromUN;
/// \brief whether an unexpected EOF was encountered
bool UnexpectedEOF;
+ /// \brief to avoid infinite loop when illegal UN stands for OB
+ size_t OffsetOfPreviousParseDES;
};
} // end namespace gdcm
};
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmJPEGFragment.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmJPEGFragment.cxx,v $
Language: C++
- Date: $Date: 2007/08/22 16:14:04 $
- Version: $Revision: 1.19 $
+ Date: $Date: 2008/01/02 10:48:52 $
+ Version: $Revision: 1.20 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
void JPEGFragment::Print( std::ostream &os, std::string const &indent )
{
os << indent
void JPEGFragment::Print( std::ostream &os, std::string const &indent )
{
os << indent
- << "JPEG fragment: offset : " << Offset
- << " length : " << Length
+ << "JPEG fragment: offset : " << std::dec << Offset
+ << " 0x(" << std::hex << Offset << ") "
+ << std::dec << " length : " << Length
+ << " 0x(" << std::hex << Length << ") "
Program: gdcm
Module: $RCSfile: gdcmVRKey.h,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmVRKey.h,v $
Language: C++
- Date: $Date: 2007/08/22 16:14:05 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2008/01/02 10:48:52 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return key[0] < _val[0] || (key[0] == _val[0] && key[1] < _val[1]);
}
return key[0] < _val[0] || (key[0] == _val[0] && key[1] < _val[1]);
}
+ inline std::string GetHexaRepresentation()
+ {
+ // We could probabelly write something much more complicated using C++ features !
+ // (I really want HexaRepresentation as xx|xx, not ffffffxx|ffffffxx !)
+ char vr_char[6];
+ char buf[5];
+ sprintf(buf, "%04x",( unsigned short int)key[0]);
+ vr_char[0] = buf[2];
+ vr_char[1] = buf[3];
+ sprintf(buf, "%04x",( unsigned short int)key[1]);
+ vr_char[2] = '|';
+ vr_char[3] = buf[2];
+ vr_char[4] = buf[3];
+ vr_char[5] = '\0';
+ return(vr_char);
+ }
+
private :
char key[2];
};
private :
char key[2];
};