Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2007/06/15 13:16:55 $
- Version: $Revision: 1.360 $
+ Date: $Date: 2007/08/29 15:30:49 $
+ Version: $Revision: 1.368 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
SetFileName("");
changeFromUN=false;
+ UnexpectedEOF=false;
}
/**
* --> was too much tricky / we were [in a hurry / too lazy]
* --> We don't write the element 0x0000 (group length)
*/
-
- ElementSet::WriteContent(fp, filetype); // This one is recursive
+ // This one is recursive
+ // false : outside MetaElements
+ // false : outside Sequence
+ ElementSet::WriteContent(fp, filetype, false, false);
}
// -----------------------------------------
/**
* \brief Reads a given length of bytes
- * (in order to avoid to many CPU time consuming fread-s)
+ * (in order to avoid to many CPU time-consuming fread-s)
* @param l length to read
*/
void Document::ReadBegBuffer(size_t l)
<< " at offset 0x(" << std::hex
<< newDocEntry->GetOffset() << ")");
- ParseSQ( newSeqEntry,
- newDocEntry->GetOffset(),
- l, delim_mode_intern);
+ bool res = ParseSQ( newSeqEntry,
+ newDocEntry->GetOffset(),
+ l, delim_mode_intern);
- gdcmDebugMacro( "Exit from ParseSQ, delim " << delim_mode_intern);
+ gdcmDebugMacro( "Exit from ParseSQ, delim " << delim_mode_intern << " -->return : " << res);
}
if ( !set->AddEntry( newSeqEntry ) )
{
newDocEntry->Delete();
}
first = false;
+
+ if (UnexpectedEOF) // some terminator was missing
+ break;
} // end While
gdcmDebugMacro( "Exit from ParseDES, delim-mode " << delim_mode );
}
/**
* \brief Parses a Sequence ( SeqEntry after SeqEntry)
- * @return parsed length for this level
+ * @return false if expected fff0,e000 not found
*/
-void Document::ParseSQ( SeqEntry *seqEntry,
+bool Document::ParseSQ( SeqEntry *seqEntry,
long offset, long l_max, bool delim_mode)
{
int SQItemNumber = 0;
DocEntry *newDocEntry = ReadNextDocEntry();
if ( !newDocEntry )
- {
+ {
+ // The most frequent is when a SQ terminator is missing (?!?)
gdcmWarningMacro("in ParseSQ : should never get here!");
- break;
+ UnexpectedEOF = true;
+ return false;
}
if ( delim_mode )
{
break;
}
}
+ return true;
}
/**
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
return false;
s16 = *((uint16_t *)(deb+2));
- //s32 = *((uint32_t *)(deb));
Fp->seekg ( 0L, std::ios::beg); // Once per Document
CurrentOffsetPosition = 0;
switch(s16) // try an other trick!
// -> to be able to decode 0029|1010 DataElement
// -> and be not less cleaver than dcmdump ;-)
{
- case 0x00040000 :
- SwapCode = 4321;
+ case 0x0004 :
+ SwapCode = 1234;
break;
- case 0x04000000 :
+ case 0x0400 :
SwapCode = 3412;
- break;
- case 0x00000400 :
- SwapCode = 2143;
- break;
- case 0x00000004 :
- SwapCode = 1234;
- break;
-
+ break;
default:
gdcmWarningMacro("ACR/NEMA unfound swap info (Hopeless !)");
Filetype = Unknown;
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
}
}
}
-
+
// if UN found, let's check the dictionary, and trust it!
// (maybe a private dictionary exists?)
else if (vr == "UN")
// 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.
}
}
+
DocEntry *newEntry;
//if ( Global::GetVR()->IsVROfSequence(realVR) )
if (realVR == "SQ")
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff