X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=11b88a2e6fefc1d8b1aebba0dd568c1c0cdeda05;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=ddf263823ed14731de46efe1cc96ff9c80093a76;hpb=e03404553dab0703ac247cec2bb6d655833b0e6e;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index ddf26382..11b88a2e 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2007/12/03 11:46:38 $ - Version: $Revision: 1.375 $ + Date: $Date: 2008/09/15 15:49:22 $ + Version: $Revision: 1.381 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -63,6 +63,7 @@ Document::Document() SwapCode = 1234; Filetype = ExplicitVR; CurrentOffsetPosition = 0; + OffsetOfPreviousParseDES =0; // Load will set it to true if sucessfull Group0002Parsed = false; IsDocumentAlreadyLoaded = false; @@ -161,6 +162,7 @@ bool Document::DoTheLoadingDocumentJob( ) // Recursive call. // Loading is done during parsing + OffsetOfPreviousParseDES = beg; ParseDES( this, beg, lgt, false); // delim_mode is first defaulted to false if ( IsEmpty() ) @@ -282,10 +284,12 @@ bool Document::DoTheLoadingDocumentJob( ) std::string RecCode; RecCode = GetEntryString(0x0008, 0x0010); // recognition code (RET) + if(RecCode.find("ACRNEMA_LIBIDO") == 0 || // any version RecCode.find("CANRME_AILIBOD") == 0) // for brain-damaged softwares // with "little-endian strings" { + Filetype = ACR_LIBIDO; std::string rows = GetEntryString(0x0028, 0x0010); std::string columns = GetEntryString(0x0028, 0x0011); @@ -1117,14 +1121,14 @@ void Document::ParseDES(DocEntrySet *set, long offset, { ///\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 -/* + 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++ :-( @@ -1152,7 +1156,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, if ( !first && newDocEntry->IsItemStarter() ) { // Debug message within the method ! - newDocEntry = Backtrack(newDocEntry); + newDocEntry = Backtrack(newDocEntry, set); } else { @@ -1226,7 +1230,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, { /////////////////////// SeqEntry : VR = "SQ" - unsigned long l = newDocEntry->GetReadLength(); + unsigned long l = newDocEntry->GetReadLength(); if ( l != 0 ) // don't mess the delim_mode for 'zero-length sequence' { if ( l == 0xffffffff ) @@ -1325,7 +1329,9 @@ void Document::ParseDES(DocEntrySet *set, long offset, first = false; if (UnexpectedEOF) // some terminator was missing + { break; + } } // end While gdcmDebugMacro( "Exit from ParseDES, delim-mode " << delim_mode ); } @@ -1383,8 +1389,22 @@ bool Document::ParseSQ( SeqEntry *seqEntry, dlm_mod = false; } + // 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!" << std::endl << + "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 - Fp->seekg(offsetStartCurrentSQItem, std::ios::beg); // Once per SQItem ParseDES(itemSQ, offsetStartCurrentSQItem, l+8, dlm_mod); offsetStartCurrentSQItem = Fp->tellg(); // Once per SQItem @@ -1406,9 +1426,10 @@ bool Document::ParseSQ( SeqEntry *seqEntry, * \brief When a private Sequence + Implicit VR is encountered * we cannot guess it's a Sequence till we find the first * Item Starter. We then backtrack to do the job. - * @param docEntry Item Starter that warned us + * @param docEntry Item Starter that warned us + * @param set DocEntrySet (ElementSet/SQItem) the DocEntry will belong */ -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 @@ -1423,7 +1444,8 @@ DocEntry *Document::Backtrack(DocEntry *docEntry) gdcmDebugMacro( "Backtrack :" << std::hex << group << "|" << elem << " at offset 0x(" <RemoveEntry( PreviousDocEntry ); // forge the Seq Entry DocEntry *newEntry = NewSeqEntry(group, elem); @@ -1433,7 +1455,7 @@ DocEntry *Document::Backtrack(DocEntry *docEntry) // Move back to the beginning of the Sequence Fp->seekg(offset, std::ios::beg); // Only for Shadow Implicit VR SQ - return newEntry; + return newEntry; // It will added where it has to be! } /** @@ -1526,7 +1548,7 @@ void Document::FindDocEntryLength( DocEntry *entry ) // (the 'straight' images will no longer be readable ...) if ( vr == "OB" || vr == "OW" || vr == "OL" || vr == "SQ" || vr == "UT" - || vr == "UN" || changeFromUN == true) + || vr == "UN" || changeFromUN == true) { changeFromUN = false; // The following reserved two bytes (see PS 3.5-2003, section @@ -1642,8 +1664,8 @@ uint32_t Document::FindDocEntryLengthOBOrOW() { gdcmWarningMacro( "Neither an Item tag nor a Sequence delimiter tag on :" - << std::hex << group << " , " << elem - << ")" ); + << std::hex << group << "|" << elem << ") Pos. on entry was 0x(" <seekg(positionOnEntry, std::ios::beg); // Once per fragment (if any) of OB,OW DataElements throw FormatUnexpected( @@ -1704,21 +1726,12 @@ VRKey Document::FindDocEntryVR() //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() << std::hex + << " 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 @@ -1757,7 +1770,7 @@ void Document::SkipDocEntry(DocEntry *entry) void Document::SkipToNextDocEntry(DocEntry *currentDocEntry) { long l = currentDocEntry->GetReadLength(); - if ( l == -1 ) // length = 0xffff shouldn't appear here ... + if ( (uint32_t) l == (uint32_t)-1 ) // length = 0xffff shouldn't appear here ... // ... but PMS imagers happen ! return; Fp->seekg((size_t)(currentDocEntry->GetOffset()), std::ios::beg); //FIXME :each DocEntry @@ -1792,10 +1805,12 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, if ( foundLength % 2) { - 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 @@ -2270,7 +2285,7 @@ DocEntry *Document::ReadNextDocEntry() } 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! { @@ -2341,7 +2356,7 @@ DocEntry *Document::ReadNextDocEntry() 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();