X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=8896d14d0fe73c9b7cb730984dfedc78f6b85c85;hb=21d241b3fdcf675d8d91a6daf6dfd6f448b68195;hp=23766c4ba3576f64d4aeedaa8dd33c229840f8f6;hpb=445c21718f64ec33f183adb37fd40c6c1a882b4a;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 23766c4b..8896d14d 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/09/16 17:19:26 $ - Version: $Revision: 1.279 $ + Date: $Date: 2005/10/10 10:49:24 $ + Version: $Revision: 1.286 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -648,11 +648,10 @@ bool Document::CloseFile() } /** - * \brief Writes in a file all the Header Entries (Dicom Elements) + * \brief Writes in a file all the Entries (Dicom Elements) * @param fp file pointer on an already open file (actually: Output File Stream) * @param filetype Type of the File to be written * (ACR-NEMA, ExplicitVR, ImplicitVR) - * @return Always true. */ void Document::WriteContent(std::ofstream *fp, FileType filetype) { @@ -967,7 +966,9 @@ void Document::ParseDES(DocEntrySet *set, long offset, bool used; // will be set to false when something wrong happens to an Entry. // (Entry will then be deleted) bool delim_mode_intern = delim_mode; - bool first = true; + bool first = true; + gdcmWarningMacro( "Enter in ParseDES, delim-mode " << delim_mode + << " at offset " << std::hex << offset ); while (true) { if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) @@ -977,6 +978,14 @@ void Document::ParseDES(DocEntrySet *set, long offset, newDocEntry = ReadNextDocEntry( ); + // FIXME : + // Private tag, in IMplicit VR are defaulted as a BinEntry, + // Very often they are only composed of Printable characters, + // and could be defaulted as a ValEntry. + // It's too late to do the Job + // (we should check the value, but we know it after LoadDocEntry ...) + // --> in next gdcm major release let's unify ValEntry and BinEntry ! + // Uncoment this printf line to be able to 'follow' the DocEntries // when something *very* strange happens @@ -989,7 +998,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, break; } - // an Item Starter found elsewhere but the first postition + // an Item Starter found elsewhere but the first position // of a SeqEntry means previous entry was a Sequence // but we didn't get it (private Sequence + Implicit VR) // we have to backtrack. @@ -1102,8 +1111,8 @@ void Document::ParseDES(DocEntrySet *set, long offset, { lgrGroup = atoi(strLgrGroup.c_str()); Fp->seekg(lgrGroup, std::ios::cur); - used = false; - RemoveEntry( newDocEntry ); + //used = false; // never used + RemoveEntry( newDocEntry ); // Remove and delete // bcc 5.5 is right "assigned a value that's never used" // newDocEntry = 0; continue; @@ -1149,7 +1158,8 @@ void Document::ParseDES(DocEntrySet *set, long offset, if ( newDocEntry->GetGroup()%2 != 0 ) { Fp->seekg( l, std::ios::cur); - used = false; + RemoveEntry( newDocEntry ); // Remove and delete + //used = false; // never used continue; } } @@ -1157,7 +1167,8 @@ void Document::ParseDES(DocEntrySet *set, long offset, { // User asked to skip *any* SeQuence Fp->seekg( l, std::ios::cur); - used = false; + //used = false; // never used + RemoveEntry( newDocEntry ); // Remove and delete continue; } // delay the dynamic cast as late as possible @@ -1191,9 +1202,17 @@ void Document::ParseDES(DocEntrySet *set, long offset, if ( l != 0 ) { // Don't try to parse zero-length sequences + + gdcmWarningMacro( "Entry in ParseSQ, delim " << delim_mode_intern + << " at offset " << std::hex + << newDocEntry->GetOffset() ); + ParseSQ( newSeqEntry, newDocEntry->GetOffset(), l, delim_mode_intern); + + gdcmWarningMacro( "Exit from ParseSQ, delim " << delim_mode_intern); + } if ( !set->AddEntry( newSeqEntry ) ) { @@ -1204,7 +1223,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, used = false; } - if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) + if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { if ( !used ) delete newDocEntry; @@ -1218,6 +1237,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, } first = false; } // end While + gdcmWarningMacro( "Exit from ParseDES, delim-mode " << delim_mode ); } /** @@ -1335,6 +1355,7 @@ return newEntry; * \brief Loads (or not) the element content depending if its length exceeds * or not the value specified with Document::SetMaxSizeLoadEntry() * @param entry Header Entry (Dicom Element) to be dealt with + * @param forceLoad whether you want to force loading of 'long' elements */ void Document::LoadDocEntry(DocEntry *entry, bool forceLoad) { @@ -1691,7 +1712,7 @@ std::string Document::FindDocEntryVR() * and the taken VR. If they are different, the header entry is * updated with the new VR. * @param vr Dicom Value Representation - * @return false if the VR is incorrect of if the VR isn't referenced + * @return false if the VR is incorrect or if the VR isn't referenced * otherwise, it returns true */ bool Document::CheckDocEntryVR(VRKey vr) @@ -2244,7 +2265,7 @@ DocEntry *Document::ReadNextDocEntry() group = ReadInt16(); elem = ReadInt16(); } - catch ( FormatError e ) + catch ( FormatError ) { // We reached the EOF (or an error occured) therefore // header parsing has to be considered as finished. @@ -2264,7 +2285,15 @@ DocEntry *Document::ReadNextDocEntry() if ( vr == GDCM_UNKNOWN ) { if ( elem == 0x0000 ) // Group Length + { realVR = "UL"; // must be UL + } + else if (group%2 == 1 && (elem >= 0x0010 && elem <=0x00ff )) + { + // DICOM PS 3-5 7.8.1 a) states that those + // (gggg-0010->00FF where gggg is odd) attributes have to be LO + realVR = "LO"; + } else { DictEntry *dictEntry = GetDictEntry(group,elem); @@ -2279,9 +2308,9 @@ DocEntry *Document::ReadNextDocEntry() if ( Global::GetVR()->IsVROfSequence(realVR) ) newEntry = NewSeqEntry(group, elem); else if ( Global::GetVR()->IsVROfStringRepresentable(realVR) ) - newEntry = NewValEntry(group, elem,vr); + newEntry = NewValEntry(group, elem, realVR); else - newEntry = NewBinEntry(group, elem,vr); + newEntry = NewBinEntry(group, elem, realVR); if ( vr == GDCM_UNKNOWN ) { @@ -2305,7 +2334,7 @@ DocEntry *Document::ReadNextDocEntry() { FindDocEntryLength(newEntry); } - catch ( FormatError e ) + catch ( FormatError ) { // Call it quits delete newEntry; @@ -2343,6 +2372,22 @@ void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem) reversedEndian--; SwitchByteSwapCode(); } + else if (group == 0xfeff && elem == 0xdde0) + { + // reversed Sequence Terminator found + // probabely a bug in the header ! + // Do what you want, it breaks ! + //reversedEndian--; + //SwitchByteSwapCode(); + gdcmWarningMacro( "Should never get here! reversed Sequence Terminator!" ); + // fix the tag + group = 0xfffe; + elem = 0xe0dd; + } + else if (group == 0xfffe && elem == 0xe0dd) + { + gdcmWarningMacro( "Straight Sequence Terminator." ); + } } /**