X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=550aa731d16a7d903272ca104f8ae3d962a7e37c;hb=fd285cb4d58d253d739ac87e04dccec2a64f9bc0;hp=9f18127593178c59252d1b171093dea920e64d03;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 9f181275..550aa731 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/10/12 04:35:45 $ - Version: $Revision: 1.103 $ + Date: $Date: 2004/10/25 04:47:43 $ + Version: $Revision: 1.114 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,6 +25,7 @@ #include "gdcmDebug.h" #include +#include // For nthos: #ifdef _MSC_VER @@ -33,42 +34,40 @@ #include #endif -#include - namespace gdcm { - -// Implicit VR Little Endian -#define UI1_2_840_10008_1_2 "1.2.840.10008.1.2" -// Explicit VR Little Endian -#define UI1_2_840_10008_1_2_1 "1.2.840.10008.1.2.1" -// Deflated Explicit VR Little Endian -#define UI1_2_840_10008_1_2_1_99 "1.2.840.10008.1.2.1.99" -// Explicit VR Big Endian -#define UI1_2_840_10008_1_2_2 "1.2.840.10008.1.2.2" -// JPEG Baseline (Process 1) -#define UI1_2_840_10008_1_2_4_50 "1.2.840.10008.1.2.4.50" -// JPEG Extended (Process 2 & 4) -#define UI1_2_840_10008_1_2_4_51 "1.2.840.10008.1.2.4.51" -// JPEG Extended (Process 3 & 5) -#define UI1_2_840_10008_1_2_4_52 "1.2.840.10008.1.2.4.52" -// JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8) -#define UI1_2_840_10008_1_2_4_53 "1.2.840.10008.1.2.4.53" -// JPEG Full Progression, Non-Hierarchical (Process 10 & 12) -#define UI1_2_840_10008_1_2_4_55 "1.2.840.10008.1.2.4.55" -// JPEG Lossless, Non-Hierarchical (Process 14) -#define UI1_2_840_10008_1_2_4_57 "1.2.840.10008.1.2.4.57" -// JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, -// [Selection Value 1]) -#define UI1_2_840_10008_1_2_4_70 "1.2.840.10008.1.2.4.70" -// JPEG 2000 Lossless -#define UI1_2_840_10008_1_2_4_90 "1.2.840.10008.1.2.4.90" -// JPEG 2000 -#define UI1_2_840_10008_1_2_4_91 "1.2.840.10008.1.2.4.91" -// RLE Lossless -#define UI1_2_840_10008_1_2_5 "1.2.840.10008.1.2.5" -// UI1_1_2_840_10008_1_2_5 -#define str2num(str, typeNum) *((typeNum *)(str)) +static const char *TransferSyntaxStrings[] = { + // Implicit VR Little Endian + "1.2.840.10008.1.2", + // Explicit VR Little Endian + "1.2.840.10008.1.2.1", + // Deflated Explicit VR Little Endian + "1.2.840.10008.1.2.1.99", + // Explicit VR Big Endian + "1.2.840.10008.1.2.2", + // JPEG Baseline (Process 1) + "1.2.840.10008.1.2.4.50", + // JPEG Extended (Process 2 & 4) + "1.2.840.10008.1.2.4.51", + // JPEG Extended (Process 3 & 5) + "1.2.840.10008.1.2.4.52", + // JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8) + "1.2.840.10008.1.2.4.53", + // JPEG Full Progression, Non-Hierarchical (Process 10 & 12) + "1.2.840.10008.1.2.4.55", + // JPEG Lossless, Non-Hierarchical (Process 14) + "1.2.840.10008.1.2.4.57", + // JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, [Selection Value 1]) + "1.2.840.10008.1.2.4.70", + // JPEG 2000 Lossless + "1.2.840.10008.1.2.4.90", + // JPEG 2000 + "1.2.840.10008.1.2.4.91", + // RLE Lossless + "1.2.840.10008.1.2.5", + // Unknown + "Unknown Transfer Syntax" +}; //----------------------------------------------------------------------------- // Refer to Document::CheckSwap() @@ -85,8 +84,7 @@ const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; * \brief constructor * @param filename file to be opened for parsing */ -Document::Document( std::string const & filename ) - : ElementSet(-1) +Document::Document( std::string const & filename ) : ElementSet(-1) { SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Filename = filename; @@ -99,19 +97,19 @@ Document::Document( std::string const & filename ) dbg.Verbose(0, "Document::Document: starting parsing of file: ", Filename.c_str()); - rewind(Fp); + Fp->seekg( 0, std::ios_base::beg); - fseek(Fp,0L,SEEK_END); - long lgt = ftell(Fp); + Fp->seekg(0, std::ios_base::end); + long lgt = Fp->tellg(); - rewind(Fp); + Fp->seekg( 0, std::ios_base::beg); CheckSwap(); - long beg = ftell(Fp); + long beg = Fp->tellg(); lgt -= beg; ParseDES( this, beg, lgt, false); // le Load sera fait a la volee - rewind(Fp); + Fp->seekg( 0, std::ios_base::beg); // Load 'non string' values @@ -181,8 +179,7 @@ Document::Document( std::string const & filename ) * \brief This default constructor doesn't parse the file. You should * then invoke \ref Document::SetFileName and then the parsing. */ -Document::Document() - :ElementSet(-1) +Document::Document() : ElementSet(-1) { SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Initialise(); @@ -300,12 +297,12 @@ bool Document::IsReadable() * the current document. False either when the document contains * no Transfer Syntax, or when the Tranfer Syntaxes doesn't match. */ -bool Document::IsGivenTransferSyntax(std::string const & syntaxToCheck) +TransferSyntaxType Document::GetTransferSyntax() { DocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010); if ( !entry ) { - return false; + return UnknownTS; } // The entry might be present but not loaded (parsing and loading @@ -317,127 +314,32 @@ bool Document::IsGivenTransferSyntax(std::string const & syntaxToCheck) // The actual transfer (as read from disk) might be padded. We // first need to remove the potential padding. We can make the // weak assumption that padding was not executed with digits... - if ( transfer.length() == 0 ) { // for brain damaged headers - return false; + if ( transfer.length() == 0 ) + { + // for brain damaged headers + return UnknownTS; } - while ( ! isdigit(transfer[transfer.length()-1]) ) + while ( !isdigit(transfer[transfer.length()-1]) ) { transfer.erase(transfer.length()-1, 1); } - if ( transfer == syntaxToCheck ) + for (int i = 0; TransferSyntaxStrings[i] != NULL; i++) { - return true; + if ( TransferSyntaxStrings[i] == transfer ) + { + return TransferSyntaxType(i); + } } } - return false; -} - -/** - * \brief Determines if the Transfer Syntax of the present document - * corresponds to a Implicit Value Representation of - * Little Endian. - * \sa \ref Document::IsGivenTransferSyntax. - * @return True when ImplicitVRLittleEndian found. False in all other cases. - */ -bool Document::IsImplicitVRLittleEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a ExplicitVRLittleEndian one. - * @return True when ExplicitVRLittleEndian found. False in all other cases. - */ -bool Document::IsExplicitVRLittleEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1); + return UnknownTS; } -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a DeflatedExplicitVRLittleEndian one. - * @return True when DeflatedExplicitVRLittleEndian found. False in all other cases. - */ -bool Document::IsDeflatedExplicitVRLittleEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1_99); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a Explicit VR Big Endian one. - * @return True when big endian found. False in all other cases. - */ -bool Document::IsExplicitVRBigEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_2); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGBaseLineProcess1 one. - * @return True when JPEGBaseLineProcess1found. False in all other cases. - */ -bool Document::IsJPEGBaseLineProcess1TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_50); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGExtendedProcess2-4 one. - * @return True when JPEGExtendedProcess2-4 found. False in all other cases. - */ -bool Document::IsJPEGExtendedProcess2_4TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_51); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGExtendeProcess3-5 one. - * @return True when JPEGExtendedProcess3-5 found. False in all other cases. - */ -bool Document::IsJPEGExtendedProcess3_5TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_52); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGSpectralSelectionProcess6-8 one. - * @return True when JPEGSpectralSelectionProcess6-8 found. False in all - * other cases. - */ -bool Document::IsJPEGSpectralSelectionProcess6_8TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_53); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a RLE Lossless one. - * @return True when RLE Lossless found. False in all - * other cases. - */ -bool Document::IsRLELossLessTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_5); -} - -/** - * \brief Determines if Transfer Syntax was already encountered - * and if it corresponds to a JPEG Lossless one. - * @return True when RLE Lossless found. False in all - * other cases. - */ - bool Document::IsJPEGLossless() { - return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_55) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_57) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_70) ); + TransferSyntaxType r = GetTransferSyntax(); + return r == JPEGFullProgressionProcess10_12 + || r == JPEGLosslessProcess14 + || r == JPEGLosslessProcess14_1; } /** @@ -448,8 +350,8 @@ bool Document::IsJPEGLossless() */ bool Document::IsJPEG2000() { - return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_90) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_91) ); + TransferSyntaxType r = GetTransferSyntax(); + return r == JPEG2000Lossless || r == JPEG2000; } /** @@ -457,26 +359,26 @@ bool Document::IsJPEG2000() * of Jpeg encoded Pixel data. * @return True when any form of JPEG found. False otherwise. */ -bool Document::IsJPEGTransferSyntax() +bool Document::IsJPEG() { - return ( IsJPEGBaseLineProcess1TransferSyntax() - || IsJPEGExtendedProcess2_4TransferSyntax() - || IsJPEGExtendedProcess3_5TransferSyntax() - || IsJPEGSpectralSelectionProcess6_8TransferSyntax() - || IsJPEGLossless() - || IsJPEG2000() ); + TransferSyntaxType r = GetTransferSyntax(); + return r == JPEGBaselineProcess1 + || r == JPEGExtendedProcess2_4 + || r == JPEGExtendedProcess3_5 + || r == JPEGSpectralSelectionProcess6_8 + || IsJPEGLossless() + || IsJPEG2000(); } - /** * \brief Determines if the Transfer Syntax corresponds to encapsulated * of encoded Pixel Data (as opposed to native). * @return True when encapsulated. False when native. */ -bool Document::IsEncapsulateTransferSyntax() +bool Document::IsEncapsulate() { - return ( IsJPEGTransferSyntax() - || IsRLELossLessTransferSyntax() ); + TransferSyntaxType r = GetTransferSyntax(); + return IsJPEG() || r == RLELossless; } /** @@ -507,9 +409,9 @@ FileType Document::GetFileType() * checks the preamble when existing. * @return The FILE pointer on success. */ -FILE* Document::OpenFile() +std::ifstream* Document::OpenFile() { - Fp = fopen(Filename.c_str(),"rb"); + Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary); if(!Fp) { @@ -520,7 +422,7 @@ FILE* Document::OpenFile() } uint16_t zero; - fread(&zero, (size_t)2, (size_t)1, Fp); + Fp->read((char*)&zero, (size_t)2 ); //ACR -- or DICOM with no Preamble -- if( zero == 0x0008 || zero == 0x0800 || zero == 0x0002 || zero == 0x0200 ) @@ -529,15 +431,15 @@ FILE* Document::OpenFile() } //DICOM - fseek(Fp, 126L, SEEK_CUR); + Fp->seekg(126L, std::ios_base::cur); char dicm[4]; - fread(dicm, (size_t)4, (size_t)1, Fp); + Fp->read(dicm, (size_t)4); if( memcmp(dicm, "DICM", 4) == 0 ) { return Fp; } - fclose(Fp); + Fp->close(); dbg.Verbose( 0, "Document::OpenFile not DICOM/ACR (missing preamble)", Filename.c_str()); @@ -551,10 +453,11 @@ FILE* Document::OpenFile() */ bool Document::CloseFile() { - int closed = fclose(Fp); + Fp->close(); + delete Fp; Fp = 0; - return closed; + return true; //FIXME how do we detect a non-close ifstream ? } /** @@ -564,7 +467,7 @@ bool Document::CloseFile() * (ACR-NEMA, ExplicitVR, ImplicitVR) * \return Always true. */ -void Document::Write(FILE* fp,FileType filetype) +void Document::Write(std::ofstream* fp, FileType filetype) { /// \todo move the following lines (and a lot of others, to be written) /// to a future function CheckAndCorrectHeader @@ -573,8 +476,8 @@ void Document::Write(FILE* fp,FileType filetype) if (filetype == ImplicitVR) { - std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2; - ReplaceOrCreateByNumber(implicitVRTransfertSyntax,0x0002, 0x0010); + std::string ts = TransferSyntaxStrings[ImplicitVRLittleEndian]; + ReplaceOrCreateByNumber(ts, 0x0002, 0x0010); /// \todo Refer to standards on page 21, chapter 6.2 /// "Value representation": values with a VR of UI shall be @@ -586,8 +489,8 @@ void Document::Write(FILE* fp,FileType filetype) if (filetype == ExplicitVR) { - std::string explicitVRTransfertSyntax = UI1_2_840_10008_1_2_1; - ReplaceOrCreateByNumber(explicitVRTransfertSyntax,0x0002, 0x0010); + std::string ts = TransferSyntaxStrings[ExplicitVRLittleEndian]; + ReplaceOrCreateByNumber(ts, 0x0002, 0x0010); /// \todo Refer to standards on page 21, chapter 6.2 /// "Value representation": values with a VR of UI shall be @@ -627,7 +530,7 @@ ValEntry* Document::ReplaceOrCreateByNumber( std::string const & value, uint16_t group, uint16_t elem, - std::string const & VR ) + TagName const & vr ) { ValEntry* valEntry = 0; DocEntry* currentEntry = GetDocEntryByNumber( group, elem); @@ -643,7 +546,7 @@ ValEntry* Document::ReplaceOrCreateByNumber( DictEntry* dictEntry = pubDict->GetDictEntryByNumber(group, elem); if (!dictEntry) { - currentEntry = NewDocEntryByNumber(group, elem,VR); + currentEntry = NewDocEntryByNumber(group, elem, vr); } else { @@ -706,7 +609,7 @@ BinEntry* Document::ReplaceOrCreateByNumber( int lgth, uint16_t group, uint16_t elem, - std::string const& VR ) + TagName const & vr ) { BinEntry* binEntry = 0; DocEntry* currentEntry = GetDocEntryByNumber( group, elem); @@ -723,7 +626,7 @@ BinEntry* Document::ReplaceOrCreateByNumber( if (!dictEntry) { - currentEntry = NewDocEntryByNumber(group, elem, VR); + currentEntry = NewDocEntryByNumber(group, elem, vr); } else { @@ -780,9 +683,7 @@ BinEntry* Document::ReplaceOrCreateByNumber( * \return pointer to the modified/created SeqEntry (NULL when creation * failed). */ -SeqEntry* Document::ReplaceOrCreateByNumber( - uint16_t group, - uint16_t elem) +SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem) { SeqEntry* b = 0; DocEntry* a = GetDocEntryByNumber( group, elem); @@ -809,7 +710,7 @@ SeqEntry* Document::ReplaceOrCreateByNumber( * \return boolean */ bool Document::ReplaceIfExistByNumber(std::string const & value, - uint16_t group, uint16_t elem ) + uint16_t group, uint16_t elem ) { SetEntryByNumber(value, group, elem); @@ -840,7 +741,7 @@ bool Document::CheckIfEntryExistByNumber(uint16_t group, uint16_t element ) * @return Corresponding element value when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string Document::GetEntryByName(TagName const& tagName) +std::string Document::GetEntryByName(TagName const & tagName) { DictEntry* dictEntry = RefPubDict->GetDictEntryByName(tagName); if( !dictEntry ) @@ -873,7 +774,7 @@ std::string Document::GetEntryVRByName(TagName const& tagName) } DocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(), - dictEntry->GetElement()); + dictEntry->GetElement()); return elem->GetVR(); } @@ -945,7 +846,8 @@ int Document::GetEntryLengthByNumber(uint16_t group, uint16_t element) * @param tagName name of the searched Dicom Element. * @return true when found */ -bool Document::SetEntryByName(std::string const & content,std::string const & tagName) +bool Document::SetEntryByName(std::string const & content, + TagName const & tagName) { DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( !dictEntry ) @@ -966,8 +868,7 @@ bool Document::SetEntryByName(std::string const & content,std::string const & ta * @param element element number of the Dicom Element to modify */ bool Document::SetEntryByNumber(std::string const& content, - uint16_t group, - uint16_t element) + uint16_t group, uint16_t element) { int c; int l; @@ -1019,10 +920,8 @@ bool Document::SetEntryByNumber(std::string const& content, * @param group group number of the Dicom Element to modify * @param element element number of the Dicom Element to modify */ -bool Document::SetEntryByNumber(uint8_t*content, - int lgth, - uint16_t group, - uint16_t element) +bool Document::SetEntryByNumber(uint8_t*content, int lgth, + uint16_t group, uint16_t element) { (void)lgth; //not used TagKey key = DictEntry::TranslateToKey(group, element); @@ -1058,8 +957,7 @@ bool Document::SetEntryByNumber(uint8_t*content, * @return true on success, false otherwise. */ bool Document::SetEntryLengthByNumber(uint32_t l, - uint16_t group, - uint16_t element) + uint16_t group, uint16_t element) { /// \todo use map methods, instead of multimap JPR TagKey key = DictEntry::TranslateToKey(group, element); @@ -1109,7 +1007,12 @@ void* Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem) dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry"); return 0; } - return ((BinEntry *)entry)->GetBinArea(); + if ( BinEntry* binEntry = dynamic_cast(entry) ) + { + return binEntry->GetBinArea(); + } + + return 0; } /** @@ -1126,7 +1029,7 @@ void* Document::LoadEntryBinArea(uint16_t group, uint16_t elem) return NULL; } size_t o =(size_t)docElement->GetOffset(); - fseek(Fp, o, SEEK_SET); + Fp->seekg( o, std::ios_base::beg); size_t l = docElement->GetLength(); uint8_t* a = new uint8_t[l]; if(!a) @@ -1134,14 +1037,14 @@ void* Document::LoadEntryBinArea(uint16_t group, uint16_t elem) dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a"); return NULL; } - size_t l2 = fread(a, 1, l , Fp); - if( l != l2 ) + Fp->read((char*)a, l); + if( Fp->fail() || Fp->eof() )//Fp->gcount() == 1 { delete[] a; return NULL; } - /// \todo Drop any already existing void area! JPR - if( !SetEntryBinAreaByNumber( a, group, elem ) ); + /// \todo Drop any already existing void area! JPR + if( !SetEntryBinAreaByNumber( a, group, elem ) ) { dbg.Verbose(0, "Document::LoadEntryBinArea setting failed."); } @@ -1155,7 +1058,7 @@ void* Document::LoadEntryBinArea(uint16_t group, uint16_t elem) void* Document::LoadEntryBinArea(BinEntry* element) { size_t o =(size_t)element->GetOffset(); - fseek(Fp, o, SEEK_SET); + Fp->seekg(o, std::ios_base::beg); size_t l = element->GetLength(); uint8_t* a = new uint8_t[l]; if( !a ) @@ -1165,8 +1068,8 @@ void* Document::LoadEntryBinArea(BinEntry* element) } element->SetBinArea((uint8_t*)a); /// \todo check the result - size_t l2 = fread(a, 1, l , Fp); - if( l != l2 ) + Fp->read((char*)a, l); + if( Fp->fail() || Fp->eof()) //Fp->gcount() == 1 { delete[] a; return NULL; @@ -1183,8 +1086,7 @@ void* Document::LoadEntryBinArea(BinEntry* element) * @return */ bool Document::SetEntryBinAreaByNumber(uint8_t* area, - uint16_t group, - uint16_t element) + uint16_t group, uint16_t element) { DocEntry* currentEntry = GetDocEntryByNumber(group, element); if ( !currentEntry ) @@ -1254,7 +1156,7 @@ void Document::UpdateShaEntries() * @return Corresponding Dicom Element when it exists, and NULL * otherwise. */ -DocEntry* Document::GetDocEntryByName(std::string const & tagName) +DocEntry* Document::GetDocEntryByName(TagName const & tagName) { DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( !dictEntry ) @@ -1275,8 +1177,7 @@ DocEntry* Document::GetDocEntryByName(std::string const & tagName) * @param element Element number of the searched Dicom Element * @return */ -DocEntry* Document::GetDocEntryByNumber(uint16_t group, - uint16_t element) +DocEntry* Document::GetDocEntryByNumber(uint16_t group, uint16_t element) { TagKey key = DictEntry::TranslateToKey(group, element); if ( !TagHT.count(key)) @@ -1292,8 +1193,7 @@ DocEntry* Document::GetDocEntryByNumber(uint16_t group, * ValEntry. * @return When present, the corresponding ValEntry. */ -ValEntry* Document::GetValEntryByNumber(uint16_t group, - uint16_t element) +ValEntry* Document::GetValEntryByNumber(uint16_t group, uint16_t element) { DocEntry* currentEntry = GetDocEntryByNumber(group, element); if ( !currentEntry ) @@ -1318,9 +1218,9 @@ ValEntry* Document::GetValEntryByNumber(uint16_t group, */ void Document::LoadDocEntrySafe(DocEntry * entry) { - long PositionOnEntry = ftell(Fp); + long PositionOnEntry = Fp->tellg(); LoadDocEntry(entry); - fseek(Fp, PositionOnEntry, SEEK_SET); + Fp->seekg(PositionOnEntry, std::ios_base::beg); } /** @@ -1393,16 +1293,14 @@ uint16_t Document::UnswapShort(uint16_t a) * \brief Parses a DocEntrySet (Zero-level DocEntries or SQ Item DocEntries) * @return length of the parsed set. */ -void Document::ParseDES(DocEntrySet *set, - long offset, - long l_max, - bool delim_mode) +void Document::ParseDES(DocEntrySet *set, long offset, + long l_max, bool delim_mode) { DocEntry *newDocEntry = 0; while (true) { - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } @@ -1445,7 +1343,7 @@ void Document::ParseDES(DocEntrySet *set, { break; } - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } @@ -1487,20 +1385,20 @@ void Document::ParseDES(DocEntrySet *set, if ( ( newDocEntry->GetGroup() == 0x7fe0 ) && ( newDocEntry->GetElement() == 0x0010 ) ) { - if ( IsRLELossLessTransferSyntax() ) + TransferSyntaxType ts = GetTransferSyntax(); + if ( ts == RLELossless ) { - long PositionOnEntry = ftell(Fp); - fseek( Fp, newDocEntry->GetOffset(), SEEK_SET ); + long PositionOnEntry = Fp->tellg(); + Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg ); ComputeRLEInfo(); - fseek( Fp, PositionOnEntry, SEEK_SET ); + Fp->seekg( PositionOnEntry, std::ios_base::beg ); } - else - if ( IsJPEGTransferSyntax() ) + else if ( IsJPEG() ) { - long PositionOnEntry = ftell(Fp); - fseek( Fp, newDocEntry->GetOffset(), SEEK_SET ); + long PositionOnEntry = Fp->tellg(); + Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg ); ComputeJPEGFragmentInfo(); - fseek( Fp, PositionOnEntry, SEEK_SET ); + Fp->seekg( PositionOnEntry, std::ios_base::beg ); } } @@ -1555,7 +1453,7 @@ void Document::ParseDES(DocEntrySet *set, l, delim_mode); } set->AddEntry( newSeqEntry ); - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } @@ -1569,7 +1467,7 @@ void Document::ParseDES(DocEntrySet *set, * @return parsed length for this level */ void Document::ParseSQ( SeqEntry* seqEntry, - long offset, long l_max, bool delim_mode) + long offset, long l_max, bool delim_mode) { int SQItemNumber = 0; bool dlm_mod; @@ -1590,7 +1488,7 @@ void Document::ParseSQ( SeqEntry* seqEntry, break; } } - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } @@ -1617,7 +1515,7 @@ void Document::ParseSQ( SeqEntry* seqEntry, seqEntry->AddEntry( itemSQ, SQItemNumber ); SQItemNumber++; - if ( !delim_mode && ( ftell(Fp) - offset ) >= l_max ) + if ( !delim_mode && ( Fp->tellg() - offset ) >= l_max ) { break; } @@ -1631,12 +1529,11 @@ void Document::ParseSQ( SeqEntry* seqEntry, */ void Document::LoadDocEntry(DocEntry* entry) { - size_t item_read; uint16_t group = entry->GetGroup(); std::string vr = entry->GetVR(); uint32_t length = entry->GetLength(); - fseek(Fp, (long)entry->GetOffset(), SEEK_SET); + Fp->seekg((long)entry->GetOffset(), std::ios_base::beg); // A SeQuence "contains" a set of Elements. // (fffe e000) tells us an Element is beginning @@ -1689,7 +1586,7 @@ void Document::LoadDocEntry(DocEntry* entry) } // to be sure we are at the end of the value ... - fseek(Fp,(long)entry->GetOffset()+(long)entry->GetLength(),SEEK_SET); + Fp->seekg((long)entry->GetOffset()+(long)entry->GetLength(),std::ios_base::beg); return; } @@ -1752,17 +1649,15 @@ void Document::LoadDocEntry(DocEntry* entry) } // We need an additional byte for storing \0 that is not on disk - //std::string newValue(length,0); - //item_read = fread(&(newValue[0]), (size_t)length, (size_t)1, Fp); - //rah !! I can't believe it could work, normally this is a const char* !!! char *str = new char[length+1]; - item_read = fread(str, (size_t)length, (size_t)1, Fp); + Fp->read(str, (size_t)length); str[length] = '\0'; std::string newValue = str; delete[] str; + if ( ValEntry* valEntry = dynamic_cast(entry) ) { - if ( item_read != 1 ) + if ( Fp->fail() || Fp->eof())//Fp->gcount() == 1 { dbg.Verbose(1, "Document::LoadDocEntry", "unread element value"); @@ -1806,7 +1701,7 @@ void Document::FindDocEntryLength( DocEntry *entry ) // 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. - fseek(Fp, 2L, SEEK_CUR); + Fp->seekg( 2L, std::ios_base::cur); uint32_t length32 = ReadInt32(); if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff ) @@ -1825,10 +1720,10 @@ void Document::FindDocEntryLength( DocEntry *entry ) // chance to get the pixels by deciding the element goes // until the end of the file. Hence we artificially fix the // the length and proceed. - long currentPosition = ftell(Fp); - fseek(Fp,0L,SEEK_END); - long lengthUntilEOF = ftell(Fp) - currentPosition; - fseek(Fp, currentPosition, SEEK_SET); + long currentPosition = Fp->tellg(); + Fp->seekg(0L,std::ios_base::end); + long lengthUntilEOF = Fp->tellg() - currentPosition; + Fp->seekg(currentPosition, std::ios_base::beg); entry->SetLength(lengthUntilEOF); return; } @@ -1871,7 +1766,8 @@ void Document::FindDocEntryLength( DocEntry *entry ) // big endian and proceed... if ( element == 0x0000 && length16 == 0x0400 ) { - if ( !IsExplicitVRBigEndianTransferSyntax() ) + TransferSyntaxType ts = GetTransferSyntax(); + if ( ts != ExplicitVRBigEndian ) { throw FormatError( "Document::FindDocEntryLength()", " not explicit VR." ); @@ -1931,7 +1827,7 @@ void Document::FindDocEntryVR( DocEntry *entry ) char vr[3]; - long positionOnEntry = ftell(Fp); + long positionOnEntry = Fp->tellg(); // Warning: we believe this is explicit VR (Value Representation) because // we used a heuristic that found "UL" in the first tag. Alas this // doesn't guarantee that all the tags will be in explicit VR. In some @@ -1940,12 +1836,12 @@ void Document::FindDocEntryVR( DocEntry *entry ) // is in explicit VR and try to fix things if it happens not to be // the case. - fread (vr, (size_t)2,(size_t)1, Fp); + Fp->read (vr, (size_t)2); vr[2] = 0; if( !CheckDocEntryVR(entry, vr) ) { - fseek(Fp, positionOnEntry, SEEK_SET); + Fp->seekg(positionOnEntry, std::ios_base::beg); // When this element is known in the dictionary we shall use, e.g. for // the semantics (see the usage of IsAnInteger), the VR proposed by the // dictionary entry. Still we have to flag the element as implicit since @@ -2190,8 +2086,8 @@ void Document::SkipDocEntry(DocEntry *entry) */ void Document::SkipToNextDocEntry(DocEntry *entry) { - fseek(Fp, (long)(entry->GetOffset()), SEEK_SET); - fseek(Fp, (long)(entry->GetReadLength()), SEEK_CUR); + Fp->seekg((long)(entry->GetOffset()), std::ios_base::beg); + Fp->seekg( (long)(entry->GetReadLength()), std::ios_base::cur); } /** @@ -2202,7 +2098,7 @@ void Document::SkipToNextDocEntry(DocEntry *entry) * @param foundLength fist assumption about length */ void Document::FixDocEntryFoundLength(DocEntry *entry, - uint32_t foundLength) + uint32_t foundLength) { entry->SetReadLength( foundLength ); // will be updated only if a bug is found if ( foundLength == 0xffffffff) @@ -2306,7 +2202,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry) // encounter such an ill-formed image, we simply display a warning // message and proceed on parsing (while crossing fingers). std::ostringstream s; - int filePosition = ftell(Fp); + long filePosition = Fp->tellg(); s << "Erroneous Group Length element length on : (" \ << std::hex << group << " , " << element << ") -before- position x(" << filePosition << ")" @@ -2333,7 +2229,7 @@ uint32_t Document::FindDocEntryLengthOB() throw( FormatUnexpected ) { // See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data. - long positionOnEntry = ftell(Fp); + long positionOnEntry = Fp->tellg(); bool foundSequenceDelimiter = false; uint32_t totalLength = 0; @@ -2359,7 +2255,7 @@ uint32_t Document::FindDocEntryLengthOB() { dbg.Verbose(1, "Document::FindDocEntryLengthOB: neither an Item " "tag nor a Sequence delimiter tag."); - fseek(Fp, positionOnEntry, SEEK_SET); + Fp->seekg(positionOnEntry, std::ios_base::beg); throw FormatUnexpected("Document::FindDocEntryLengthOB()", "Neither an Item tag nor a Sequence " "delimiter tag."); @@ -2380,7 +2276,7 @@ uint32_t Document::FindDocEntryLengthOB() break; } } - fseek(Fp, positionOnEntry, SEEK_SET); + Fp->seekg( positionOnEntry, std::ios_base::beg); return totalLength; } @@ -2393,13 +2289,13 @@ uint16_t Document::ReadInt16() throw( FormatError ) { uint16_t g; - size_t item_read = fread (&g, (size_t)2,(size_t)1, Fp); - if ( item_read != 1 ) + Fp->read ((char*)&g, (size_t)2); + if ( Fp->fail() ) + { + throw FormatError( "Document::ReadInt16()", " file error." ); + } + if( Fp->eof() ) { - if( ferror(Fp) ) - { - throw FormatError( "Document::ReadInt16()", " file error." ); - } throw FormatError( "Document::ReadInt16()", "EOF." ); } g = SwapShort(g); @@ -2415,13 +2311,13 @@ uint32_t Document::ReadInt32() throw( FormatError ) { uint32_t g; - size_t item_read = fread (&g, (size_t)4,(size_t)1, Fp); - if ( item_read != 1 ) + Fp->read ((char*)&g, (size_t)4); + if ( Fp->fail() ) + { + throw FormatError( "Document::ReadInt32()", " file error." ); + } + if( Fp->eof() ) { - if( ferror(Fp) ) - { - throw FormatError( "Document::ReadInt16()", " file error." ); - } throw FormatError( "Document::ReadInt32()", "EOF." ); } g = SwapLong(g); @@ -2436,7 +2332,7 @@ uint32_t Document::ReadInt32() void Document::SkipBytes(uint32_t nBytes) { //FIXME don't dump the returned value - (void)fseek(Fp, (long)nBytes, SEEK_CUR); + Fp->seekg((long)nBytes, std::ios_base::cur); } /** @@ -2447,6 +2343,8 @@ void Document::Initialise() { RefPubDict = Global::GetDicts()->GetDefaultPubDict(); RefShaDict = NULL; + RLEInfo = new RLEFramesInfo; + JPEGInfo = new JPEGFragmentsInfo; } /** @@ -2484,8 +2382,7 @@ bool Document::CheckSwap() // The easiest case is the one of a DICOM header, since it possesses a // file preamble where it suffice to look for the string "DICM". - int lgrLue = fread(deb, 1, HEADER_LENGTH_TO_READ, Fp); - (void)lgrLue; //FIXME not used + Fp->read(deb, HEADER_LENGTH_TO_READ); char *entCur = deb + 128; if( memcmp(entCur, "DICM", (size_t)4) == 0 ) @@ -2549,8 +2446,8 @@ bool Document::CheckSwap() // Position the file position indicator at first tag (i.e. // after the file preamble and the "DICM" string). - rewind(Fp); - fseek (Fp, 132L, SEEK_SET); + Fp->seekg(0, std::ios_base::beg); + Fp->seekg ( 132L, std::ios_base::beg); return true; } // End of DicomV3 @@ -2558,7 +2455,7 @@ bool Document::CheckSwap() // preamble. We can reset the file position indicator to where the data // is (i.e. the beginning of the file). dbg.Verbose(1, "Document::CheckSwap:", "not a DICOM Version3 file"); - rewind(Fp); + Fp->seekg(0, std::ios_base::beg); // Our next best chance would be to be considering a 'clean' ACR/NEMA file. // By clean we mean that the length of the first tag is written down. @@ -2743,7 +2640,7 @@ DocEntry* Document::ReadNextDocEntry() return 0; } - newEntry->SetOffset(ftell(Fp)); + newEntry->SetOffset(Fp->tellg()); return newEntry; } @@ -2783,8 +2680,8 @@ uint32_t Document::GenerateFreeTagKeyInGroup(uint16_t group) */ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement) { - long positionOnEntry = ftell(Fp); - long currentPosition = ftell(Fp); // On debugging purposes + long positionOnEntry = Fp->tellg(); + long currentPosition = Fp->tellg(); // On debugging purposes //// Read the Item Tag group and element, and make // sure they are what we expected: @@ -2801,7 +2698,7 @@ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement) s << " at address: " << (unsigned)currentPosition << std::endl; dbg.Verbose(0, "Document::ReadItemTagLength: wrong Item Tag found:"); dbg.Verbose(0, s.str().c_str()); - fseek(Fp, positionOnEntry, SEEK_SET); + Fp->seekg(positionOnEntry, std::ios_base::beg); return false; } @@ -2824,7 +2721,7 @@ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement) */ uint32_t Document::ReadTagLength(uint16_t testGroup, uint16_t testElement) { - long positionOnEntry = ftell(Fp); + long positionOnEntry = Fp->tellg(); (void)positionOnEntry; if ( !ReadTag(testGroup, testElement) ) @@ -2833,7 +2730,7 @@ uint32_t Document::ReadTagLength(uint16_t testGroup, uint16_t testElement) } //// Then read the associated Item Length - long currentPosition = ftell(Fp); + long currentPosition = Fp->tellg(); uint32_t itemLength = ReadInt32(); { std::ostringstream s; @@ -2863,7 +2760,7 @@ void Document::ReadAndSkipEncapsulatedBasicOffsetTable() if ( itemLength != 0 ) { char* basicOffsetTableItemValue = new char[itemLength + 1]; - fread(basicOffsetTableItemValue, itemLength, 1, Fp); + Fp->read(basicOffsetTableItemValue, itemLength); #ifdef GDCM_DEBUG for (unsigned int i=0; i < itemLength; i += 4 ) @@ -2890,7 +2787,8 @@ void Document::ReadAndSkipEncapsulatedBasicOffsetTable() */ void Document::ComputeRLEInfo() { - if ( ! IsRLELossLessTransferSyntax() ) + TransferSyntaxType ts = GetTransferSyntax(); + if ( ts != RLELossless ) { return; } @@ -2925,9 +2823,14 @@ void Document::ComputeRLEInfo() // Offset Table information on fragments of this current Frame. // Note that the fragment pixels themselves are not loaded // (but just skipped). - long frameOffset = ftell(Fp); + long frameOffset = Fp->tellg(); uint32_t nbRleSegments = ReadInt32(); + if ( nbRleSegments > 16 ) + { + // There should be at most 15 segments (refer to RLEFrame class) + dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments."); + } uint32_t rleSegmentOffsetTable[15]; for( int k = 1; k <= 15; k++ ) @@ -2962,7 +2865,7 @@ void Document::ComputeRLEInfo() newFrameInfo->Offset[uk] = frameOffset + rleSegmentOffsetTable[uk]; newFrameInfo->Length[uk] = rleSegmentLength[uk]; } - RLEInfo.Frames.push_back( newFrameInfo ); + RLEInfo->Frames.push_back( newFrameInfo ); } // Make sure that at the end of the item we encounter a 'Sequence @@ -2983,7 +2886,7 @@ void Document::ComputeRLEInfo() void Document::ComputeJPEGFragmentInfo() { // If you need to, look for comments of ComputeRLEInfo(). - if ( ! IsJPEGTransferSyntax() ) + if ( ! IsJPEG() ) { return; } @@ -2995,13 +2898,13 @@ void Document::ComputeJPEGFragmentInfo() long fragmentLength; while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) ) { - long fragmentOffset = ftell(Fp); + long fragmentOffset = Fp->tellg(); // Store the collected info JPEGFragment* newFragment = new JPEGFragment; newFragment->Offset = fragmentOffset; newFragment->Length = fragmentLength; - JPEGInfo.Fragments.push_back( newFragment ); + JPEGInfo->Fragments.push_back( newFragment ); SkipBytes( fragmentLength ); } @@ -3025,19 +2928,19 @@ void Document::ComputeJPEGFragmentInfo() * @param set The structure to be traversed (recursively). */ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, - DocEntrySet* set ) + DocEntrySet* set ) { if (ElementSet* elementSet = dynamic_cast< ElementSet* > ( set ) ) { - TagDocEntryHT* currentHT = elementSet->GetTagHT(); - for( TagDocEntryHT::const_iterator i = currentHT->begin(); - i != currentHT->end(); + TagDocEntryHT const & currentHT = elementSet->GetTagHT(); + for( TagDocEntryHT::const_iterator i = currentHT.begin(); + i != currentHT.end(); ++i) { DocEntry* entry = i->second; if ( SeqEntry* seqEntry = dynamic_cast(entry) ) { - ListSQItem& items = seqEntry->GetSQItems(); + const ListSQItem& items = seqEntry->GetSQItems(); for( ListSQItem::const_iterator item = items.begin(); item != items.end(); ++item) @@ -3053,15 +2956,15 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, if (SQItem* SQItemSet = dynamic_cast< SQItem* > ( set ) ) { - ListDocEntry& currentList = SQItemSet->GetDocEntries(); - for (ListDocEntry::iterator i = currentList.begin(); - i != currentList.end(); - ++i) + const ListDocEntry& currentList = SQItemSet->GetDocEntries(); + for (ListDocEntry::const_iterator i = currentList.begin(); + i != currentList.end(); + ++i) { DocEntry* entry = *i; if ( SeqEntry* seqEntry = dynamic_cast(entry) ) { - ListSQItem& items = seqEntry->GetSQItems(); + const ListSQItem& items = seqEntry->GetSQItems(); for( ListSQItem::const_iterator item = items.begin(); item != items.end(); ++item)