Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2005/02/14 14:34:27 $
- Version: $Revision: 1.141 $
+ Date: $Date: 2005/04/19 09:58:19 $
+ Version: $Revision: 1.148 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-------------------------------------------------------------------------
const std::string Util::GDCM_UID = "1.2.826.0.1.3680043.2.1143";
std::string Util::RootUID = GDCM_UID;
+const uint16_t Util::FMIV = 0x0001;
+uint8_t *Util::FileMetaInformationVersion = (uint8_t *)&FMIV;
//-------------------------------------------------------------------------
// Public
{
#ifdef _WIN32
WSADATA WinsockData;
- if (WSAStartup(MAKEWORD(2, 0), &WinsockData) != 0)
+ if ( (WSAStartup(MAKEWORD(2, 0), &WinsockData)) != 0)
{
std::cerr << "This program requires Winsock 2.x!" << std::endl;
return -1;
// implementation for POSIX system
-#ifdef __sun
+#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun)
//The POSIX version is broken anyway on Solaris, plus would require full
//root power
struct arpreq parpreq;
* \brief
* @param os ostream to write to
* @param val val
- * @param len length of the 'value' to be written
*/
std::ostream &binary_write(std::ostream &os, std::string const &val)
{
/**
* \brief binary_write binary_write
* @param os ostream to write to
- * @param val val
+ * @param val value
+ * @param len length of the 'value' to be written
*/
std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len)
{
// intermediate result before writting it.
#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
const int BUFFER_SIZE = 4096;
- uint16_t *binArea16 = (uint16_t*)val;
- uint16_t *buffer = new uint16_t[BUFFER_SIZE/2];
- uint16_t *pbuffer = buffer;
+ static char buffer[BUFFER_SIZE];
+ uint16_t *binArea16 = (uint16_t*)val; //for the const
// how many BUFFER_SIZE long pieces in binArea ?
int nbPieces = len/BUFFER_SIZE; //(16 bits = 2 Bytes)
for (int j=0;j<nbPieces;j++)
{
-
+ uint16_t *pbuffer = (uint16_t*)buffer; //reinitialize pbuffer
for (int i = 0; i < BUFFER_SIZE/2; i++)
{
- //uint16_t val16 = binArea16[i];
- //buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) );
- // save CPU time :
- // 1) Save 1 affectation and 2 AND operations
- // buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8);
- // 2) Replace * operations by + operations using pointers
- *pbuffer = *binArea16 >> 8 | *binArea16 >> 8;
+ *pbuffer = *binArea16 >> 8 | *binArea16 << 8;
pbuffer++;
binArea16++;
}
- os.write ( (char*)buffer, BUFFER_SIZE );
- binArea16 += BUFFER_SIZE/2;
+ os.write ( buffer, BUFFER_SIZE );
}
if ( remainingSize > 0)
{
+ uint16_t *pbuffer = (uint16_t*)buffer; //reinitialize pbuffer
for (int i = 0; i < remainingSize/2; i++)
{
- //uint16_t val16 = binArea16[i];
- //buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff) );
- *pbuffer = *binArea16 >> 8 | *binArea16 >> 8;
+ *pbuffer = *binArea16 >> 8 | *binArea16 << 8;
pbuffer++;
binArea16++;
}
- os.write ( (char*)buffer, remainingSize );
+ os.write ( buffer, remainingSize );
}
- delete[] buffer;
return os;
#else
return os.write(reinterpret_cast<const char*>(val), len);