Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/11/02 10:15:04 $
- Version: $Revision: 1.299 $
+ Date: $Date: 2005/11/05 13:24:39 $
+ Version: $Revision: 1.302 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
nbValue = entry->GetValueCount();
// Can't use IsValueCountValid because of the complex heuristic.
+ if( nbValue !=2 )
+ gdcmWarningMacro("ImagerPixelSpacing (0x0018,0x1164) "
+ << "has a wrong number of values :" << nbValue);
+
if( nbValue >= 3 )
xspacing = (float)entry->GetValue(2);
- if( nbValue >= 2 )
+ else if( nbValue >= 2 )
xspacing = (float)entry->GetValue(1);
else
xspacing = (float)entry->GetValue(0);
if( entry )
{
nbValue = entry->GetValueCount();
+ if( nbValue !=2 )
+ gdcmWarningMacro("PixelSpacing (0x0018,0x0030) "
+ << "has a wrong number of values :" << nbValue);
+
if( nbValue >= 3 )
xspacing = (float)entry->GetValue(2);
else if( nbValue >= 2 )
e0000->SetString(sLen.str());
}
- // Derma?.dcm does not have it...let's remove it FIXME FIXME
+ // FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
if( writetype != JPEG )
{
- int i_lgPix = GetEntryLength(GrPixel, NumPixel);
- if (i_lgPix != -2)
- {
- // no (GrPixel, NumPixel) element
- std::string s_lgPix = Util::Format("%d", i_lgPix+12);
- s_lgPix = Util::DicomString( s_lgPix.c_str() );
- InsertEntryString(s_lgPix,GrPixel, 0x0000);
- }
- }
-
+ int i_lgPix = GetEntryLength(GrPixel, NumPixel);
+ if (i_lgPix != -2)
+ {
+ // no (GrPixel, NumPixel) element
+ std::string s_lgPix = Util::Format("%d", i_lgPix+12);
+ s_lgPix = Util::DicomString( s_lgPix.c_str() );
+ InsertEntryString(s_lgPix,GrPixel, 0x0000);
+ }
+ }
Document::WriteContent(fp, writetype);
fp->close();
uint32_t val = BasicOffsetTableItemValue[i];
BasicOffsetTableItemValue[i]
= ( (val<<24) | ((val<<8) & 0x00ff0000) |
- ((val>>8) & 0x0000ff00) | (val>>24) );
+ ( (val>>8) & 0x0000ff00) | (val>>24) );
#endif
- gdcmWarningMacro( "Read one length for: " <<
+ gdcmDebugMacro( "Read one length for: " <<
std::hex << BasicOffsetTableItemValue[i] );
}