X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=bd497da659500399d7fe77450548d686606f53b2;hb=1de7de1607a97c20218451b8d8269c1e0ea132b2;hp=3c63f3e8feeb819a03738c2a62cd966a81690243;hpb=04530e8606acf3f15a9d1f85e3c804941b6554a6;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 3c63f3e8..bd497da6 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/08/21 12:51:09 $ - Version: $Revision: 1.367 $ + Date: $Date: 2007/12/05 16:36:21 $ + Version: $Revision: 1.376 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -50,7 +50,7 @@ const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096 /** * \brief This default constructor neither loads nor parses the file. - * You should then invoke \ref Document::Load. + * You should then invoke Document::Load. * */ Document::Document() @@ -281,9 +281,10 @@ bool Document::DoTheLoadingDocumentJob( ) // std::string RecCode; RecCode = GetEntryString(0x0008, 0x0010); // recognition code (RET) - if (RecCode == "ACRNEMA_LIBIDO_1.1" || - RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares - // with "little-endian strings" + + 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); @@ -582,7 +583,7 @@ double Document::SwapDouble(double a) // // -----------------File I/O --------------- /** - * \brief Tries to open the file \ref Document::Filename and + * \brief Tries to open the file Document::Filename and * checks the preamble when existing, * or if the file starts with an ACR-NEMA look-like element. * @return The FILE pointer on success, 0 on failure. @@ -693,7 +694,7 @@ bool Document::CloseFile() * @param filetype Type of the File to be written * (ACR-NEMA, ExplicitVR, ImplicitVR) */ -void Document::WriteContent(std::ofstream *fp, FileType filetype) +void Document::WriteContent(std::ofstream *fp, FileType filetype, bool, bool) { // Skip if user wants to write an ACR-NEMA file @@ -721,8 +722,10 @@ void Document::WriteContent(std::ofstream *fp, FileType filetype) * --> was too much tricky / we were [in a hurry / too lazy] * --> We don't write the element 0x0000 (group length) */ - - ElementSet::WriteContent(fp, filetype, false); // This one is recursive + // This one is recursive + // false : outside MetaElements + // false : outside Sequence + ElementSet::WriteContent(fp, filetype, false, false); } // ----------------------------------------- @@ -851,7 +854,7 @@ void Document::LoadEntryBinArea(DataEntry *entry) //} /** - * \brief Compares two documents, according to \ref DicomDir rules + * \brief Compares two documents, according to DicomDir rules * \warning Does NOT work with ACR-NEMA files * \todo Find a trick to solve the pb (use RET fields ?) * @param document to compare with current one @@ -1033,10 +1036,10 @@ int Document::ComputeGroup0002Length( ) vr = entry->GetVR(); //if ( (vr == "OB")||(vr == "OW")||(vr == "UT")||(vr == "SQ")) - // (no SQ, OW, UT in group 0x0002;) + // (no SQ, OW, OL, UT in group 0x0002;) if ( vr == "OB" ) { - // explicit VR AND (OB, OW, SQ, UT) : 4 more bytes + // explicit VR AND (OB, OW, OL, SQ, UT, UN) : 4 more bytes groupLength += 4; } groupLength += 2 + 2 + 4 + entry->GetLength(); @@ -1522,7 +1525,7 @@ void Document::FindDocEntryLength( DocEntry *entry ) // in the following line. // (the 'straight' images will no longer be readable ...) - if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT" + if ( vr == "OB" || vr == "OW" || vr == "OL" || vr == "SQ" || vr == "UT" || vr == "UN" || changeFromUN == true) { changeFromUN = false; @@ -1530,10 +1533,10 @@ void Document::FindDocEntryLength( DocEntry *entry ) // "7.1.2 Data element structure with explicit vr", p 27) must be // skipped before proceeding on reading the length on 4 bytes. - //Fp->seekg( 2L, std::ios::cur); // Once per OW,OB,SQ DocEntry - uint32_t length32 = ReadInt32(); // Once per OW,OB,SQ DocEntry + //Fp->seekg( 2L, std::ios::cur); // Once per OB,OW,OL,UT,UN,SQ DocEntry + uint32_t length32 = ReadInt32(); // Once per OB,OW,OL,UT,UN,SQ DocEntry CurrentOffsetPosition+=4; - if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff ) + if ( (vr == "OB" || vr == "OW" || vr == "OL") && length32 == 0xffffffff ) { uint32_t lengthOB; try @@ -1619,7 +1622,8 @@ uint32_t Document::FindDocEntryLengthOBOrOW() uint16_t elem; try - { + { ///\todo make sure there is never OL encoded pixel data! + //group = ReadInt16(); // Once per fragment (if any) of OB,OW DataElements //elem = ReadInt16(); // Once per fragment (if any) of OB,OW DataElements ReadBegBuffer(4); // Once per fragment (if any) of OB,OW DataElements @@ -1753,7 +1757,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 @@ -2131,17 +2135,20 @@ bool Document::CheckSwap() } // Check if next 2 bytes are a VR // Probabely something more time-consuming exists with std::string - const char VRvalues[] = "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ"; - int nbVal = 26; + const char VRvalues[] = "AEASATCSDADTFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOLOFATUNSQRT"; + int nbVal = 29; const char *pt = VRvalues; for (int i=0;i= 0x0010 && CurrentElem <=0x00ff ) + { // DICOM PS 3-5 7.8.1 a) states that : // Private Creator Data Elements numbered (gggg,0010-00FF) (gggg is odd) // attributes have to be LO (Long String) and the VM shall be equal to 1 @@ -2259,8 +2267,20 @@ DocEntry *Document::ReadNextDocEntry() // Still in gdcmtk, David Clunnie disagrees, Marco Eichelberg says it's OK ... // We let it for a while? //(We should check length==4, for more security, but we don't have it yet !) + } else if ( CurrentElem == 0x0001) - realVR = "UL"; // Private Group Length To End + { + realVR = "UL"; // Private Group Length To Eng + } + else // check the private dictionary for shadow elements when Implicit VR! + { + DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem); + if ( dictEntry ) + { + realVR = dictEntry->GetVR(); + dictEntry->Unregister(); // GetDictEntry registered it + } + } } else @@ -2281,19 +2301,21 @@ DocEntry *Document::ReadNextDocEntry() DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem); if ( dictEntry ) { - realVR = dictEntry->GetVR(); + realVR = dictEntry->GetVR(); dictEntry->Unregister(); // GetDictEntry registered it // for VR = "UN", length is always stored on 4 bytes. + // remember this info, in order not to crash later changeFromUN=true; - /// \todo : fixme If inside a supposed to be UN DataElement (but SQ according to a private dictionnary) - /// there is some more supposed to be UN DataElements, it will probabely fail. + /// \todo : fixme If inside a vr = "UN" DataElement (but SQ according to a private dictionnary) + /// there is some more vr = "UN" DataElements, it will probabely fail. /// --> find a -non time consuming- trick to store changeFromUN info at DataElement level, /// not at the Document level. + /// --> ?!? JPR + } } - DocEntry *newEntry; //if ( Global::GetVR()->IsVROfSequence(realVR) ) if (realVR == "SQ")