Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/02/11 19:19:05 $
- Version: $Revision: 1.228 $
+ Date: $Date: 2005/02/14 10:45:04 $
+ Version: $Revision: 1.230 $
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
{
//-----------------------------------------------------------------------------
{
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) );
// First, compare HostByteOrder and NetworkByteOrder in order to
// determine if we shall need to swap bytes (i.e. the Endian type).
-
- uint32_t x = 4; // x : for ntohs
- bool net2host = (x == ntohs(x));// true when HostByteOrder is the same as NetworkByteOrder
+ 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.