X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=25fac9debfc836e27845097f265d1d54794410b3;hb=dd2ef610b9d1f7be02fc7d620129f3ea8b4a5376;hp=543315b9a869c3094a90deea38e15b0cd4675c1a;hpb=d6b6699d3df0af4e4ae3d4d21d88b289ad95efbc;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 543315b9..25fac9de 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/09/21 10:46:10 $ - Version: $Revision: 1.83 $ + Date: $Date: 2004/10/24 03:33:40 $ + Version: $Revision: 1.111 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -20,12 +20,12 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" - #include "gdcmGlobal.h" #include "gdcmUtil.h" #include "gdcmDebug.h" #include +#include // For nthos: #ifdef _MSC_VER @@ -34,47 +34,48 @@ #include #endif -# include - -// 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)) +namespace gdcm +{ +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 gdcmDocument::CheckSwap() -const unsigned int gdcmDocument::HEADER_LENGTH_TO_READ = 256; +// Refer to Document::CheckSwap() +const unsigned int Document::HEADER_LENGTH_TO_READ = 256; -// Refer to gdcmDocument::SetMaxSizeLoadEntry() -const unsigned int gdcmDocument::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096 -const unsigned int gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; +// Refer to Document::SetMaxSizeLoadEntry() +const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096 +const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; //----------------------------------------------------------------------------- // Constructor / Destructor @@ -83,8 +84,7 @@ const unsigned int gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; * \brief constructor * @param filename file to be opened for parsing */ -gdcmDocument::gdcmDocument( std::string const & filename ) - : gdcmElementSet(-1) +Document::Document( std::string const & filename ) : ElementSet(-1) { SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Filename = filename; @@ -95,56 +95,56 @@ gdcmDocument::gdcmDocument( std::string const & filename ) return; } - dbg.Verbose(0, "gdcmDocument::gdcmDocument: starting parsing of file: ", + 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; - (void)ParseDES( this, beg, lgt, false); // le Load sera fait a la volee + 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 std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004); if( PhotometricInterpretation == "PALETTE COLOR " ) { - LoadEntryVoidArea(0x0028,0x1200); // gray LUT + LoadEntryBinArea(0x0028,0x1200); // gray LUT /// FIXME FIXME FIXME /// The tags refered by the three following lines used to be CORRECTLY /// defined as having an US Value Representation in the public /// dictionnary. BUT the semantics implied by the three following /// lines state that the corresponding tag contents are in fact - /// the ones of a gdcmBinEntry. + /// the ones of a BinEntry. /// In order to fix things "Quick and Dirty" the dictionnary was /// altered on PURPOUS but now contains a WRONG value. /// In order to fix things and restore the dictionary to its /// correct value, one needs to decided of the semantics by deciding /// wether the following tags are either: - /// - multivaluated US, and hence loaded as gdcmValEntry, but afterwards - /// also used as gdcmBinEntry, which requires the proper conversion, - /// - OW, and hence loaded as gdcmBinEntry, but afterwards also used - /// as gdcmValEntry, which requires the proper conversion. - LoadEntryVoidArea(0x0028,0x1201); // R LUT - LoadEntryVoidArea(0x0028,0x1202); // G LUT - LoadEntryVoidArea(0x0028,0x1203); // B LUT + /// - multivaluated US, and hence loaded as ValEntry, but afterwards + /// also used as BinEntry, which requires the proper conversion, + /// - OW, and hence loaded as BinEntry, but afterwards also used + /// as ValEntry, which requires the proper conversion. + LoadEntryBinArea(0x0028,0x1201); // R LUT + LoadEntryBinArea(0x0028,0x1202); // G LUT + LoadEntryBinArea(0x0028,0x1203); // B LUT // Segmented Red Palette Color LUT Data - LoadEntryVoidArea(0x0028,0x1221); + LoadEntryBinArea(0x0028,0x1221); // Segmented Green Palette Color LUT Data - LoadEntryVoidArea(0x0028,0x1222); + LoadEntryBinArea(0x0028,0x1222); // Segmented Blue Palette Color LUT Data - LoadEntryVoidArea(0x0028,0x1223); + LoadEntryBinArea(0x0028,0x1223); } //FIXME later : how to use it? - LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent) + LoadEntryBinArea(0x0028,0x3006); //LUT Data (CTX dependent) CloseFile(); @@ -164,7 +164,7 @@ gdcmDocument::gdcmDocument( std::string const & filename ) RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares // with "little-endian strings" { - Filetype = gdcmACR_LIBIDO; + Filetype = ACR_LIBIDO; std::string rows = GetEntryByNumber(0x0028, 0x0010); std::string columns = GetEntryByNumber(0x0028, 0x0011); SetEntryByNumber(columns, 0x0028, 0x0010); @@ -177,10 +177,9 @@ gdcmDocument::gdcmDocument( std::string const & filename ) /** * \brief This default constructor doesn't parse the file. You should - * then invoke \ref gdcmDocument::SetFileName and then the parsing. + * then invoke \ref Document::SetFileName and then the parsing. */ -gdcmDocument::gdcmDocument() - :gdcmElementSet(-1) +Document::Document() : ElementSet(-1) { SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Initialise(); @@ -190,7 +189,7 @@ gdcmDocument::gdcmDocument() /** * \brief Canonical destructor. */ -gdcmDocument::~gdcmDocument () +Document::~Document () { RefPubDict = NULL; RefShaDict = NULL; @@ -211,7 +210,7 @@ gdcmDocument::~gdcmDocument () * \brief Prints The Dict Entries of THE public Dicom Dictionary * @return */ -void gdcmDocument::PrintPubDict(std::ostream & os) +void Document::PrintPubDict(std::ostream & os) { RefPubDict->Print(os); } @@ -220,7 +219,7 @@ void gdcmDocument::PrintPubDict(std::ostream & os) * \brief Prints The Dict Entries of THE shadow Dicom Dictionary * @return */ -void gdcmDocument::PrintShaDict(std::ostream & os) +void Document::PrintShaDict(std::ostream & os) { RefShaDict->Print(os); } @@ -230,7 +229,7 @@ void gdcmDocument::PrintShaDict(std::ostream & os) /** * \brief Get the public dictionary used */ -gdcmDict *gdcmDocument::GetPubDict() +Dict* Document::GetPubDict() { return RefPubDict; } @@ -238,7 +237,7 @@ gdcmDict *gdcmDocument::GetPubDict() /** * \brief Get the shadow dictionary used */ -gdcmDict *gdcmDocument::GetShaDict() +Dict* Document::GetShaDict() { return RefShaDict; } @@ -247,7 +246,7 @@ gdcmDict *gdcmDocument::GetShaDict() * \brief Set the shadow dictionary used * \param dict dictionary to use in shadow */ -bool gdcmDocument::SetShaDict(gdcmDict *dict) +bool Document::SetShaDict(Dict *dict) { RefShaDict = dict; return !RefShaDict; @@ -257,31 +256,31 @@ bool gdcmDocument::SetShaDict(gdcmDict *dict) * \brief Set the shadow dictionary used * \param dictName name of the dictionary to use in shadow */ -bool gdcmDocument::SetShaDict(DictKey const & dictName) +bool Document::SetShaDict(DictKey const & dictName) { - RefShaDict = gdcmGlobal::GetDicts()->GetDict(dictName); + RefShaDict = Global::GetDicts()->GetDict(dictName); return !RefShaDict; } /** * \brief This predicate, based on hopefully reasonable heuristics, - * decides whether or not the current gdcmDocument was properly parsed + * decides whether or not the current Document was properly parsed * and contains the mandatory information for being considered as * a well formed and usable Dicom/Acr File. - * @return true when gdcmDocument is the one of a reasonable Dicom/Acr file, + * @return true when Document is the one of a reasonable Dicom/Acr file, * false otherwise. */ -bool gdcmDocument::IsReadable() +bool Document::IsReadable() { - if( Filetype == gdcmUnknown) + if( Filetype == Unknown) { - dbg.Verbose(0, "gdcmDocument::IsReadable: wrong filetype"); + dbg.Verbose(0, "Document::IsReadable: wrong filetype"); return false; } if( TagHT.empty() ) { - dbg.Verbose(0, "gdcmDocument::IsReadable: no tags in internal" + dbg.Verbose(0, "Document::IsReadable: no tags in internal" " hash table."); return false; } @@ -298,163 +297,95 @@ bool gdcmDocument::IsReadable() * the current document. False either when the document contains * no Transfer Syntax, or when the Tranfer Syntaxes doesn't match. */ -bool gdcmDocument::IsGivenTransferSyntax(std::string const & syntaxToCheck) +TransferSyntaxType Document::GetTransferSyntax() { - gdcmDocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010); + DocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010); if ( !entry ) { - return false; + return UnknownTS; } // The entry might be present but not loaded (parsing and loading // happen at different stages): try loading and proceed with check... LoadDocEntrySafe(entry); - if (gdcmValEntry* valEntry = dynamic_cast< gdcmValEntry* >(entry) ) + if (ValEntry* valEntry = dynamic_cast< ValEntry* >(entry) ) { std::string transfer = valEntry->GetValue(); // 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 gdcmDocument::IsGivenTransferSyntax. - * @return True when ImplicitVRLittleEndian found. False in all other cases. - */ -bool gdcmDocument::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 gdcmDocument::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 gdcmDocument::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 gdcmDocument::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 gdcmDocument::IsJPEGBaseLineProcess1TransferSyntax() +bool Document::IsJPEGLossless() { - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_50); + TransferSyntaxType r = GetTransferSyntax(); + return r == JPEGFullProgressionProcess10_12 + || r == JPEGLosslessProcess14 + || r == JPEGLosslessProcess14_1; } /** * \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 gdcmDocument::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 gdcmDocument::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 + * and if it corresponds to a JPEG2000 one + * @return True when JPEG2000 (Lossly or LossLess) found. False in all * other cases. */ -bool gdcmDocument::IsJPEGSpectralSelectionProcess6_8TransferSyntax() +bool Document::IsJPEG2000() { - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_53); + TransferSyntaxType r = GetTransferSyntax(); + return r == JPEG2000Lossless || r == JPEG2000; } /** - * \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. + * \brief Determines if the Transfer Syntax corresponds to any form + * of Jpeg encoded Pixel data. + * @return True when any form of JPEG found. False otherwise. */ -bool gdcmDocument::IsRLELossLessTransferSyntax() +bool Document::IsJPEG() { - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_5); + TransferSyntaxType r = GetTransferSyntax(); + return r == JPEGBaselineProcess1 + || r == JPEGExtendedProcess2_4 + || r == JPEGExtendedProcess3_5 + || r == JPEGSpectralSelectionProcess6_8 + || IsJPEGLossless() + || IsJPEG2000(); } /** - * \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 gdcmDocument::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) ); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEG2000 one - * @return True when JPEG2000 (Lossly or LossLess) found. False in all - * other cases. + * \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 gdcmDocument::IsJPEG2000() +bool Document::IsEncapsulate() { - return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_90) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_91) ); + TransferSyntaxType r = GetTransferSyntax(); + return IsJPEG() || r == RLELossless; } /** * \brief Predicate for dicom version 3 file. * @return True when the file is a dicom version 3. */ -bool gdcmDocument::IsDicomV3() +bool Document::IsDicomV3() { // Checking if Transfert Syntax exists is enough // Anyway, it's to late check if the 'Preamble' was found ... @@ -468,30 +399,30 @@ bool gdcmDocument::IsDicomV3() * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown) * @return the FileType code */ -FileType gdcmDocument::GetFileType() +FileType Document::GetFileType() { return Filetype; } /** - * \brief Tries to open the file \ref gdcmDocument::Filename and + * \brief Tries to open the file \ref Document::Filename and * checks the preamble when existing. * @return The FILE pointer on success. */ -FILE* gdcmDocument::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) { dbg.Verbose( 0, - "gdcmDocument::OpenFile cannot open file: ", + "Document::OpenFile cannot open file: ", Filename.c_str()); return 0; } 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 ) @@ -500,17 +431,17 @@ FILE* gdcmDocument::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, - "gdcmDocument::OpenFile not DICOM/ACR (missing preamble)", + "Document::OpenFile not DICOM/ACR (missing preamble)", Filename.c_str()); return 0; @@ -520,12 +451,13 @@ FILE* gdcmDocument::OpenFile() * \brief closes the file * @return TRUE if the close was successfull */ -bool gdcmDocument::CloseFile() +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 ? } /** @@ -535,17 +467,17 @@ bool gdcmDocument::CloseFile() * (ACR-NEMA, ExplicitVR, ImplicitVR) * \return Always true. */ -void gdcmDocument::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 /// (necessary if user wants to write a DICOM V3 file - /// starting from an ACR-NEMA (V2) gdcmHeader + /// starting from an ACR-NEMA (V2) Header - if (filetype == gdcmImplicitVR) + 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 @@ -555,10 +487,10 @@ void gdcmDocument::Write(FILE* fp,FileType filetype) SetEntryLengthByNumber(18, 0x0002, 0x0010); } - if (filetype == gdcmExplicitVR) + 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 @@ -580,7 +512,7 @@ void gdcmDocument::Write(FILE* fp,FileType filetype) * UpdateGroupLength(true,ACR); */ - gdcmElementSet::Write(fp, filetype); // This one is recursive + ElementSet::Write(fp, filetype); // This one is recursive } @@ -594,27 +526,27 @@ void gdcmDocument::Write(FILE* fp,FileType filetype) * \return pointer to the modified/created Header Entry (NULL when creation * failed). */ -gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber( +ValEntry* Document::ReplaceOrCreateByNumber( std::string const & value, uint16_t group, uint16_t elem, - std::string const & VR ) + TagName const & vr ) { - gdcmValEntry* valEntry = 0; - gdcmDocEntry* currentEntry = GetDocEntryByNumber( group, elem); + ValEntry* valEntry = 0; + DocEntry* currentEntry = GetDocEntryByNumber( group, elem); if (!currentEntry) { // check if (group,element) DictEntry exists - // if it doesn't, create an entry in gdcmDictSet::VirtualEntry + // if it doesn't, create an entry in DictSet::VirtualEntry // and use it // Find out if the tag we received is in the dictionaries: - gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); + Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); + DictEntry* dictEntry = pubDict->GetDictEntryByNumber(group, elem); if (!dictEntry) { - currentEntry = NewDocEntryByNumber(group, elem,VR); + currentEntry = NewDocEntryByNumber(group, elem, vr); } else { @@ -623,35 +555,35 @@ gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber( if (!currentEntry) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to" " NewDocEntryByNumber failed."); return NULL; } - valEntry = new gdcmValEntry(currentEntry); + valEntry = new ValEntry(currentEntry); if ( !AddEntry(valEntry)) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry" " failed allthough this is a creation."); } } else { - valEntry = dynamic_cast< gdcmValEntry* >(currentEntry); + valEntry = dynamic_cast< ValEntry* >(currentEntry); if ( !valEntry ) // Euuuuh? It wasn't a ValEntry // then we change it to a ValEntry ? // Shouldn't it be considered as an error ? { - // We need to promote the gdcmDocEntry to a gdcmValEntry: - valEntry = new gdcmValEntry(currentEntry); + // We need to promote the DocEntry to a ValEntry: + valEntry = new ValEntry(currentEntry); if (!RemoveEntry(currentEntry)) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal" " of previous DocEntry failed."); return NULL; } if ( !AddEntry(valEntry)) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding" " promoted ValEntry failed."); return NULL; } @@ -666,35 +598,35 @@ gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber( /* * \brief Modifies the value of a given Header Entry (Dicom Element) * when it exists. Create it with the given value when unexistant. - * @param voidArea (binary) value to be set + * @param binArea (binary) value to be set * @param Group Group number of the Entry * @param Elem Element number of the Entry * \return pointer to the modified/created Header Entry (NULL when creation * failed). */ -gdcmBinEntry * gdcmDocument::ReplaceOrCreateByNumber( - void *voidArea, +BinEntry* Document::ReplaceOrCreateByNumber( + uint8_t* binArea, int lgth, uint16_t group, uint16_t elem, - std::string const & VR ) + TagName const & vr ) { - gdcmBinEntry* binEntry = 0; - gdcmDocEntry* currentEntry = GetDocEntryByNumber( group, elem); + BinEntry* binEntry = 0; + DocEntry* currentEntry = GetDocEntryByNumber( group, elem); if (!currentEntry) { // check if (group,element) DictEntry exists - // if it doesn't, create an entry in gdcmDictSet::VirtualEntry + // if it doesn't, create an entry in DictSet::VirtualEntry // and use it // Find out if the tag we received is in the dictionaries: - gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); + Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); + DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); if (!dictEntry) { - currentEntry = NewDocEntryByNumber(group, elem,VR); + currentEntry = NewDocEntryByNumber(group, elem, vr); } else { @@ -702,42 +634,42 @@ gdcmBinEntry * gdcmDocument::ReplaceOrCreateByNumber( } if (!currentEntry) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to" " NewDocEntryByNumber failed."); return NULL; } - binEntry = new gdcmBinEntry(currentEntry); + binEntry = new BinEntry(currentEntry); if ( !AddEntry(binEntry)) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry" " failed allthough this is a creation."); } } else { - binEntry = dynamic_cast< gdcmBinEntry* >(currentEntry); + binEntry = dynamic_cast< BinEntry* >(currentEntry); if ( !binEntry ) // Euuuuh? It wasn't a BinEntry // then we change it to a BinEntry ? // Shouldn't it be considered as an error ? { - // We need to promote the gdcmDocEntry to a gdcmBinEntry: - binEntry = new gdcmBinEntry(currentEntry); + // We need to promote the DocEntry to a BinEntry: + binEntry = new BinEntry(currentEntry); if (!RemoveEntry(currentEntry)) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal" " of previous DocEntry failed."); return NULL; } if ( !AddEntry(binEntry)) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding" + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding" " promoted BinEntry failed."); return NULL; } } } - SetEntryByNumber(voidArea, lgth, group, elem); + SetEntryByNumber(binArea, lgth, group, elem); return binEntry; } @@ -751,12 +683,10 @@ gdcmBinEntry * gdcmDocument::ReplaceOrCreateByNumber( * \return pointer to the modified/created SeqEntry (NULL when creation * failed). */ -gdcmSeqEntry * gdcmDocument::ReplaceOrCreateByNumber( - uint16_t group, - uint16_t elem) +SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem) { - gdcmSeqEntry* b = 0; - gdcmDocEntry* a = GetDocEntryByNumber( group, elem); + SeqEntry* b = 0; + DocEntry* a = GetDocEntryByNumber( group, elem); if (!a) { a = NewSeqEntryByNumber(group, elem); @@ -765,7 +695,7 @@ gdcmSeqEntry * gdcmDocument::ReplaceOrCreateByNumber( return 0; } - b = new gdcmSeqEntry(a, 1); // FIXME : 1 (Depth) + b = new SeqEntry(a, 1); // FIXME : 1 (Depth) AddEntry(b); } return b; @@ -779,8 +709,8 @@ gdcmSeqEntry * gdcmDocument::ReplaceOrCreateByNumber( * @param elem element number of the Entry * \return boolean */ -bool gdcmDocument::ReplaceIfExistByNumber(std::string const & value, - uint16_t group, uint16_t elem ) +bool Document::ReplaceIfExistByNumber(std::string const & value, + uint16_t group, uint16_t elem ) { SetEntryByNumber(value, group, elem); @@ -796,9 +726,9 @@ bool gdcmDocument::ReplaceIfExistByNumber(std::string const & value, * @param element Element number of the searched Dicom Element * @return true is found */ -bool gdcmDocument::CheckIfEntryExistByNumber(uint16_t group, uint16_t element ) +bool Document::CheckIfEntryExistByNumber(uint16_t group, uint16_t element ) { - const std::string &key = gdcmDictEntry::TranslateToKey(group, element ); + const std::string &key = DictEntry::TranslateToKey(group, element ); return TagHT.count(key); } @@ -811,9 +741,9 @@ bool gdcmDocument::CheckIfEntryExistByNumber(uint16_t group, uint16_t element ) * @return Corresponding element value when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmDocument::GetEntryByName(TagName const & tagName) +std::string Document::GetEntryByName(TagName const & tagName) { - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); + DictEntry* dictEntry = RefPubDict->GetDictEntryByName(tagName); if( !dictEntry ) { return GDCM_UNFOUND; @@ -835,16 +765,16 @@ std::string gdcmDocument::GetEntryByName(TagName const & tagName) * @return Corresponding element value representation when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmDocument::GetEntryVRByName(TagName const & tagName) +std::string Document::GetEntryVRByName(TagName const& tagName) { - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); + DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( dictEntry == NULL) { return GDCM_UNFOUND; } - gdcmDocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(), - dictEntry->GetElement()); + DocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(), + dictEntry->GetElement()); return elem->GetVR(); } @@ -857,16 +787,16 @@ std::string gdcmDocument::GetEntryVRByName(TagName const & tagName) * @return Corresponding element value representation when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmDocument::GetEntryByNumber(uint16_t group, uint16_t element) +std::string Document::GetEntryByNumber(uint16_t group, uint16_t element) { - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); + TagKey key = DictEntry::TranslateToKey(group, element); /// \todo use map methods, instead of multimap JPR if ( !TagHT.count(key)) { return GDCM_UNFOUND; } - return ((gdcmValEntry *)TagHT.find(key)->second)->GetValue(); + return ((ValEntry *)TagHT.find(key)->second)->GetValue(); } /** @@ -883,9 +813,9 @@ std::string gdcmDocument::GetEntryByNumber(uint16_t group, uint16_t element) * @return Corresponding element value representation when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmDocument::GetEntryVRByNumber(uint16_t group, uint16_t element) +std::string Document::GetEntryVRByNumber(uint16_t group, uint16_t element) { - gdcmDocEntry* elem = GetDocEntryByNumber(group, element); + DocEntry* elem = GetDocEntryByNumber(group, element); if ( !elem ) { return GDCM_UNFOUND; @@ -901,9 +831,9 @@ std::string gdcmDocument::GetEntryVRByNumber(uint16_t group, uint16_t element) * @param element Element number of the searched tag. * @return Corresponding element length; -2 if not found */ -int gdcmDocument::GetEntryLengthByNumber(uint16_t group, uint16_t element) +int Document::GetEntryLengthByNumber(uint16_t group, uint16_t element) { - gdcmDocEntry* elem = GetDocEntryByNumber(group, element); + DocEntry* elem = GetDocEntryByNumber(group, element); if ( !elem ) { return -2; //magic number @@ -916,9 +846,10 @@ int gdcmDocument::GetEntryLengthByNumber(uint16_t group, uint16_t element) * @param tagName name of the searched Dicom Element. * @return true when found */ -bool gdcmDocument::SetEntryByName(std::string const & content,std::string const & tagName) +bool Document::SetEntryByName(std::string const & content, + TagName const & tagName) { - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); + DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( !dictEntry ) { return false; @@ -929,24 +860,23 @@ bool gdcmDocument::SetEntryByName(std::string const & content,std::string const } /** - * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element) + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) * through it's (group, element) and modifies it's content with * the given value. * @param content new value (string) to substitute with * @param group group number of the Dicom Element to modify * @param element element number of the Dicom Element to modify */ -bool gdcmDocument::SetEntryByNumber(std::string const & content, - uint16_t group, - uint16_t element) +bool Document::SetEntryByNumber(std::string const& content, + uint16_t group, uint16_t element) { int c; int l; - gdcmValEntry* valEntry = GetValEntryByNumber(group, element); + ValEntry* valEntry = GetValEntryByNumber(group, element); if (!valEntry ) { - dbg.Verbose(0, "gdcmDocument::SetEntryByNumber: no corresponding", + dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding", " ValEntry (try promotion first)."); return false; } @@ -963,15 +893,17 @@ bool gdcmDocument::SetEntryByNumber(std::string const & content, l = finalContent.length(); if ( l != 0) // To avoid to be cheated by 'zero length' integers { - gdcmVRKey vr = valEntry->GetVR(); + VRKey vr = valEntry->GetVR(); if( vr == "US" || vr == "SS" ) { - c = CountSubstring(content, "\\") + 1; // for multivaluated items + // for multivaluated items + c = Util::CountSubstring(content, "\\") + 1; l = c*2; } else if( vr == "UL" || vr == "SL" ) { - c = CountSubstring(content, "\\") + 1; // for multivaluated items + // for multivaluated items + c = Util::CountSubstring(content, "\\") + 1; l = c*4;; } } @@ -980,21 +912,19 @@ bool gdcmDocument::SetEntryByNumber(std::string const & content, } /** - * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element) + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) * through it's (group, element) and modifies it's content with * the given value. - * @param content new value (void *) to substitute with + * @param content new value (void* -> uint8_t*) to substitute with * @param lgth new value length * @param group group number of the Dicom Element to modify * @param element element number of the Dicom Element to modify */ -bool gdcmDocument::SetEntryByNumber(void *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 - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); + TagKey key = DictEntry::TranslateToKey(group, element); if ( !TagHT.count(key)) { return false; @@ -1007,15 +937,16 @@ bool gdcmDocument::SetEntryByNumber(void *content, //content = content + '\0'; // fing a trick to enlarge a binary field? } */ - gdcmBinEntry* a = (gdcmBinEntry *)TagHT[key]; - a->SetVoidArea(content); + BinEntry* a = (BinEntry *)TagHT[key]; + a->SetBinArea(content); a->SetLength(lgth); + a->SetValue(GDCM_BINLOADED); return true; } /** - * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element) + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) * in the PubDocEntrySet of this instance * through it's (group, element) and modifies it's length with * the given value. @@ -1025,12 +956,11 @@ bool gdcmDocument::SetEntryByNumber(void *content, * @param element element number of the Entry to modify * @return true on success, false otherwise. */ -bool gdcmDocument::SetEntryLengthByNumber(uint32_t l, - uint16_t group, - uint16_t element) +bool Document::SetEntryLengthByNumber(uint32_t l, + uint16_t group, uint16_t element) { /// \todo use map methods, instead of multimap JPR - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); + TagKey key = DictEntry::TranslateToKey(group, element); if ( !TagHT.count(key) ) { return false; @@ -1051,12 +981,12 @@ bool gdcmDocument::SetEntryLengthByNumber(uint32_t l, * @param elem element number of the Entry * @return File Offset of the Element Value */ -size_t gdcmDocument::GetEntryOffsetByNumber(uint16_t group, uint16_t elem) +size_t Document::GetEntryOffsetByNumber(uint16_t group, uint16_t elem) { - gdcmDocEntry* entry = GetDocEntryByNumber(group, elem); + DocEntry* entry = GetDocEntryByNumber(group, elem); if (!entry) { - dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry present."); + dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry present."); return 0; } return entry->GetOffset(); @@ -1069,15 +999,20 @@ size_t gdcmDocument::GetEntryOffsetByNumber(uint16_t group, uint16_t elem) * @param elem element number of the Entry * @return Pointer to the 'non string' area */ -void * gdcmDocument::GetEntryVoidAreaByNumber(uint16_t group, uint16_t elem) +void* Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem) { - gdcmDocEntry* entry = GetDocEntryByNumber(group, elem); + DocEntry* entry = GetDocEntryByNumber(group, elem); if (!entry) { - dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry"); + dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry"); return 0; } - return ((gdcmBinEntry *)entry)->GetVoidArea(); + if ( BinEntry* binEntry = dynamic_cast(entry) ) + { + return binEntry->GetBinArea(); + } + + return 0; } /** @@ -1086,55 +1021,55 @@ void * gdcmDocument::GetEntryVoidAreaByNumber(uint16_t group, uint16_t elem) * @param group group number of the Entry * @param elem element number of the Entry */ -void* gdcmDocument::LoadEntryVoidArea(uint16_t group, uint16_t elem) +void* Document::LoadEntryBinArea(uint16_t group, uint16_t elem) { - gdcmDocEntry *docElement = GetDocEntryByNumber(group, elem); + DocEntry *docElement = GetDocEntryByNumber(group, elem); if ( !docElement ) { 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(); - char* a = new char[l]; + uint8_t* a = new uint8_t[l]; if(!a) { - dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a"); + 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( !SetEntryVoidAreaByNumber( a, group, elem ) ); + /// \todo Drop any already existing void area! JPR + if( !SetEntryBinAreaByNumber( a, group, elem ) ) { - dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea setting failed."); + dbg.Verbose(0, "Document::LoadEntryBinArea setting failed."); } return a; } /** * \brief Loads (from disk) the element content * when a string is not suitable - * @param element Entry whose voidArea is going to be loaded + * @param element Entry whose binArea is going to be loaded */ -void *gdcmDocument::LoadEntryVoidArea(gdcmBinEntry *element) +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(); - char* a = new char[l]; + uint8_t* a = new uint8_t[l]; if( !a ) { - dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a"); + dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a"); return NULL; } - element->SetVoidArea((void *)a); + 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; @@ -1150,18 +1085,17 @@ void *gdcmDocument::LoadEntryVoidArea(gdcmBinEntry *element) * @param element Element number of the searched Dicom Element * @return */ -bool gdcmDocument::SetEntryVoidAreaByNumber(void * area, - uint16_t group, - uint16_t element) +bool Document::SetEntryBinAreaByNumber(uint8_t* area, + uint16_t group, uint16_t element) { - gdcmDocEntry* currentEntry = GetDocEntryByNumber(group, element); + DocEntry* currentEntry = GetDocEntryByNumber(group, element); if ( !currentEntry ) { return false; } - if ( gdcmBinEntry* binEntry = dynamic_cast(currentEntry) ) + if ( BinEntry* binEntry = dynamic_cast(currentEntry) ) { - binEntry->SetVoidArea( area ); + binEntry->SetBinArea( area ); return true; } return true; @@ -1171,9 +1105,9 @@ bool gdcmDocument::SetEntryVoidAreaByNumber(void * area, * \brief Update the entries with the shadow dictionary. * Only non even entries are analyzed */ -void gdcmDocument::UpdateShaEntries() +void Document::UpdateShaEntries() { - //gdcmDictEntry *entry; + //DictEntry *entry; std::string vr; /// \todo TODO : still any use to explore recursively the whole structure? @@ -1222,9 +1156,9 @@ void gdcmDocument::UpdateShaEntries() * @return Corresponding Dicom Element when it exists, and NULL * otherwise. */ -gdcmDocEntry* gdcmDocument::GetDocEntryByName(std::string const & tagName) +DocEntry* Document::GetDocEntryByName(TagName const & tagName) { - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); + DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( !dictEntry ) { return NULL; @@ -1243,10 +1177,9 @@ gdcmDocEntry* gdcmDocument::GetDocEntryByName(std::string const & tagName) * @param element Element number of the searched Dicom Element * @return */ -gdcmDocEntry* gdcmDocument::GetDocEntryByNumber(uint16_t group, - uint16_t element) +DocEntry* Document::GetDocEntryByNumber(uint16_t group, uint16_t element) { - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); + TagKey key = DictEntry::TranslateToKey(group, element); if ( !TagHT.count(key)) { return NULL; @@ -1255,24 +1188,23 @@ gdcmDocEntry* gdcmDocument::GetDocEntryByNumber(uint16_t group, } /** - * \brief Same as \ref gdcmDocument::GetDocEntryByNumber except it only + * \brief Same as \ref Document::GetDocEntryByNumber except it only * returns a result when the corresponding entry is of type * ValEntry. * @return When present, the corresponding ValEntry. */ -gdcmValEntry* gdcmDocument::GetValEntryByNumber(uint16_t group, - uint16_t element) +ValEntry* Document::GetValEntryByNumber(uint16_t group, uint16_t element) { - gdcmDocEntry* currentEntry = GetDocEntryByNumber(group, element); + DocEntry* currentEntry = GetDocEntryByNumber(group, element); if ( !currentEntry ) { return 0; } - if ( gdcmValEntry* valEntry = dynamic_cast(currentEntry) ) + if ( ValEntry* valEntry = dynamic_cast(currentEntry) ) { return valEntry; } - dbg.Verbose(0, "gdcmDocument::GetValEntryByNumber: unfound ValEntry."); + dbg.Verbose(0, "Document::GetValEntryByNumber: unfound ValEntry."); return 0; } @@ -1284,11 +1216,11 @@ gdcmValEntry* gdcmDocument::GetValEntryByNumber(uint16_t group, * @param entry Header Entry whose value shall be loaded. * @return */ -void gdcmDocument::LoadDocEntrySafe(gdcmDocEntry * entry) +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); } /** @@ -1296,7 +1228,7 @@ void gdcmDocument::LoadDocEntrySafe(gdcmDocEntry * entry) * processor order. * @return The properly swaped 32 bits integer. */ -uint32_t gdcmDocument::SwapLong(uint32_t a) +uint32_t Document::SwapLong(uint32_t a) { switch (SwapCode) { @@ -1316,7 +1248,7 @@ uint32_t gdcmDocument::SwapLong(uint32_t a) break; default : //std::cout << "swapCode= " << SwapCode << std::endl; - dbg.Error(" gdcmDocument::SwapLong : unset swap code"); + dbg.Error(" Document::SwapLong : unset swap code"); a = 0; } return a; @@ -1327,7 +1259,7 @@ uint32_t gdcmDocument::SwapLong(uint32_t a) * processor order. * @return The properly unswaped 32 bits integer. */ -uint32_t gdcmDocument::UnswapLong(uint32_t a) +uint32_t Document::UnswapLong(uint32_t a) { return SwapLong(a); } @@ -1336,7 +1268,7 @@ uint32_t gdcmDocument::UnswapLong(uint32_t a) * \brief Swaps the bytes so they agree with the processor order * @return The properly swaped 16 bits integer. */ -uint16_t gdcmDocument::SwapShort(uint16_t a) +uint16_t Document::SwapShort(uint16_t a) { if ( SwapCode == 4321 || SwapCode == 2143 ) { @@ -1349,7 +1281,7 @@ uint16_t gdcmDocument::SwapShort(uint16_t a) * \brief Unswaps the bytes so they agree with the processor order * @return The properly unswaped 16 bits integer. */ -uint16_t gdcmDocument::UnswapShort(uint16_t a) +uint16_t Document::UnswapShort(uint16_t a) { return SwapShort(a); } @@ -1361,18 +1293,14 @@ uint16_t gdcmDocument::UnswapShort(uint16_t a) * \brief Parses a DocEntrySet (Zero-level DocEntries or SQ Item DocEntries) * @return length of the parsed set. */ - -long gdcmDocument::ParseDES(gdcmDocEntrySet *set, - long offset, - long l_max, - bool delim_mode) +void Document::ParseDES(DocEntrySet *set, long offset, + long l_max, bool delim_mode) { - gdcmDocEntry *newDocEntry = 0; - unsigned long l = 0; + DocEntry *newDocEntry = 0; while (true) { - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } @@ -1382,27 +1310,28 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, break; } - gdcmVRKey vr = newDocEntry->GetVR(); + VRKey vr = newDocEntry->GetVR(); if ( vr != "SQ" ) { - if ( gdcmGlobal::GetVR()->IsVROfGdcmStringRepresentable(vr) ) + if ( Global::GetVR()->IsVROfGdcmStringRepresentable(vr) ) { /////////////////////// ValEntry - gdcmValEntry* newValEntry = - new gdcmValEntry( newDocEntry->GetDictEntry() ); + ValEntry* newValEntry = + new ValEntry( newDocEntry->GetDictEntry() ); newValEntry->Copy( newDocEntry ); - // When "set" is a gdcmDocument, then we are at the top of the + // 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 (gdcmDocument* dummy = dynamic_cast< gdcmDocument* > ( set ) ) + if (Document* dummy = dynamic_cast< Document* > ( set ) ) { + (void)dummy; newValEntry->SetKey( newValEntry->GetKey() ); } - // ...but when "set" is a gdcmSQItem, we are inserting this new + // ...but when "set" is a SQItem, we are inserting this new // valEntry in a sequence item. Hence the key has the - // generalized form (refer to \ref gdcmBaseTagKey): - if (gdcmSQItem* parentSQItem = dynamic_cast< gdcmSQItem* > ( set ) ) + // generalized form (refer to \ref BaseTagKey): + if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newValEntry->SetKey( parentSQItem->GetBaseTagKey() + newValEntry->GetKey() ); @@ -1414,35 +1343,36 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, { break; } - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } } else { - if ( ! gdcmGlobal::GetVR()->IsVROfGdcmBinaryRepresentable(vr) ) + if ( ! Global::GetVR()->IsVROfGdcmBinaryRepresentable(vr) ) { ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR - dbg.Verbose(0, "gdcmDocument::ParseDES: neither Valentry, " + dbg.Verbose(0, "Document::ParseDES: neither Valentry, " "nor BinEntry. Probably unknown VR."); } //////////////////// BinEntry or UNKOWN VR: - gdcmBinEntry* newBinEntry = - new gdcmBinEntry( newDocEntry->GetDictEntry() ); + BinEntry* newBinEntry = + new BinEntry( newDocEntry->GetDictEntry() ); newBinEntry->Copy( newDocEntry ); - // When "this" is a gdcmDocument the Key is simply of the + // When "this" is a Document the Key is simply of the // form ( group, elem )... - if (gdcmDocument* dummy = dynamic_cast< gdcmDocument* > ( set ) ) + if (Document* dummy = dynamic_cast< Document* > ( set ) ) { + (void)dummy; newBinEntry->SetKey( newBinEntry->GetKey() ); } // but when "this" is a SQItem, we are inserting this new // valEntry in a sequence item, and the kay has the - // generalized form (refer to \ref gdcmBaseTagKey): - if (gdcmSQItem* parentSQItem = dynamic_cast< gdcmSQItem* > ( set ) ) + // generalized form (refer to \ref BaseTagKey): + if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newBinEntry->SetKey( parentSQItem->GetBaseTagKey() + newBinEntry->GetKey() ); @@ -1452,32 +1382,33 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, LoadDocEntry( newBinEntry ); } - if (newDocEntry->GetGroup() == 0x7fe0 && - newDocEntry->GetElement() == 0x0010 ) + if ( ( newDocEntry->GetGroup() == 0x7fe0 ) + && ( newDocEntry->GetElement() == 0x0010 ) ) { - if (newDocEntry->GetReadLength()==0xffffffff) + TransferSyntaxType ts = GetTransferSyntax(); + if ( ts == RLELossless ) { - // Broken US.3405.1.dcm - Parse7FE0(); // to skip the pixels - // (multipart JPEG/RLE are trouble makers) + long PositionOnEntry = Fp->tellg(); + Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg ); + ComputeRLEInfo(); + Fp->seekg( PositionOnEntry, std::ios_base::beg ); } - else + else if ( IsJPEG() ) { - SkipToNextDocEntry(newDocEntry); - l = newDocEntry->GetFullLength(); + long PositionOnEntry = Fp->tellg(); + Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg ); + ComputeJPEGFragmentInfo(); + Fp->seekg( PositionOnEntry, std::ios_base::beg ); } } - else - { - // to be sure we are at the beginning - SkipToNextDocEntry(newDocEntry); - l = newDocEntry->GetFullLength(); - } + + // Just to make sure we are at the beginning of next entry. + SkipToNextDocEntry(newDocEntry); } else { // VR = "SQ" - l = newDocEntry->GetReadLength(); + unsigned long l = newDocEntry->GetReadLength(); if ( l != 0 ) // don't mess the delim_mode for zero-length sequence { if ( l == 0xffffffff ) @@ -1490,24 +1421,25 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, } } // no other way to create it ... - gdcmSeqEntry* newSeqEntry = - new gdcmSeqEntry( newDocEntry->GetDictEntry() ); + SeqEntry* newSeqEntry = + new SeqEntry( newDocEntry->GetDictEntry() ); newSeqEntry->Copy( newDocEntry ); newSeqEntry->SetDelimitorMode( delim_mode ); - // At the top of the hierarchy, stands a gdcmDocument. When "set" - // is a gdcmDocument, then we are building the first depth level. - // Hence the gdcmSeqEntry we are building simply has a depth + // At the top of the hierarchy, stands a Document. When "set" + // is a Document, then we are building the first depth level. + // Hence the SeqEntry we are building simply has a depth // level of one: - if (gdcmDocument* dummy = dynamic_cast< gdcmDocument* > ( set ) ) + if (Document* dummy = dynamic_cast< Document* > ( set ) ) { + (void)dummy; newSeqEntry->SetDepthLevel( 1 ); newSeqEntry->SetKey( newSeqEntry->GetKey() ); } // But when "set" is allready a SQItem, we are building a nested - // sequence, and hence the depth level of the new gdcmSeqEntry + // sequence, and hence the depth level of the new SeqEntry // we are building, is one level deeper: - if (gdcmSQItem* parentSQItem = dynamic_cast< gdcmSQItem* > ( set ) ) + if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 ); newSeqEntry->SetKey( parentSQItem->GetBaseTagKey() @@ -1516,34 +1448,33 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, if ( l != 0 ) { // Don't try to parse zero-length sequences - (void)ParseSQ( newSeqEntry, - newDocEntry->GetOffset(), - l, delim_mode); + ParseSQ( newSeqEntry, + newDocEntry->GetOffset(), + l, delim_mode); } set->AddEntry( newSeqEntry ); - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } } delete newDocEntry; } - return l; // Probably useless } /** * \brief Parses a Sequence ( SeqEntry after SeqEntry) * @return parsed length for this level */ -long gdcmDocument::ParseSQ( gdcmSeqEntry* seqEntry, - long offset, long l_max, bool delim_mode) +void Document::ParseSQ( SeqEntry* seqEntry, + long offset, long l_max, bool delim_mode) { int SQItemNumber = 0; bool dlm_mod; while (true) { - gdcmDocEntry* newDocEntry = ReadNextDocEntry(); + DocEntry* newDocEntry = ReadNextDocEntry(); if ( !newDocEntry ) { // FIXME Should warn user @@ -1557,12 +1488,12 @@ long gdcmDocument::ParseSQ( gdcmSeqEntry* seqEntry, break; } } - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && (Fp->tellg()-offset) >= l_max) { break; } - gdcmSQItem *itemSQ = new gdcmSQItem( seqEntry->GetDepthLevel() ); + SQItem *itemSQ = new SQItem( seqEntry->GetDepthLevel() ); std::ostringstream newBase; newBase << seqEntry->GetKey() << "/" @@ -1580,33 +1511,29 @@ long gdcmDocument::ParseSQ( gdcmSeqEntry* seqEntry, dlm_mod = false; } - (void)ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod); + ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod); seqEntry->AddEntry( itemSQ, SQItemNumber ); SQItemNumber++; - if ( !delim_mode && ( ftell(Fp) - offset ) >= l_max ) + if ( !delim_mode && ( Fp->tellg() - offset ) >= l_max ) { break; } } - - int lgth = ftell(Fp) - offset; - return lgth; } /** * \brief Loads the element content if its length doesn't exceed - * the value specified with gdcmDocument::SetMaxSizeLoadEntry() + * the value specified with Document::SetMaxSizeLoadEntry() * @param entry Header Entry (Dicom Element) to be dealt with */ -void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) +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 @@ -1621,7 +1548,7 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) // When the length is zero things are easy: if ( length == 0 ) { - ((gdcmValEntry *)entry)->SetValue(""); + ((ValEntry *)entry)->SetValue(""); return; } @@ -1632,7 +1559,7 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) std::ostringstream s; if (length > MaxSizeLoadEntry) { - if (gdcmBinEntry* binEntryPtr = dynamic_cast< gdcmBinEntry* >(entry) ) + if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) ) { //s << "gdcm::NotLoaded (BinEntry)"; s << GDCM_NOTLOADED; @@ -1642,7 +1569,7 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) binEntryPtr->SetValue(s.str()); } // Be carefull : a BinEntry IS_A ValEntry ... - else if (gdcmValEntry* valEntryPtr = dynamic_cast< gdcmValEntry* >(entry) ) + else if (ValEntry* valEntryPtr = dynamic_cast< ValEntry* >(entry) ) { // s << "gdcm::NotLoaded. (ValEntry)"; s << GDCM_NOTLOADED; @@ -1659,16 +1586,16 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* 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; } // When we find a BinEntry not very much can be done : - if (gdcmBinEntry* binEntryPtr = dynamic_cast< gdcmBinEntry* >(entry) ) + if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) ) { - s << "gdcm::Loaded (BinEntry)"; + s << GDCM_BINLOADED; binEntryPtr->SetValue(s.str()); - LoadEntryVoidArea(binEntryPtr); // last one, not to erase length ! + LoadEntryBinArea(binEntryPtr); // last one, not to erase length ! return; } @@ -1717,24 +1644,22 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) s << std::ends; // to avoid oddities on Solaris #endif //GDCM_NO_ANSI_STRING_STREAM - ((gdcmValEntry *)entry)->SetValue(s.str()); + ((ValEntry *)entry)->SetValue(s.str()); return; } // 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 ( gdcmValEntry* valEntry = dynamic_cast(entry) ) + + if ( ValEntry* valEntry = dynamic_cast(entry) ) { - if ( item_read != 1 ) + if ( Fp->fail() || Fp->eof())//Fp->gcount() == 1 { - dbg.Verbose(1, "gdcmDocument::LoadDocEntry", + dbg.Verbose(1, "Document::LoadDocEntry", "unread element value"); valEntry->SetValue(GDCM_UNREAD); return; @@ -1752,7 +1677,7 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) } else { - dbg.Error(true, "gdcmDocument::LoadDocEntry" + dbg.Error(true, "Document::LoadDocEntry" "Should have a ValEntry, here !"); } } @@ -1762,41 +1687,43 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) * \brief Find the value Length of the passed Header Entry * @param entry Header Entry whose length of the value shall be loaded. */ -void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) - throw ( gdcmFormatError ) +void Document::FindDocEntryLength( DocEntry *entry ) + throw ( FormatError ) { uint16_t element = entry->GetElement(); std::string vr = entry->GetVR(); uint16_t length16; - if ( Filetype == gdcmExplicitVR && !entry->IsImplicitVR() ) + if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) { if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UN" ) { - // The following reserved two bytes (see PS 3.5-2001, section - // 7.1.2 Data element structure with explicit vr p27) must be + // 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" && length32 == 0xffffffff ) + if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff ) { uint32_t lengthOB; try { + /// \todo rename that to FindDocEntryLengthOBOrOW since + /// the above test is on both OB and OW... lengthOB = FindDocEntryLengthOB(); } - catch ( gdcmFormatUnexpected ) + catch ( FormatUnexpected ) { // Computing the length failed (this happens with broken // files like gdcm-JPEG-LossLess3a.dcm). We still have a // 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; } @@ -1839,10 +1766,11 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) // big endian and proceed... if ( element == 0x0000 && length16 == 0x0400 ) { - if ( !IsExplicitVRBigEndianTransferSyntax() ) + TransferSyntaxType ts = GetTransferSyntax(); + if ( ts != ExplicitVRBigEndian ) { - throw gdcmFormatError( "gdcmDocument::FindDocEntryLength()", - " not explicit VR." ); + throw FormatError( "Document::FindDocEntryLength()", + " not explicit VR." ); return; } length16 = 4; @@ -1851,7 +1779,7 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) // and the dictionary entry depending on them. uint16_t correctGroup = SwapShort( entry->GetGroup() ); uint16_t correctElem = SwapShort( entry->GetElement() ); - gdcmDictEntry* newTag = GetDictEntryByNumber( correctGroup, + DictEntry* newTag = GetDictEntryByNumber( correctGroup, correctElem ); if ( !newTag ) { @@ -1890,16 +1818,16 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) * \brief Find the Value Representation of the current Dicom Element. * @param entry */ -void gdcmDocument::FindDocEntryVR( gdcmDocEntry *entry ) +void Document::FindDocEntryVR( DocEntry *entry ) { - if ( Filetype != gdcmExplicitVR ) + if ( Filetype != ExplicitVR ) { return; } 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 @@ -1908,12 +1836,12 @@ void gdcmDocument::FindDocEntryVR( gdcmDocEntry *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 @@ -1936,9 +1864,9 @@ void gdcmDocument::FindDocEntryVR( gdcmDocEntry *entry ) * @return false if the VR is incorrect of if the VR isn't referenced * otherwise, it returns true */ -bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) +bool Document::CheckDocEntryVR(DocEntry *entry, VRKey vr) { - char msg[100]; // for sprintf + std::string msg; bool realExplicit = true; // Assume we are reading a falsely explicit VR file i.e. we reached @@ -1957,7 +1885,7 @@ bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) // CLEANME searching the dicom_vr at each occurence is expensive. // PostPone this test in an optional integrity check at the end // of parsing or only in debug mode. - if ( realExplicit && !gdcmGlobal::GetVR()->Count(vr) ) + if ( realExplicit && !Global::GetVR()->Count(vr) ) { realExplicit = false; } @@ -1966,14 +1894,14 @@ bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) { // We thought this was explicit VR, but we end up with an // implicit VR tag. Let's backtrack. - sprintf(msg,"Falsely explicit vr file (%04x,%04x)\n", - entry->GetGroup(), entry->GetElement()); - dbg.Verbose(1, "gdcmDocument::FindVR: ",msg); + msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n", + entry->GetGroup(), entry->GetElement()); + dbg.Verbose(1, "Document::FindVR: ", msg.c_str()); if( entry->GetGroup() % 2 && entry->GetElement() == 0x0000) { // Group length is UL ! - gdcmDictEntry* newEntry = NewVirtualDictEntry( + DictEntry* newEntry = NewVirtualDictEntry( entry->GetGroup(), entry->GetElement(), "UL", "FIXME", "Group Length"); entry->SetDictEntry( newEntry ); @@ -2001,7 +1929,7 @@ bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) // be unwise to overwrite the VR of a dictionary (since it would // compromise it's next user), we need to clone the actual DictEntry // and change the VR for the read one. - gdcmDictEntry* newEntry = NewVirtualDictEntry( + DictEntry* newEntry = NewVirtualDictEntry( entry->GetGroup(), entry->GetElement(), vr, "FIXME", entry->GetName()); entry->SetDictEntry(newEntry); @@ -2017,11 +1945,11 @@ bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) * @param entry entry to tranform * @return Transformed entry value */ -std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *entry) +std::string Document::GetDocEntryValue(DocEntry *entry) { if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() ) { - std::string val = ((gdcmValEntry *)entry)->GetValue(); + std::string val = ((ValEntry *)entry)->GetValue(); std::string vr = entry->GetVR(); uint32_t length = entry->GetLength(); std::ostringstream s; @@ -2082,7 +2010,7 @@ std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *entry) return s.str(); } - return ((gdcmValEntry *)entry)->GetValue(); + return ((ValEntry *)entry)->GetValue(); } /** @@ -2093,7 +2021,7 @@ std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *entry) * @param entry Entry to reverse transform * @return Reverse transformed entry value */ -std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry* entry) +std::string Document::GetDocEntryUnvalue(DocEntry* entry) { if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() ) { @@ -2106,7 +2034,7 @@ std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry* entry) uint16_t newInt16; tokens.erase( tokens.begin(), tokens.end()); // clean any previous value - Tokenize (((gdcmValEntry *)entry)->GetValue(), tokens, "\\"); + Util::Tokenize (((ValEntry *)entry)->GetValue(), tokens, "\\"); for (unsigned int i=0; iGetValue(), tokens, "\\"); + Util::Tokenize (((ValEntry *)entry)->GetValue(), tokens, "\\"); for (unsigned int i=0; iGetValue(); + return ((ValEntry *)entry)->GetValue(); } /** @@ -2146,7 +2074,7 @@ std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry* entry) * \warning NOT end user intended method ! * @param entry entry to skip */ -void gdcmDocument::SkipDocEntry(gdcmDocEntry *entry) +void Document::SkipDocEntry(DocEntry *entry) { SkipBytes(entry->GetLength()); } @@ -2156,10 +2084,10 @@ void gdcmDocument::SkipDocEntry(gdcmDocEntry *entry) * \warning NOT end user intended method ! * @param entry entry to skip */ -void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *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); } /** @@ -2169,8 +2097,8 @@ void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *entry) * @param entry entry to check * @param foundLength fist assumption about length */ -void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, - uint32_t foundLength) +void Document::FixDocEntryFoundLength(DocEntry *entry, + uint32_t foundLength) { entry->SetReadLength( foundLength ); // will be updated only if a bug is found if ( foundLength == 0xffffffff) @@ -2248,7 +2176,7 @@ void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, * @param entry The element value on which to apply the predicate. * @return The result of the heuristical predicate. */ -bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *entry) +bool Document::IsDocEntryAnInteger(DocEntry *entry) { uint16_t element = entry->GetElement(); uint16_t group = entry->GetGroup(); @@ -2274,12 +2202,12 @@ bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *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 << ")" << "lgt : " << length; - dbg.Verbose(0, "gdcmDocument::IsDocEntryAnInteger", s.str().c_str() ); + dbg.Verbose(0, "Document::IsDocEntryAnInteger", s.str().c_str() ); } } @@ -2297,11 +2225,11 @@ bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *entry) * @return */ -uint32_t gdcmDocument::FindDocEntryLengthOB() - throw( gdcmFormatUnexpected ) +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; @@ -2314,10 +2242,10 @@ uint32_t gdcmDocument::FindDocEntryLengthOB() group = ReadInt16(); elem = ReadInt16(); } - catch ( gdcmFormatError ) + catch ( FormatError ) { - throw gdcmFormatError("gdcmDocument::FindDocEntryLengthOB()", - " group or element not present."); + throw FormatError("Document::FindDocEntryLengthOB()", + " group or element not present."); } // We have to decount the group and element we just read @@ -2325,12 +2253,12 @@ uint32_t gdcmDocument::FindDocEntryLengthOB() if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) ) { - dbg.Verbose(1, "gdcmDocument::FindDocEntryLengthOB: neither an Item " + dbg.Verbose(1, "Document::FindDocEntryLengthOB: neither an Item " "tag nor a Sequence delimiter tag."); - fseek(Fp, positionOnEntry, SEEK_SET); - throw gdcmFormatUnexpected("gdcmDocument::FindDocEntryLengthOB()", - "Neither an Item tag nor a Sequence " - "delimiter tag."); + Fp->seekg(positionOnEntry, std::ios_base::beg); + throw FormatUnexpected("Document::FindDocEntryLengthOB()", + "Neither an Item tag nor a Sequence " + "delimiter tag."); } if ( elem == 0xe0dd ) @@ -2348,7 +2276,7 @@ uint32_t gdcmDocument::FindDocEntryLengthOB() break; } } - fseek(Fp, positionOnEntry, SEEK_SET); + Fp->seekg( positionOnEntry, std::ios_base::beg); return totalLength; } @@ -2357,18 +2285,18 @@ uint32_t gdcmDocument::FindDocEntryLengthOB() * (swaps it depending on processor endianity) * @return read value */ -uint16_t gdcmDocument::ReadInt16() - throw( gdcmFormatError ) +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() ) { - if( ferror(Fp) ) - { - throw gdcmFormatError( "gdcmDocument::ReadInt16()", " file error." ); - } - throw gdcmFormatError( "gdcmDocument::ReadInt16()", "EOF." ); + throw FormatError( "Document::ReadInt16()", " file error." ); + } + if( Fp->eof() ) + { + throw FormatError( "Document::ReadInt16()", "EOF." ); } g = SwapShort(g); return g; @@ -2379,18 +2307,18 @@ uint16_t gdcmDocument::ReadInt16() * (swaps it depending on processor endianity) * @return read value */ -uint32_t gdcmDocument::ReadInt32() - throw( gdcmFormatError ) +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() ) { - if( ferror(Fp) ) - { - throw gdcmFormatError( "gdcmDocument::ReadInt16()", " file error." ); - } - throw gdcmFormatError( "gdcmDocument::ReadInt32()", "EOF." ); + throw FormatError( "Document::ReadInt32()", " file error." ); + } + if( Fp->eof() ) + { + throw FormatError( "Document::ReadInt32()", "EOF." ); } g = SwapLong(g); return g; @@ -2401,20 +2329,22 @@ uint32_t gdcmDocument::ReadInt32() * \warning NOT end user intended method ! * @return */ -void gdcmDocument::SkipBytes(uint32_t nBytes) +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); } /** * \brief Loads all the needed Dictionaries * \warning NOT end user intended method ! */ -void gdcmDocument::Initialise() +void Document::Initialise() { - RefPubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + RefPubDict = Global::GetDicts()->GetDefaultPubDict(); RefShaDict = NULL; + RLEInfo = new RLEFramesInfo; + JPEGInfo = new JPEGFragmentsInfo; } /** @@ -2425,7 +2355,7 @@ void gdcmDocument::Initialise() * it's neither ACR-NEMA nor DICOM * true when we hope ours assuptions are OK */ -bool gdcmDocument::CheckSwap() +bool Document::CheckSwap() { // The only guaranted way of finding the swap code is to find a // group tag since we know it's length has to be of four bytes i.e. @@ -2452,13 +2382,12 @@ bool gdcmDocument::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 ) { - dbg.Verbose(1, "gdcmDocument::CheckSwap:", "looks like DICOM Version3"); + dbg.Verbose(1, "Document::CheckSwap:", "looks like DICOM Version3"); // Next, determine the value representation (VR). Let's skip to the // first element (0002, 0000) and check there if we find "UL" @@ -2488,45 +2417,45 @@ bool gdcmDocument::CheckSwap() memcmp(entCur, "CS", (size_t)2) == 0 ) // CS, to remove later // when Write DCM *adds* // FIXME - // Use gdcmDocument::dicom_vr to test all the possibilities + // Use Document::dicom_vr to test all the possibilities // instead of just checking for UL, OB and UI !? group 0000 { - Filetype = gdcmExplicitVR; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", + Filetype = ExplicitVR; + dbg.Verbose(1, "Document::CheckSwap:", "explicit Value Representation"); } else { - Filetype = gdcmImplicitVR; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", + Filetype = ImplicitVR; + dbg.Verbose(1, "Document::CheckSwap:", "not an explicit Value Representation"); } if ( net2host ) { SwapCode = 4321; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", + dbg.Verbose(1, "Document::CheckSwap:", "HostByteOrder != NetworkByteOrder"); } else { SwapCode = 0; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", + dbg.Verbose(1, "Document::CheckSwap:", "HostByteOrder = NetworkByteOrder"); } // 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 // Alas, this is not a DicomV3 file and whatever happens there is no file // preamble. We can reset the file position indicator to where the data // is (i.e. the beginning of the file). - dbg.Verbose(1, "gdcmDocument::CheckSwap:", "not a DICOM Version3 file"); - rewind(Fp); + dbg.Verbose(1, "Document::CheckSwap:", "not a DICOM Version3 file"); + 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. @@ -2543,19 +2472,19 @@ bool gdcmDocument::CheckSwap() { case 0x00040000 : SwapCode = 3412; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x04000000 : SwapCode = 4321; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x00000400 : SwapCode = 2143; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x00000004 : SwapCode = 0; - Filetype = gdcmACR; + Filetype = ACR; return true; default : // We are out of luck. It is not a DicomV3 nor a 'clean' ACR/NEMA file. @@ -2581,18 +2510,18 @@ bool gdcmDocument::CheckSwap() case 0x0004 : case 0x0008 : SwapCode = 0; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x0200 : case 0x0400 : case 0x0800 : SwapCode = 4321; - Filetype = gdcmACR; + Filetype = ACR; return true; default : - dbg.Verbose(0, "gdcmDocument::CheckSwap:", + dbg.Verbose(0, "Document::CheckSwap:", "ACR/NEMA unfound swap info (Really hopeless !)"); - Filetype = gdcmUnknown; + Filetype = Unknown; return false; } // Then the only info we have is the net2host one. @@ -2608,9 +2537,9 @@ bool gdcmDocument::CheckSwap() * \brief Restore the unproperly loaded values i.e. the group, the element * and the dictionary entry depending on them. */ -void gdcmDocument::SwitchSwapToBigEndian() +void Document::SwitchSwapToBigEndian() { - dbg.Verbose(1, "gdcmDocument::SwitchSwapToBigEndian", + dbg.Verbose(1, "Document::SwitchSwapToBigEndian", "Switching to BigEndian mode."); if ( SwapCode == 0 ) { @@ -2634,7 +2563,7 @@ void gdcmDocument::SwitchSwapToBigEndian() * \brief during parsing, Header Elements too long are not loaded in memory * @param newSize */ -void gdcmDocument::SetMaxSizeLoadEntry(long newSize) +void Document::SetMaxSizeLoadEntry(long newSize) { if ( newSize < 0 ) { @@ -2651,10 +2580,10 @@ void gdcmDocument::SetMaxSizeLoadEntry(long newSize) /** * \brief Header Elements too long will not be printed - * \todo See comments of \ref gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE + * \todo See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE * @param newSize */ -void gdcmDocument::SetMaxSizePrintEntry(long newSize) +void Document::SetMaxSizePrintEntry(long newSize) { //DOH !! This is exactly SetMaxSizeLoadEntry FIXME FIXME if ( newSize < 0 ) @@ -2678,7 +2607,7 @@ void gdcmDocument::SetMaxSizePrintEntry(long newSize) * gets the VR, gets the length, gets the offset value) * @return On succes the newly created DocEntry, NULL on failure. */ -gdcmDocEntry* gdcmDocument::ReadNextDocEntry() +DocEntry* Document::ReadNextDocEntry() { uint16_t group; uint16_t elem; @@ -2688,7 +2617,7 @@ gdcmDocEntry* gdcmDocument::ReadNextDocEntry() group = ReadInt16(); elem = ReadInt16(); } - catch ( gdcmFormatError e ) + catch ( FormatError e ) { // We reached the EOF (or an error occured) therefore // header parsing has to be considered as finished. @@ -2696,14 +2625,14 @@ gdcmDocEntry* gdcmDocument::ReadNextDocEntry() return 0; } - gdcmDocEntry *newEntry = NewDocEntryByNumber(group, elem); + DocEntry *newEntry = NewDocEntryByNumber(group, elem); FindDocEntryVR(newEntry); try { FindDocEntryLength(newEntry); } - catch ( gdcmFormatError e ) + catch ( FormatError e ) { // Call it quits //std::cout << e; @@ -2711,23 +2640,23 @@ gdcmDocEntry* gdcmDocument::ReadNextDocEntry() return 0; } - newEntry->SetOffset(ftell(Fp)); + newEntry->SetOffset(Fp->tellg()); return newEntry; } /** - * \brief Generate a free gdcmTagKey i.e. a gdcmTagKey that is not present + * \brief Generate a free TagKey i.e. a TagKey that is not present * in the TagHt dictionary. * @param group The generated tag must belong to this group. * @return The element of tag with given group which is fee. */ -uint32_t gdcmDocument::GenerateFreeTagKeyInGroup(uint16_t group) +uint32_t Document::GenerateFreeTagKeyInGroup(uint16_t group) { for (uint32_t elem = 0; elem < UINT32_MAX; elem++) { - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, elem); + TagKey key = DictEntry::TranslateToKey(group, elem); if (TagHT.count(key) == 0) { return elem; @@ -2737,22 +2666,22 @@ uint32_t gdcmDocument::GenerateFreeTagKeyInGroup(uint16_t group) } /** - * \brief Assuming the internal file pointer \ref gdcmDocument::Fp + * \brief Assuming the internal file pointer \ref Document::Fp * is placed at the beginning of a tag check whether this * tag is (TestGroup, TestElement). - * \warning On success the internal file pointer \ref gdcmDocument::Fp + * \warning On success the internal file pointer \ref Document::Fp * is modified to point after the tag. * On failure (i.e. when the tag wasn't the expected tag * (TestGroup, TestElement) the internal file pointer - * \ref gdcmDocument::Fp is restored to it's original position. + * \ref Document::Fp is restored to it's original position. * @param testGroup The expected group of the tag. * @param testElement The expected Element of the tag. * @return True on success, false otherwise. */ -bool gdcmDocument::ReadTag(uint16_t testGroup, uint16_t testElement) +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: @@ -2767,9 +2696,9 @@ bool gdcmDocument::ReadTag(uint16_t testGroup, uint16_t testElement) s << std::hex << itemTagGroup << "," << itemTagElement << ")" << std::endl; s << " at address: " << (unsigned)currentPosition << std::endl; - dbg.Verbose(0, "gdcmDocument::ReadItemTagLength: wrong Item Tag found:"); + 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; } @@ -2777,22 +2706,22 @@ bool gdcmDocument::ReadTag(uint16_t testGroup, uint16_t testElement) } /** - * \brief Assuming the internal file pointer \ref gdcmDocument::Fp + * \brief Assuming the internal file pointer \ref Document::Fp * is placed at the beginning of a tag (TestGroup, TestElement), * read the length associated to the Tag. - * \warning On success the internal file pointer \ref gdcmDocument::Fp + * \warning On success the internal file pointer \ref Document::Fp * is modified to point after the tag and it's length. * On failure (i.e. when the tag wasn't the expected tag * (TestGroup, TestElement) the internal file pointer - * \ref gdcmDocument::Fp is restored to it's original position. + * \ref Document::Fp is restored to it's original position. * @param testGroup The expected group of the tag. * @param testElement The expected Element of the tag. * @return On success returns the length associated to the tag. On failure * returns 0. */ -uint32_t gdcmDocument::ReadTagLength(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) ) @@ -2801,143 +2730,215 @@ uint32_t gdcmDocument::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; s << "Basic Item Length is: " << itemLength << std::endl; s << " at address: " << (unsigned)currentPosition << std::endl; - dbg.Verbose(0, "gdcmDocument::ReadItemTagLength: ", s.str().c_str()); + dbg.Verbose(0, "Document::ReadItemTagLength: ", s.str().c_str()); } return itemLength; } /** - * \brief Parse pixel data from disk for multi-fragment Jpeg/Rle files - * No other way so 'skip' the Data + * \brief When parsing the Pixel Data of an encapsulated file, read + * the basic offset table (when present, and BTW dump it). */ -void gdcmDocument::Parse7FE0 () +void Document::ReadAndSkipEncapsulatedBasicOffsetTable() { - gdcmDocEntry* element = GetDocEntryByNumber(0x0002, 0x0010); - if ( !element ) - { - // Should warn user FIXME - return; - } - - if ( IsImplicitVRLittleEndianTransferSyntax() - || IsExplicitVRLittleEndianTransferSyntax() - || IsExplicitVRBigEndianTransferSyntax() /// \todo 1.2.2 ??? A verifier ! - || IsDeflatedExplicitVRLittleEndianTransferSyntax() ) - { - return; - } - - // ---------------- for Parsing : Position on begining of Jpeg/RLE Pixels - //// Read the Basic Offset Table Item Tag length... uint32_t itemLength = ReadTagLength(0xfffe, 0xe000); - //// ... and then read length[s] itself[themselves]. We don't use - // the values read (BTW what is the purpous of those lengths ?) + // When present, read the basic offset table itself. + // Notes: - since the presence of this basic offset table is optional + // we can't rely on it for the implementation, and we will simply + // trash it's content (when present). + // - still, when present, we could add some further checks on the + // lengths, but we won't bother with such fuses for the time being. if ( itemLength != 0 ) { - // BTW, what is the purpous of those length anyhow !? 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 ) { - uint32_t individualLength = str2num(&basicOffsetTableItemValue[i],uint32_t); + uint32_t individualLength = str2num( &basicOffsetTableItemValue[i], + uint32_t); std::ostringstream s; s << " Read one length: "; s << std::hex << individualLength << std::endl; - dbg.Verbose(0, "gdcmDocument::Parse7FE0: ", s.str().c_str()); + dbg.Verbose(0, + "Document::ReadAndSkipEncapsulatedBasicOffsetTable: ", + s.str().c_str()); } +#endif //GDCM_DEBUG + delete[] basicOffsetTableItemValue; } +} - if ( ! IsRLELossLessTransferSyntax() ) +/** + * \brief Parse pixel data from disk of [multi-]fragment RLE encoding. + * Compute the RLE extra information and store it in \ref RLEInfo + * for later pixel retrieval usage. + */ +void Document::ComputeRLEInfo() +{ + TransferSyntaxType ts = GetTransferSyntax(); + if ( ts != RLELossless ) { - // JPEG Image - - //// We then skip (not reading them) all the fragments of images: - while ( (itemLength = ReadTagLength(0xfffe, 0xe000)) ) - { - SkipBytes(itemLength); - } + return; } - else - { - // RLE Image - long ftellRes; - long rleSegmentLength[15], fragmentLength; - // While we find some items: - while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) ) - { - // Parse fragments of the current Fragment (Frame) - //------------------ scanning (not reading) fragment pixels - uint32_t nbRleSegments = ReadInt32(); + // Encoded pixel data: for the time being we are only concerned with + // Jpeg or RLE Pixel data encodings. + // As stated in PS 3.5-2003, section 8.2 p44: + // "If sent in Encapsulated Format (i.e. other than the Native Format) the + // value representation OB is used". + // Hence we expect an OB value representation. Concerning OB VR, + // the section PS 3.5-2003, section A.4.c p 58-59, states: + // "For the Value Representations OB and OW, the encoding shall meet the + // following specifications depending on the Data element tag:" + // [...snip...] + // - the first item in the sequence of items before the encoded pixel + // data stream shall be basic offset table item. The basic offset table + // item value, however, is not required to be present" + + ReadAndSkipEncapsulatedBasicOffsetTable(); + + // Encapsulated RLE Compressed Images (see PS 3.5-2003, Annex G) + // Loop on the individual frame[s] and store the information + // on the RLE fragments in a RLEFramesInfo. + // Note: - when only a single frame is present, this is a + // classical image. + // - when more than one frame are present, then we are in + // the case of a multi-frame image. + long frameLength; + while ( (frameLength = ReadTagLength(0xfffe, 0xe000)) ) + { + // Parse the RLE Header and store the corresponding RLE Segment + // Offset Table information on fragments of this current Frame. + // Note that the fragment pixels themselves are not loaded + // (but just skipped). + 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."); + } - //// Reading RLE Segments Offset Table - uint32_t rleSegmentOffsetTable[15]; - for(int k=1; k<=15; k++) - { - ftellRes = ftell(Fp); - rleSegmentOffsetTable[k] = ReadInt32(); - } + uint32_t rleSegmentOffsetTable[15]; + for( int k = 1; k <= 15; k++ ) + { + rleSegmentOffsetTable[k] = ReadInt32(); + } - // skipping (not reading) RLE Segments - if ( nbRleSegments > 1) + // Deduce from both the RLE Header and the frameLength the + // fragment length, and again store this info in a + // RLEFramesInfo. + long rleSegmentLength[15]; + // skipping (not reading) RLE Segments + if ( nbRleSegments > 1) + { + for(unsigned int k = 1; k <= nbRleSegments-1; k++) { - for(unsigned int k = 1; k <= nbRleSegments-1; k++) - { - rleSegmentLength[k] = rleSegmentOffsetTable[k+1] - - rleSegmentOffsetTable[k]; - ftellRes = ftell(Fp); - SkipBytes(rleSegmentLength[k]); - } + rleSegmentLength[k] = rleSegmentOffsetTable[k+1] + - rleSegmentOffsetTable[k]; + SkipBytes(rleSegmentLength[k]); } + } - rleSegmentLength[nbRleSegments] = fragmentLength - - rleSegmentOffsetTable[nbRleSegments]; - ftellRes = ftell(Fp); - SkipBytes(rleSegmentLength[nbRleSegments]); - } + rleSegmentLength[nbRleSegments] = frameLength + - rleSegmentOffsetTable[nbRleSegments]; + SkipBytes(rleSegmentLength[nbRleSegments]); - // Make sure that at the end of the item we encounter a 'Sequence - // Delimiter Item': - if ( !ReadTag(0xfffe, 0xe0dd) ) - { - dbg.Verbose(0, "gdcmDocument::Parse7FE0: no sequence delimiter item"); - dbg.Verbose(0, " at end of RLE item sequence"); - } + // Store the collected info + RLEFrame* newFrameInfo = new RLEFrame; + newFrameInfo->NumberFragments = nbRleSegments; + for( unsigned int uk = 1; uk <= nbRleSegments; uk++ ) + { + newFrameInfo->Offset[uk] = frameOffset + rleSegmentOffsetTable[uk]; + newFrameInfo->Length[uk] = rleSegmentLength[uk]; + } + RLEInfo->Frames.push_back( newFrameInfo ); + } + + // Make sure that at the end of the item we encounter a 'Sequence + // Delimiter Item': + if ( !ReadTag(0xfffe, 0xe0dd) ) + { + dbg.Verbose(0, "Document::ComputeRLEInfo: no sequence delimiter "); + dbg.Verbose(0, " item at end of RLE item sequence"); + } +} + +/** + * \brief Parse pixel data from disk of [multi-]fragment Jpeg encoding. + * Compute the jpeg extra information (fragment[s] offset[s] and + * length) and store it[them] in \ref JPEGInfo for later pixel + * retrieval usage. + */ +void Document::ComputeJPEGFragmentInfo() +{ + // If you need to, look for comments of ComputeRLEInfo(). + if ( ! IsJPEG() ) + { + return; + } + + ReadAndSkipEncapsulatedBasicOffsetTable(); + + // Loop on the fragments[s] and store the parsed information in a + // JPEGInfo. + long fragmentLength; + while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) ) + { + long fragmentOffset = Fp->tellg(); + + // Store the collected info + JPEGFragment* newFragment = new JPEGFragment; + newFragment->Offset = fragmentOffset; + newFragment->Length = fragmentLength; + JPEGInfo->Fragments.push_back( newFragment ); + + SkipBytes( fragmentLength ); + } + + // Make sure that at the end of the item we encounter a 'Sequence + // Delimiter Item': + if ( !ReadTag(0xfffe, 0xe0dd) ) + { + dbg.Verbose(0, "Document::ComputeRLEInfo: no sequence delimiter "); + dbg.Verbose(0, " item at end of JPEG item sequence"); } } /** - * \brief Walk recursively the given \ref gdcmDocEntrySet, and feed + * \brief Walk recursively the given \ref DocEntrySet, and feed * the given hash table (\ref TagDocEntryHT) with all the - * \ref gdcmDocEntry (Dicom entries) encountered. + * \ref DocEntry (Dicom entries) encountered. * This method does the job for \ref BuildFlatHashTable. - * @param builtHT Where to collect all the \ref gdcmDocEntry encountered + * @param builtHT Where to collect all the \ref DocEntry encountered * when recursively walking the given set. * @param set The structure to be traversed (recursively). */ -void gdcmDocument::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, - gdcmDocEntrySet* set ) +void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, + DocEntrySet* set ) { - if (gdcmElementSet* elementSet = dynamic_cast< gdcmElementSet* > ( set ) ) + if (ElementSet* elementSet = dynamic_cast< ElementSet* > ( set ) ) { TagDocEntryHT* currentHT = elementSet->GetTagHT(); for( TagDocEntryHT::const_iterator i = currentHT->begin(); i != currentHT->end(); ++i) { - gdcmDocEntry* entry = i->second; - if ( gdcmSeqEntry* seqEntry = dynamic_cast(entry) ) + DocEntry* entry = i->second; + if ( SeqEntry* seqEntry = dynamic_cast(entry) ) { ListSQItem& items = seqEntry->GetSQItems(); for( ListSQItem::const_iterator item = items.begin(); @@ -2953,15 +2954,15 @@ void gdcmDocument::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, return; } - if (gdcmSQItem* SQItemSet = dynamic_cast< gdcmSQItem* > ( set ) ) + if (SQItem* SQItemSet = dynamic_cast< SQItem* > ( set ) ) { ListDocEntry& currentList = SQItemSet->GetDocEntries(); for (ListDocEntry::iterator i = currentList.begin(); i != currentList.end(); ++i) { - gdcmDocEntry* entry = *i; - if ( gdcmSeqEntry* seqEntry = dynamic_cast(entry) ) + DocEntry* entry = *i; + if ( SeqEntry* seqEntry = dynamic_cast(entry) ) { ListSQItem& items = seqEntry->GetSQItems(); for( ListSQItem::const_iterator item = items.begin(); @@ -2980,13 +2981,13 @@ void gdcmDocument::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, /** * \brief Build a \ref TagDocEntryHT (i.e. a std::map<>) from the current - * gdcmDocument. + * Document. * - * The structure used by a gdcmDocument (through \ref gdcmElementSet), + * The structure used by a Document (through \ref ElementSet), * in order to old the parsed entries of a Dicom header, is a recursive * one. This is due to the fact that the sequences (when present) * can be nested. Additionaly, the sequence items (represented in - * gdcm as \ref gdcmSQItem) add an extra complexity to the data + * gdcm as \ref SQItem) add an extra complexity to the data * structure. Hence, a gdcm user whishing to visit all the entries of * a Dicom header will need to dig in the gdcm internals (which * implies exposing all the internal data structures to the API). @@ -2995,13 +2996,13 @@ void gdcmDocument::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, * Dicom entries in a flat structure (a \ref TagDocEntryHT i.e. a * std::map<>). * \warning Of course there is NO integrity constrain between the - * returned \ref TagDocEntryHT and the \ref gdcmElemenSet used - * to build it. Hence if the underlying \ref gdcmElemenSet is + * returned \ref TagDocEntryHT and the \ref ElementSet used + * to build it. Hence if the underlying \ref ElementSet is * altered, then it is the caller responsability to invoke * \ref BuildFlatHashTable again... * @return The flat std::map<> we juste build. */ -TagDocEntryHT* gdcmDocument::BuildFlatHashTable() +TagDocEntryHT* Document::BuildFlatHashTable() { TagDocEntryHT* FlatHT = new TagDocEntryHT; BuildFlatHashTableRecurse( *FlatHT, this ); @@ -3011,13 +3012,13 @@ TagDocEntryHT* gdcmDocument::BuildFlatHashTable() /** - * \brief Compares two documents, according to \ref gdcmDicomDir rules + * \brief Compares two documents, according to \ref DicomDir rules * \warning Does NOT work with ACR-NEMA files * \todo Find a trick to solve the pb (use RET fields ?) * @param document * @return true if 'smaller' */ -bool gdcmDocument::operator<(gdcmDocument &document) +bool Document::operator<(Document &document) { // Patient Name std::string s1 = GetEntryByNumber(0x0010,0x0010); @@ -3075,5 +3076,6 @@ bool gdcmDocument::operator<(gdcmDocument &document) return false; } +} // end namespace gdcm //-----------------------------------------------------------------------------