Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/10/20 13:55:05 $
- Version: $Revision: 1.300 $
+ Date: $Date: 2005/10/23 15:28:26 $
+ Version: $Revision: 1.303 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
- * @param elem Entry whose binArea is going to be loaded
+ * @param entry Entry whose binArea is going to be loaded
*/
void Document::LoadEntryBinArea(DataEntry *entry)
{
return;
}
- // Read the datas
+ // Read the data
Fp->read((char*)data, l);
if ( Fp->fail() || Fp->eof() )
{
}
case 8:
{
- gdcmWarningMacro("Can't swap 64 bits datas");
+ gdcmWarningMacro("Can't swap 64 bits data");
/* uint64_t *data64 = (uint64_t *)data;
for(i=0;i<l/vrLgth;i++)
data64[i] = SwapLongLong(data64[i]);*/
// (no SQ, OW, UT in group 0x0002;)
if ( vr == "OB" )
{
- // explicit VR AND OB, OW, SQ, UT : 4 more bytes
+ // explicit VR AND (OB, OW, SQ, UT) : 4 more bytes
groupLength += 4;
}
//}
if ( newDataEntry )
{
//////////////////////////// DataEntry
+
vr = newDocEntry->GetVR();
+
+ // Useless checking, now !
+ /*
if ( Filetype == ExplicitVR &&
!Global::GetVR()->IsVROfBinaryRepresentable(vr) )
{
////// No DataEntry: should mean UNKOWN VR
gdcmWarningMacro( std::hex << newDocEntry->GetGroup()
<< "|" << newDocEntry->GetElement()
- << " : No DataEntry."
- "Probably unknown VR.");
+ << " : unknown VR."
+ " Probably 'Implicit VR' entry within "
+ "an explicit VR 'document'.");
}
+ */
if ( !set->AddEntry( newDataEntry ) )
{
if ( dictEntry )
{
realVR = dictEntry->GetVR();
+ dictEntry->Unregister();
}
}
}