X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocument.cxx;h=bb7a48e6330a04090c60bd089af320584bdc91b4;hb=46219bf8615127f9ab240e9bcc2efa30ba503b04;hp=77af0cc52660ac0d3414266a3b662ade6daafe28;hpb=2ae8698d36d498b85f9766b5bc54f42d19d81193;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 77af0cc5..bb7a48e6 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/06/18 11:10:17 $ - Version: $Revision: 1.361 $ + Date: $Date: 2007/10/24 10:38:51 $ + Version: $Revision: 1.374 $ 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() @@ -582,7 +582,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 +693,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 +721,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); // This one is recursive + // This one is recursive + // false : outside MetaElements + // false : outside Sequence + ElementSet::WriteContent(fp, filetype, false, false); } // ----------------------------------------- @@ -851,7 +853,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 +1035,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) : 4 more bytes groupLength += 4; } groupLength += 2 + 2 + 4 + entry->GetLength(); @@ -1349,7 +1351,6 @@ bool Document::ParseSQ( SeqEntry *seqEntry, gdcmWarningMacro("in ParseSQ : should never get here!"); UnexpectedEOF = true; return false; - //break; } if ( delim_mode ) { @@ -1513,18 +1514,28 @@ void Document::FindDocEntryLength( DocEntry *entry ) uint16_t length16; if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) { - if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT" - || vr == "UN" || changeFromUN == true) + + // WARNING : + // + // For some images, length of UN elements is coded on 2 bytes (instead of 4) + // There are *not* readable ! + // You can make a quick and dirty patch, commenting out + //| vr == "UN" + // in the following line. + // (the 'straight' images will no longer be readable ...) + + if ( vr == "OB" || vr == "OW" || vr == "OL" || vr == "SQ" || vr == "UT" + || vr == "UN" || changeFromUN == true) { changeFromUN = false; // The following reserved two bytes (see PS 3.5-2003, section // "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,SQ DocEntry + uint32_t length32 = ReadInt32(); // Once per Ob,OW,OL,SQ DocEntry CurrentOffsetPosition+=4; - if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff ) + if ( (vr == "OB" || vr == "OW" || vr == "OL") && length32 == 0xffffffff ) { uint32_t lengthOB; try @@ -1610,7 +1621,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 @@ -2103,26 +2115,18 @@ bool Document::CheckSwap() return false; s16 = *((uint16_t *)(deb+2)); - //s32 = *((uint32_t *)(deb)); Fp->seekg ( 0L, std::ios::beg); // Once per Document CurrentOffsetPosition = 0; switch(s16) // try an other trick! // -> to be able to decode 0029|1010 DataElement // -> and be not less cleaver than dcmdump ;-) { - case 0x00040000 : - SwapCode = 4321; + case 0x0004 : + SwapCode = 1234; break; - case 0x04000000 : + case 0x0400 : SwapCode = 3412; - break; - case 0x00000400 : - SwapCode = 2143; - break; - case 0x00000004 : - SwapCode = 1234; - break; - + break; default: gdcmWarningMacro("ACR/NEMA unfound swap info (Hopeless !)"); Filetype = Unknown; @@ -2130,17 +2134,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 those - // (gggg-0010->00FF where gggg is odd) attributes have to be LO - realVR = "LO"; + // -> Better we fix the problem at Write time + + else if (CurrentGroup%2 == 1 ) + { + if (CurrentElem >= 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 + realVR = "LO"; + + // Seems not to be true + // 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 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 { DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem);//only when ImplicitVR @@ -2278,13 +2306,12 @@ DocEntry *Document::ReadNextDocEntry() // for VR = "UN", length is always stored on 4 bytes. 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 UN DataElements, it will probabely fail. + /// there is some more supposed to be UN DataElements, it will probabely fail. /// --> find a -non time consuming- trick to store changeFromUN info at DataElement level, /// not at the Document level. } } - DocEntry *newEntry; //if ( Global::GetVR()->IsVROfSequence(realVR) ) if (realVR == "SQ")