Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/10/22 03:05:42 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2004/11/16 16:49:01 $
+ Version: $Revision: 1.36 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
if ( v.length() != 0 ) // for brain damaged headers
{
- if ( ! isdigit(v[v.length()-1]) )
+ if ( ! isdigit((unsigned char)v[v.length()-1]) )
{
v.erase(v.length()-1, 1);
}
{
if ( v.length() != 0 ) // for brain damaged headers
{
- if ( ! isdigit(v[v.length()-1]) )
+ if ( ! isdigit((unsigned char)v[v.length()-1]) )
{
v.erase(v.length()-1, 1);
}
{
if ( v.length() != 0 ) // for brain damaged headers
{
- if ( ! isdigit(v[v.length()-1]) )
+ if ( ! isdigit((unsigned char)v[v.length()-1]) )
{
v.erase(v.length()-1, 1);
}
}
std::string vr = GetVR();
- int lgr = GetReadLength();
+ unsigned int lgr = GetReadLength();
if (vr == "US" || vr == "SS")
{
// some 'Short integer' fields may be mulivaluated
for (unsigned int i=0; i<tokens.size();i++)
{
uint16_t val_uint16 = atoi(tokens[i].c_str());
- void* ptr = &val_uint16;
- fp->write ( (char*)ptr,(size_t)2);
+ binary_write( *fp, val_uint16);
}
tokens.clear();
return;
for (unsigned int i=0; i<tokens.size();i++)
{
uint32_t val_uint32 = atoi(tokens[i].c_str());
- void* ptr = &val_uint32;
- fp->write ( (char*)ptr,(size_t)4 );
+ binary_write( *fp, val_uint32);
}
tokens.clear();
return;
}
-
- fp->write (GetValue().c_str(), (size_t)lgr ); // Elem value
+
+ assert( lgr == GetValue().size() );
+ binary_write(*fp, GetValue());
}
//-----------------------------------------------------------------------------