Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2007/06/18 15:44:52 $
- Version: $Revision: 1.362 $
+ Date: $Date: 2007/08/21 12:51:09 $
+ Version: $Revision: 1.367 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* --> We don't write the element 0x0000 (group length)
*/
- ElementSet::WriteContent(fp, filetype); // This one is recursive
+ ElementSet::WriteContent(fp, filetype, false); // This one is recursive
}
// -----------------------------------------
gdcmWarningMacro("in ParseSQ : should never get here!");
UnexpectedEOF = true;
return false;
- //break;
}
if ( delim_mode )
{
uint16_t length16;
if ( Filetype == ExplicitVR && !entry->IsImplicitVR() )
{
+
+ // WARNING :
+ //
+ // For some images, length of UN elements is coded on 2 bytes (instead of 4)
+ // There are *not* readable !
+ // You can make a quick and dirty patch, commenting out
+ //| vr == "UN"
+ // in the following line.
+ // (the 'straight' images will no longer be readable ...)
+
if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT"
- || vr == "UN" || changeFromUN == true)
+ || vr == "UN" || changeFromUN == true)
{
changeFromUN = false;
// The following reserved two bytes (see PS 3.5-2003, section
changeFromUN = false;
CurrentGroup = GetInt16();
CurrentElem = GetInt16();
-
+
// In 'true DICOM' files Group 0002 is always little endian
if ( HasDCMPreamble )
{
realVR = "UL";
}
- // Commented out in order not to generate 'Shadow Groups' where some
+ // Was commented out in order not to generate 'Shadow Groups' where some
// Data Elements are Explicit VR and some other ones Implicit VR
- // (Stupid MatLab DICOM Reader couldn't read gdcm-written images)
- /*
- else if (CurrentGroup%2 == 1 &&
- (CurrentElem >= 0x0010 && CurrentElem <=0x00ff ))
- {
- // DICOM PS 3-5 7.8.1 a) states that those
- // (gggg-0010->00FF where gggg is odd) attributes have to be LO
- realVR = "LO";
+ // -> Better we fix the problem at Write time
+
+ else if (CurrentGroup%2 == 1 )
+ {
+ if (CurrentElem >= 0x0010 && CurrentElem <=0x00ff )
+ // DICOM PS 3-5 7.8.1 a) states that :
+ // Private Creator Data Elements numbered (gggg,0010-00FF) (gggg is odd)
+ // attributes have to be LO (Long String) and the VM shall be equal to 1
+ realVR = "LO";
+
+ // Seems not to be true
+ // Still in gdcmtk, David Clunnie disagrees, Marco Eichelberg says it's OK ...
+ // We let it for a while?
+ //(We should check length==4, for more security, but we don't have it yet !)
+ else if ( CurrentElem == 0x0001)
+ realVR = "UL"; // Private Group Length To End
}
- */
+
else
{
DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem);//only when ImplicitVR
// for VR = "UN", length is always stored on 4 bytes.
changeFromUN=true;
/// \todo : fixme If inside a supposed to be UN DataElement (but SQ according to a private dictionnary)
- /// there is some more supposed to UN DataElements, it will probabely fail.
+ /// there is some more supposed to be UN DataElements, it will probabely fail.
/// --> find a -non time consuming- trick to store changeFromUN info at DataElement level,
/// not at the Document level.
}