X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=588e92eda4120bf4aa083acec50f09ad348fd47b;hb=f51f3cf0f4013935c1d93a828779e5ca285a31fc;hp=8c0ddc3cc5c8195bf9d075e94958c3c7e51c2356;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 8c0ddc3c..588e92ed 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 16:18:48 $ - Version: $Revision: 1.220 $ + Date: $Date: 2005/03/09 19:31:54 $ + Version: $Revision: 1.232 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,15 +30,7 @@ #include #include - -// For nthos: -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) - #include -#endif - -#ifdef CMAKE_HAVE_NETINET_IN_H - #include -#endif +#include namespace gdcm { @@ -72,9 +64,8 @@ Document::Document( std::string const &filename ) Group0002Parsed = false; - gdcmVerboseMacro( "Starting parsing of file: " << Filename.c_str()); - // Fp->seekg( 0, std::ios::beg); - + gdcmWarningMacro( "Starting parsing of file: " << Filename.c_str()); + Fp->seekg(0, std::ios::end); long lgt = Fp->tellg(); @@ -129,8 +120,8 @@ Document::Document( std::string const &filename ) // Specific code to allow gdcm to read ACR-LibIDO formated images // Note: ACR-LibIDO is an extension of the ACR standard that was // used at CREATIS. For the time being (say a couple years) - // we keep this kludge to allow a smooth move to gdcm for - // CREATIS developpers (sorry folks). + // we keep this kludge to allow CREATIS users + // reading their old images. // // if recognition code tells us we deal with a LibIDO image // we switch lineNumber and columnNumber @@ -225,13 +216,13 @@ bool Document::IsReadable() { if( Filetype == Unknown) { - gdcmVerboseMacro( "Wrong filetype"); + gdcmWarningMacro( "Wrong filetype"); return false; } if ( IsEmpty() ) { - gdcmVerboseMacro( "No tag in internal hash table."); + gdcmWarningMacro( "No tag in internal hash table."); return false; } @@ -332,7 +323,7 @@ std::string Document::GetTransferSyntaxName() } if ( transferSyntax == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Unfound Transfer Syntax (0002,0010)"); + gdcmWarningMacro( "Unfound Transfer Syntax (0002,0010)"); return "Uncompressed ACR-NEMA"; } @@ -352,7 +343,9 @@ uint16_t Document::SwapShort(uint16_t a) { if ( SwapCode == 4321 || SwapCode == 2143 ) { - a = ((( a << 8 ) & 0x0ff00 ) | (( a >> 8 ) & 0x00ff ) ); + //a = ((( a << 8 ) & 0xff00 ) | (( a >> 8 ) & 0x00ff ) ); + // Save CPU time + a = ( a << 8 ) | ( a >> 8 ); } return a; } @@ -369,11 +362,15 @@ uint32_t Document::SwapLong(uint32_t a) case 1234 : break; case 4321 : - a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) | - ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) ); +// a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) | +// ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) ); +// save CPU time + a=( ( a<<24) | ((a<<8) & 0x00ff0000) | + ((a>>8) & 0x0000ff00) | (a>>24) ); break; case 3412 : - a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) ); +// a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) ); + a=( (a<<16) | (a>>16) ); break; case 2143 : a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) ); @@ -402,7 +399,7 @@ std::ifstream *Document::OpenFile() if(Fp) { - gdcmVerboseMacro( "File already open: " << Filename.c_str()); + gdcmWarningMacro( "File already open: " << Filename.c_str()); CloseFile(); } @@ -415,7 +412,7 @@ std::ifstream *Document::OpenFile() return 0; } - uint16_t zero; + uint16_t zero = 0; Fp->read((char*)&zero, (size_t)2); if( Fp->eof() ) { @@ -432,13 +429,13 @@ std::ifstream *Document::OpenFile() { std::string msg = Util::Format("ACR/DICOM with no preamble: (%04x)\n", zero); - gdcmVerboseMacro( msg.c_str() ); + gdcmWarningMacro( msg.c_str() ); return Fp; } //DICOM Fp->seekg(126L, std::ios::cur); - char dicm[4]; + char dicm[4] = {' ',' ',' ',' '}; Fp->read(dicm, (size_t)4); if( Fp->eof() ) { @@ -452,7 +449,7 @@ std::ifstream *Document::OpenFile() } CloseFile(); - gdcmVerboseMacro( "Not DICOM/ACR (missing preamble)" << Filename.c_str()); + gdcmWarningMacro( "Not DICOM/ACR (missing preamble)" << Filename.c_str()); return 0; } @@ -469,7 +466,7 @@ bool Document::CloseFile() delete Fp; Fp = 0; } - return true; //FIXME how do we detect a non-closed ifstream ? + return true; } /** @@ -554,11 +551,10 @@ void Document::LoadEntryBinArea(BinEntry *elem) uint8_t *a = new uint8_t[l]; if( !a ) { - gdcmVerboseMacro( "Cannot allocate BinEntry content"); + gdcmWarningMacro( "Cannot allocate BinEntry content"); return; } - /// \todo check the result Fp->read((char*)a, l); if( Fp->fail() || Fp->eof()) { @@ -576,8 +572,7 @@ void Document::LoadEntryBinArea(BinEntry *elem) * \brief Loads the element while preserving the current * underlying file position indicator as opposed to * LoadDocEntry that modifies it. - * @param entry Header Entry whose value will be loaded. - * @return + * @param entry DocEntry whose value will be loaded. */ void Document::LoadDocEntrySafe(DocEntry *entry) { @@ -593,7 +588,7 @@ void Document::LoadDocEntrySafe(DocEntry *entry) * \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 + * @param document to compare with current one * @return true if 'smaller' */ bool Document::operator<(Document &document) @@ -658,7 +653,7 @@ bool Document::operator<(Document &document) // Protected /** * \brief Reads a supposed to be 16 Bits integer - * (swaps it depending on processor endianity) + * (swaps it depending on processor endianness) * @return read value */ uint16_t Document::ReadInt16() @@ -680,7 +675,7 @@ uint16_t Document::ReadInt16() /** * \brief Reads a supposed to be 32 Bits integer - * (swaps it depending on processor endianity) + * (swaps it depending on processor endianness) * @return read value */ uint32_t Document::ReadInt32() @@ -776,12 +771,12 @@ void Document::Initialize() void Document::ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode) { - DocEntry *newDocEntry = 0; + DocEntry *newDocEntry; ValEntry *newValEntry; BinEntry *newBinEntry; SeqEntry *newSeqEntry; VRKey vr; - bool used = false; + bool used; while (true) { @@ -811,7 +806,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, !Global::GetVR()->IsVROfBinaryRepresentable(vr) ) { ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR - gdcmVerboseMacro( std::hex << newDocEntry->GetGroup() + gdcmWarningMacro( std::hex << newDocEntry->GetGroup() << "|" << newDocEntry->GetElement() << " : Neither Valentry, nor BinEntry." "Probably unknown VR."); @@ -998,12 +993,6 @@ void Document::ParseSQ( SeqEntry *seqEntry, { dlm_mod = false; } - // FIXME, TODO - // when we're here, element fffe,e000 is already passed. - // it's lost for the SQItem we're going to process !! - - //ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod); - //delete newDocEntry; // FIXME well ... it's too late to use it ! // Let's try :------------ // remove fff0,e000, created out of the SQItem @@ -1101,7 +1090,6 @@ void Document::LoadDocEntry(DocEntry *entry) return; } - /// \todo Any compacter code suggested (?) if ( IsDocEntryAnInteger(entry) ) { uint32_t NewInt; @@ -1159,7 +1147,7 @@ void Document::LoadDocEntry(DocEntry *entry) if( length % 2 ) { newValue = Util::DicomString(str, length+1); - gdcmVerboseMacro("Warning: bad length: " << length << + gdcmWarningMacro("Warning: bad length: " << length << ",For string :" << newValue.c_str()); // Since we change the length of string update it length //entry->SetReadLength(length+1); @@ -1174,7 +1162,7 @@ void Document::LoadDocEntry(DocEntry *entry) { if ( Fp->fail() || Fp->eof()) { - gdcmVerboseMacro("Unread element value"); + gdcmWarningMacro("Unread element value"); valEntry->SetValue(GDCM_UNREAD); return; } @@ -1374,7 +1362,7 @@ uint32_t Document::FindDocEntryLengthOBOrOW() if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) ) { long filePosition = Fp->tellg(); - gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag on :" + gdcmWarningMacro( "Neither an Item tag nor a Sequence delimiter tag on :" << std::hex << group << " , " << elem << ") -before- position x(" << filePosition << ")" ); @@ -1618,7 +1606,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, if ( foundLength % 2) { - gdcmVerboseMacro( "Warning : Tag with uneven length " << foundLength + gdcmWarningMacro( "Warning : Tag with uneven length " << foundLength << " in x(" << std::hex << gr << "," << elem <<")"); } @@ -1634,7 +1622,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, if ( gr != 0x0008 || ( elem != 0x0070 && elem != 0x0080 ) ) { foundLength = 10; - entry->SetReadLength(10); /// \todo a bug is to be fixed !? + entry->SetReadLength(10); // a bug is to be fixed !? } } @@ -1645,7 +1633,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, else if ( gr == 0x0009 && ( elem == 0x1113 || elem == 0x1114 ) ) { foundLength = 4; - entry->SetReadLength(4); /// \todo a bug is to be fixed !? + entry->SetReadLength(4); // a bug is to be fixed !? } else if ( entry->GetVR() == "SQ" ) @@ -1701,7 +1689,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry) // encounter such an ill-formed image, we simply display a warning // message and proceed on parsing (while crossing fingers). long filePosition = Fp->tellg(); - gdcmVerboseMacro( "Erroneous Group Length element length on : (" + gdcmWarningMacro( "Erroneous Group Length element length on : (" << std::hex << group << " , " << elem << ") -before- position x(" << filePosition << ")" << "lgt : " << length ); @@ -1730,8 +1718,6 @@ bool Document::CheckSwap() // 0x00000004. Finding the swap code in then straigthforward. Trouble // occurs when we can't find such group... - uint32_t x = 4; // x : for ntohs - bool net2host; // true when HostByteOrder is the same as NetworkByteOrder uint32_t s32; uint16_t s16; @@ -1739,14 +1725,7 @@ bool Document::CheckSwap() // First, compare HostByteOrder and NetworkByteOrder in order to // determine if we shall need to swap bytes (i.e. the Endian type). - if ( x == ntohs(x) ) - { - net2host = true; - } - else - { - net2host = false; - } + bool net2host = Util::IsCurrentProcessorBigEndian(); // The easiest case is the one of a 'true' DICOM header, we just have // to look for the string "DICM" inside the file preamble. @@ -1755,7 +1734,7 @@ bool Document::CheckSwap() char *entCur = deb + 128; if( memcmp(entCur, "DICM", (size_t)4) == 0 ) { - gdcmVerboseMacro( "Looks like DICOM Version3 (preamble + DCM)" ); + gdcmWarningMacro( "Looks like DICOM Version3 (preamble + DCM)" ); // Group 0002 should always be VR, and the first element 0000 // Let's be carefull (so many wrong headers ...) @@ -1787,24 +1766,24 @@ bool Document::CheckSwap() // instead of just checking for UL, OB and UI !? group 0000 { Filetype = ExplicitVR; - gdcmVerboseMacro( "Group 0002 : Explicit Value Representation"); + gdcmWarningMacro( "Group 0002 : Explicit Value Representation"); } else { Filetype = ImplicitVR; - gdcmVerboseMacro( "Group 0002 :Not an explicit Value Representation;" + gdcmWarningMacro( "Group 0002 :Not an explicit Value Representation;" << "Looks like a bugged Header!"); } if ( net2host ) { SwapCode = 4321; - gdcmVerboseMacro( "HostByteOrder != NetworkByteOrder"); + gdcmWarningMacro( "HostByteOrder != NetworkByteOrder"); } else { SwapCode = 1234; - gdcmVerboseMacro( "HostByteOrder = NetworkByteOrder"); + gdcmWarningMacro( "HostByteOrder = NetworkByteOrder"); } // Position the file position indicator at first tag @@ -1817,7 +1796,7 @@ bool Document::CheckSwap() // 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). - gdcmVerboseMacro( "Not a DICOM Version3 file"); + gdcmWarningMacro( "Not a DICOM Version3 file"); Fp->seekg(0, std::ios::beg); // Our next best chance would be to be considering a 'clean' ACR/NEMA file. @@ -1892,7 +1871,7 @@ bool Document::CheckSwap() Filetype = ACR; return true; default : - gdcmVerboseMacro( "ACR/NEMA unfound swap info (Really hopeless !)"); + gdcmWarningMacro( "ACR/NEMA unfound swap info (Really hopeless !)"); Filetype = Unknown; return false; } @@ -1904,7 +1883,7 @@ bool Document::CheckSwap() */ void Document::SwitchByteSwapCode() { - gdcmVerboseMacro( "Switching Byte Swap code from "<< SwapCode); + gdcmWarningMacro( "Switching Byte Swap code from "<< SwapCode); if ( SwapCode == 1234 ) { SwapCode = 4321; @@ -1925,7 +1904,7 @@ void Document::SwitchByteSwapCode() /** * \brief during parsing, Header Elements too long are not loaded in memory - * @param newSize + * @param newSize new size */ void Document::SetMaxSizeLoadEntry(long newSize) { @@ -1943,8 +1922,8 @@ void Document::SetMaxSizeLoadEntry(long newSize) /** * \brief Header Elements too long will not be printed - * \todo See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE - * @param newSize + * See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE + * @param newSize new size */ void Document::SetMaxSizePrintEntry(long newSize) { @@ -2021,7 +2000,7 @@ DocEntry *Document::ReadNextDocEntry() std::string msg; msg = Util::Format("Entry (%04x,%04x) should be Explicit VR\n", newEntry->GetGroup(), newEntry->GetElement()); - gdcmVerboseMacro( msg.c_str() ); + gdcmWarningMacro( msg.c_str() ); } } newEntry->SetImplicitVR(); @@ -2089,7 +2068,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) std::string ts = GetTransferSyntax(); if ( !Global::GetTS()->IsTransferSyntax(ts) ) { - gdcmVerboseMacro("True DICOM File, with NO Tansfer Syntax: " << ts ); + gdcmWarningMacro("True DICOM File, with NO Tansfer Syntax: " << ts ); return; } @@ -2104,7 +2083,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) //'Implicit VR Transfer Syntax (GE Private) if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian ) { - gdcmVerboseMacro("Transfer Syntax Name = [" + gdcmWarningMacro("Transfer Syntax Name = [" << GetTransferSyntaxName() << "]" ); SwitchByteSwapCode(); group = SwapShort(group);