Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/02/07 09:51:03 $
- Version: $Revision: 1.225 $
+ 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
#include <iomanip>
#include <fstream>
-// For nthos:
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
- #include <winsock.h>
-#endif
-
-#ifdef CMAKE_HAVE_NETINET_IN_H
- #include <netinet/in.h>
-#endif
-
namespace gdcm
{
//-----------------------------------------------------------------------------
Group0002Parsed = false;
gdcmWarningMacro( "Starting parsing of file: " << Filename.c_str());
- // Fp->seekg( 0, std::ios::beg);
-
+
Fp->seekg(0, std::ios::end);
long lgt = Fp->tellg();
// 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
{
if ( SwapCode == 4321 || SwapCode == 2143 )
{
- a = ((( a << 8 ) & 0xff00 ) | (( a >> 8 ) & 0x00ff ) );
+ //a = ((( a << 8 ) & 0xff00 ) | (( a >> 8 ) & 0x00ff ) );
+ // Save CPU time
+ a = ( a << 8 ) | ( a >> 8 );
}
return 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) );
delete Fp;
Fp = 0;
}
- return true; //FIXME how do we detect a non-closed ifstream ?
+ return true;
}
/**
return;
}
- /// \todo check the result
Fp->read((char*)a, l);
if( Fp->fail() || Fp->eof())
{
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)
{
{
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
return;
}
- /// \todo Any compacter code suggested (?)
if ( IsDocEntryAnInteger(entry) )
{
uint32_t NewInt;
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 !?
}
}
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" )
// 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;
// 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.
/**
* \brief during parsing, Header Elements too long are not loaded in memory
- * @param newSize
+ * @param newSize new size
*/
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)
{