X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=bb3d81df1addaf1a83701eaae7d61b31a299731d;hb=c192f5eb557ecea1d654ac753998a16c36551e81;hp=9ddc85488e7267a23f1a820b337479202ec1b134;hpb=fbf3fda5a04e43eeeadabbbec32605c2d72378b3;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 9ddc8548..bb3d81df 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/01/18 15:52:22 $ - Version: $Revision: 1.196 $ + Date: $Date: 2005/01/20 11:37:37 $ + Version: $Revision: 1.203 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -63,9 +63,12 @@ const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; */ Document::Document( std::string const &filename ) : ElementSet(-1) { + RLEInfo = NULL; + JPEGInfo = NULL; + SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Filename = filename; - Initialise(); + Initialize(); Fp = 0; if ( !OpenFile() ) @@ -139,7 +142,7 @@ Document::Document( std::string const &filename ) : ElementSet(-1) // we switch lineNumber and columnNumber // std::string RecCode; - RecCode = GetEntry(0x0008, 0x0010); // recognition code + RecCode = GetEntry(0x0008, 0x0010); // recognition code (RET) if (RecCode == "ACRNEMA_LIBIDO_1.1" || RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares // with "little-endian strings" @@ -159,10 +162,13 @@ Document::Document( std::string const &filename ) : ElementSet(-1) */ Document::Document() : ElementSet(-1) { + RLEInfo = NULL; + JPEGInfo = NULL; + Fp = 0; SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); - Initialise(); + Initialize(); SwapCode = 1234; Filetype = ExplicitVR; Group0002Parsed = false; @@ -176,8 +182,10 @@ Document::~Document () RefPubDict = NULL; RefShaDict = NULL; - delete RLEInfo; - delete JPEGInfo; + if( RLEInfo ) + delete RLEInfo; + if( JPEGInfo ) + delete JPEGInfo; } //----------------------------------------------------------------------------- @@ -259,7 +267,7 @@ bool Document::IsReadable() if( TagHT.empty() ) { - gdcmVerboseMacro( "No tags in internal hash table."); + gdcmVerboseMacro( "No tag in internal hash table."); return false; } @@ -409,7 +417,7 @@ bool Document::CloseFile() Fp = 0; } - return true; //FIXME how do we detect a non-close ifstream ? + return true; //FIXME how do we detect a non-closed ifstream ? } /** @@ -513,8 +521,8 @@ ValEntry *Document::ReplaceOrCreate(std::string const &value, * when it exists. Create it with the given value when unexistant. * A copy of the binArea is made to be kept in the Document. * @param binArea (binary) value to be set - * @param Group Group number of the Entry - * @param Elem Element number of the Entry + * @param group Group number of the Entry + * @param elem Element number of the Entry * @param vr V(alue) R(epresentation) of the Entry -if private Entry- * \return pointer to the modified/created Header Entry (NULL when creation * failed). @@ -620,7 +628,6 @@ SeqEntry *Document::ReplaceOrCreate( uint16_t group, uint16_t elem) } } } - // Create a new seqEntry if necessary if (!seqEntry) { @@ -634,7 +641,6 @@ SeqEntry *Document::ReplaceOrCreate( uint16_t group, uint16_t elem) return NULL; } } - return seqEntry; } @@ -779,7 +785,7 @@ bool Document::SetEntry(uint8_t*content, int lgth, * @param content new value (string) to substitute with * @param entry Entry to be modified */ -bool Document::SetEntry(std::string const &content,ValEntry *entry) +bool Document::SetEntry(std::string const &content, ValEntry *entry) { if(entry) { @@ -839,8 +845,8 @@ void *Document::GetEntryBinArea(uint16_t group, uint16_t elem) } /** - * \brief Loads (from disk) the element content - * when a string is not suitable + * \brief Loads (from disk) the element content + * when a string is not suitable * @param group group number of the Entry * @param elem element number of the Entry */ @@ -859,8 +865,8 @@ void Document::LoadEntryBinArea(uint16_t group, uint16_t elem) } /** - * \brief Loads (from disk) the element content - * when a string is not suitable + * \brief Loads (from disk) the element content + * when a string is not suitable * @param elem Entry whose binArea is going to be loaded */ void Document::LoadEntryBinArea(BinEntry *elem) @@ -879,7 +885,7 @@ void Document::LoadEntryBinArea(BinEntry *elem) uint8_t *a = new uint8_t[l]; if( !a ) { - gdcmVerboseMacro( "Cannot allocate a"); + gdcmVerboseMacro( "Cannot allocate BinEntry content"); return; } @@ -922,78 +928,11 @@ void Document::LoadEntryBinArea(BinEntry *elem) return false; }*/ -/** - * \brief retrieves a Dicom Element (the first one) using (group, element) - * \warning (group, element) IS NOT an identifier inside the Dicom Header - * if you think it's NOT UNIQUE, check the count number - * and use iterators to retrieve ALL the Dicoms Elements within - * a given couple (group, element) - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return - */ -DocEntry *Document::GetDocEntry(uint16_t group, uint16_t elem) -{ - TagKey key = DictEntry::TranslateToKey(group, elem); - if ( !TagHT.count(key)) - { - return NULL; - } - return TagHT.find(key)->second; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * ValEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding ValEntry. - */ -ValEntry *Document::GetValEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( ValEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound ValEntry."); - - return 0; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * BinEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding BinEntry. - */ -BinEntry *Document::GetBinEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( BinEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound BinEntry."); - - return 0; -} /** - * \brief Loads the element while preserving the current - * underlying file position indicator as opposed to - * to LoadDocEntry that modifies it. + * \brief Loads the element while preserving the current + * underlying file position indicator as opposed to + * LoadDocEntry that modifies it. * @param entry Header Entry whose value will be loaded. * @return */ @@ -1108,7 +1047,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, { if ( newBinEntry ) { - if ( ! Global::GetVR()->IsVROfBinaryRepresentable(vr) ) + if ( Filetype == ExplicitVR && ! Global::GetVR()->IsVROfBinaryRepresentable(vr) ) { ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR gdcmVerboseMacro( std::hex << newDocEntry->GetGroup() @@ -1120,9 +1059,8 @@ void Document::ParseDES(DocEntrySet *set, long offset, //////////////////// BinEntry or UNKOWN VR: // When "this" is a Document the Key is simply of the // form ( group, elem )... - if (/*Document *dummy =*/ dynamic_cast< Document* > ( set ) ) + if ( dynamic_cast< Document* > ( set ) ) { - //(void)dummy; newBinEntry->SetKey( newBinEntry->GetKey() ); } // but when "this" is a SQItem, we are inserting this new @@ -1147,9 +1085,8 @@ void Document::ParseDES(DocEntrySet *set, long offset, /////////////////////// ValEntry // When "set" is a Document, then we are at the top of the // hierarchy and the Key is simply of the form ( group, elem )... - if (/*Document *dummy =*/ dynamic_cast< Document* > ( set ) ) + if ( dynamic_cast< Document* > ( set ) ) { - //(void)dummy; newValEntry->SetKey( newValEntry->GetKey() ); } // ...but when "set" is a SQItem, we are inserting this new @@ -1288,7 +1225,7 @@ void Document::ParseSQ( SeqEntry *seqEntry, { if ( newDocEntry->IsSequenceDelimitor() ) { - seqEntry->SetSequenceDelimitationItem( newDocEntry ); + seqEntry->SetDelimitationItem( newDocEntry ); break; } } @@ -1331,7 +1268,7 @@ void Document::ParseSQ( SeqEntry *seqEntry, offsetStartCurrentSQItem = Fp->tellg(); // end try ----------------- - seqEntry->AddEntry( itemSQ, SQItemNumber ); + seqEntry->AddSQItem( itemSQ, SQItemNumber ); SQItemNumber++; if ( !delim_mode && ((long)(Fp->tellg())-offset ) >= l_max ) { @@ -1606,34 +1543,33 @@ void Document::FindDocEntryLength( DocEntry *entry ) // hands on a big endian encoded file: we switch the swap code to // big endian and proceed... - // - // if ( element == 0x0000 && length16 == 0x0400 ) - // { - // std::string ts = GetTransferSyntax(); - // if ( Global::GetTS()->GetSpecialTransferSyntax(ts) - // != TS::ExplicitVRBigEndian ) - // { - // throw FormatError( "Document::FindDocEntryLength()", - // " not explicit VR." ); - // return; - // } - // length16 = 4; - // SwitchByteSwapCode(); - - // Restore the unproperly loaded values i.e. the group, the element - // and the dictionary entry depending on them. -// uint16_t correctGroup = SwapShort( entry->GetGroup() ); +// if ( element == 0x0000 && length16 == 0x0400 ) +// { +// std::string ts = GetTransferSyntax(); +// if ( Global::GetTS()->GetSpecialTransferSyntax(ts) +// != TS::ExplicitVRBigEndian ) +// { +// throw FormatError( "Document::FindDocEntryLength()", +// " not explicit VR." ); +// return; +// } +// length16 = 4; +// SwitchByteSwapCode(); +// +// // Restore the unproperly loaded values i.e. the group, the element +// // and the dictionary entry depending on them. +// uint16_t correctGroup = SwapShort( entry->GetGroup() ); // uint16_t correctElem = SwapShort( entry->GetElement() ); -// DictEntry *newTag = GetDictEntry( correctGroup, correctElem ); if ( !newTag ) +// DictEntry *newTag = GetDictEntry( correctGroup, correctElem ); +// if ( !newTag ) // { - // This correct tag is not in the dictionary. Create a new one. +// // This correct tag is not in the dictionary. Create a new one. // newTag = NewVirtualDictEntry(correctGroup, correctElem); // } - // FIXME this can create a memory leaks on the old entry that be - // left unreferenced. +// // FIXME this can create a memory leaks on the old entry that be +// // left unreferenced. // entry->SetDictEntry( newTag ); // } - // 0xffff means that we deal with 'No Length' Sequence // or 'No Length' SQItem @@ -1652,6 +1588,9 @@ void Document::FindDocEntryLength( DocEntry *entry ) // on Data elements "Implicit and Explicit VR Data Elements shall // not coexist in a Data Set and Data Sets nested within it".] // Length is on 4 bytes. + + // Well ... group 0002 is always coded in 'Explicit VR Litle Endian' + // even if Transfer Syntax is 'Implicit VR ...' FixDocEntryFoundLength( entry, ReadInt32() ); return; @@ -2100,7 +2039,7 @@ void Document::SkipBytes(uint32_t nBytes) * \brief Loads all the needed Dictionaries * \warning NOT end user intended method ! */ -void Document::Initialise() +void Document::Initialize() { RefPubDict = Global::GetDicts()->GetDefaultPubDict(); RefShaDict = NULL; @@ -2293,8 +2232,6 @@ bool Document::CheckSwap() } } - - /** * \brief Change the Byte Swap code. */ @@ -2345,7 +2282,6 @@ void Document::SetMaxSizeLoadEntry(long newSize) */ void Document::SetMaxSizePrintEntry(long newSize) { - //DOH !! This is exactly SetMaxSizeLoadEntry FIXME FIXME if ( newSize < 0 ) { return; @@ -2390,7 +2326,6 @@ void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem) /** * \brief Accesses the info from 0002,0010 : Transfer Syntax and TS - * else 1. * @return The full Transfer Syntax Name (as opposed to Transfer Syntax UID) */ std::string Document::GetTransferSyntaxName() @@ -2438,6 +2373,13 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) return; } + // Group 0002 is always 'Explicit ...' enven when Transfer Syntax says 'Implicit ..." + + if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian ) + { + Filetype = ImplicitVR; + } + // FIXME Strangely, this works with //'Implicit VR Transfer Syntax (GE Private) if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian ) @@ -2446,7 +2388,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) << GetTransferSyntaxName() << "]" ); SwitchByteSwapCode(); group = SwapShort(group); - elem = SwapShort(elem); + elem = SwapShort(elem); } } }