Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/06/28 11:01:18 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2004/07/20 08:29:13 $
+ Version: $Revision: 1.18 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
void gdcmValEntry::Print(std::ostream & os)
{
- guint16 g = GetGroup();
- guint16 e = GetElement();
+ uint16_t g = GetGroup();
+ uint16_t e = GetElement();
std::string vr = GetVR();
std::ostringstream s;
char st[20];
s << " [gdcm::too long for print (" << GetLength() << ") ]";
}
- // Display the UID value (instead of displaying only the rough code)
+ // Display the UID value (instead of displaying only the rough code)
+ // First 'clean' trailing character (space or zero)
if (g == 0x0002) { // Any more to be displayed ?
- if ( (e == 0x0010) || (e == 0x0002) )
+ if ( (e == 0x0010) || (e == 0x0002) ) {
+ if ( v.length() != 0 ) // for brain damaged headers
+ if ( ! isdigit(v[v.length()-1]) )
+ v.erase(v.length()-1, 1);
s << " ==>\t[" << ts->GetValue(v) << "]";
+ }
} else {
if (g == 0x0008) {
- if ( (e == 0x0016) || (e == 0x1150) )
+ if ( (e == 0x0016) || (e == 0x1150) ) {
+ if ( v.length() != 0 ) // for brain damaged headers
+ if ( ! isdigit(v[v.length()-1]) )
+ v.erase(v.length()-1, 1);
s << " ==>\t[" << ts->GetValue(v) << "]";
+ }
} else {
if (g == 0x0004) {
- if ( (e == 0x1510) || (e == 0x1512) )
+ if ( (e == 0x1510) || (e == 0x1512) ) {
+ if ( v.length() != 0 ) // for brain damaged headers
+ if ( ! isdigit(v[v.length()-1]) )
+ v.erase(v.length()-1, 1);
s << " ==>\t[" << ts->GetValue(v) << "]";
+ }
}
}
}
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
Tokenize (GetValue(), tokens, "\\");
for (unsigned int i=0; i<tokens.size();i++) {
- guint16 val_uint16 = atoi(tokens[i].c_str());
+ uint16_t val_uint16 = atoi(tokens[i].c_str());
void *ptr = &val_uint16;
fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
}
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
Tokenize (GetValue(), tokens, "\\");
for (unsigned int i=0; i<tokens.size();i++){
- guint32 val_uint32 = atoi(tokens[i].c_str());
+ uint32_t val_uint32 = atoi(tokens[i].c_str());
void *ptr = &val_uint32;
fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
}