Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/09/07 14:12:23 $
- Version: $Revision: 1.277 $
+ Date: $Date: 2005/10/17 14:55:01 $
+ Version: $Revision: 1.288 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
}
/**
- * \brief Writes in a file all the Header Entries (Dicom Elements)
+ * \brief Writes in a file all the Entries (Dicom Elements)
* @param fp file pointer on an already open file (actually: Output File Stream)
* @param filetype Type of the File to be written
* (ACR-NEMA, ExplicitVR, ImplicitVR)
- * @return Always true.
*/
void Document::WriteContent(std::ofstream *fp, FileType filetype)
{
BinEntry *newBinEntry;
SeqEntry *newSeqEntry;
VRKey vr;
- bool used;
+ bool used; // will be set to false when something wrong happens to an Entry.
+ // (Entry will then be deleted)
bool delim_mode_intern = delim_mode;
bool first = true;
+ gdcmWarningMacro( "Enter in ParseDES, delim-mode " << delim_mode
+ << " at offset " << std::hex << offset );
while (true)
{
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
newDocEntry = ReadNextDocEntry( );
+ // FIXME :
+ // Private tag, in IMplicit VR are defaulted as a BinEntry,
+ // Very often they are only composed of Printable characters,
+ // and could be defaulted as a ValEntry.
+ // It's too late to do the Job
+ // (we should check the value, but we know it after LoadDocEntry ...)
+ // --> in next gdcm major release let's unify ValEntry and BinEntry !
+
// Uncoment this printf line to be able to 'follow' the DocEntries
// when something *very* strange happens
break;
}
- // an Item Starter found elsewhere but the first postition
+ // an Item Starter found elsewhere but the first position
// of a SeqEntry means previous entry was a Sequence
// but we didn't get it (private Sequence + Implicit VR)
// we have to backtrack.
{
lgrGroup = atoi(strLgrGroup.c_str());
Fp->seekg(lgrGroup, std::ios::cur);
- used = false;
- RemoveEntry( newDocEntry );
- newDocEntry = 0;
+ //used = false; // never used
+ RemoveEntry( newDocEntry ); // Remove and delete
+ // bcc 5.5 is right "assigned a value that's never used"
+ // newDocEntry = 0;
continue;
}
}
}
}
- bool delimitor=newValEntry->IsItemDelimitor();
+ bool delimitor = newValEntry->IsItemDelimitor();
if ( (delimitor) ||
(!delim_mode && ((long)(Fp->tellg())-offset) >= l_max) )
if ( newDocEntry->GetGroup()%2 != 0 )
{
Fp->seekg( l, std::ios::cur);
- used = false;
+ RemoveEntry( newDocEntry ); // Remove and delete
+ //used = false; // never used
continue;
}
}
{
// User asked to skip *any* SeQuence
Fp->seekg( l, std::ios::cur);
- used = false;
+ //used = false; // never used
+ RemoveEntry( newDocEntry ); // Remove and delete
continue;
}
// delay the dynamic cast as late as possible
if ( l != 0 )
{ // Don't try to parse zero-length sequences
+
+ gdcmWarningMacro( "Entry in ParseSQ, delim " << delim_mode_intern
+ << " at offset " << std::hex
+ << newDocEntry->GetOffset() );
+
ParseSQ( newSeqEntry,
newDocEntry->GetOffset(),
l, delim_mode_intern);
+
+ gdcmWarningMacro( "Exit from ParseSQ, delim " << delim_mode_intern);
+
}
if ( !set->AddEntry( newSeqEntry ) )
{
used = false;
}
- if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
+ if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
if ( !used )
delete newDocEntry;
}
first = false;
} // end While
+ gdcmWarningMacro( "Exit from ParseDES, delim-mode " << delim_mode );
}
/**
* \brief Loads (or not) the element content depending if its length exceeds
* or not the value specified with Document::SetMaxSizeLoadEntry()
* @param entry Header Entry (Dicom Element) to be dealt with
+ * @param forceLoad whether you want to force loading of 'long' elements
*/
void Document::LoadDocEntry(DocEntry *entry, bool forceLoad)
{
return;
}
- if ( vr == "UI" )
- {
- // Because of correspondance with the VR dic
- valEntry->SetValue(newValue);
- }
- else
- {
- valEntry->SetValue(newValue);
- }
+// if ( vr == "UI" )
+// {
+// // Because of correspondance with the VR dic
+// valEntry->SetValue(newValue);
+// }
+// else
+// {
+// valEntry->SetValue(newValue);
+// }
+
+// Anybody remembers the genesis of strange previous (commented out) code?
+ valEntry->SetValue(newValue);
+
}
else
{
if ( Filetype == ExplicitVR && !entry->IsImplicitVR() )
{
if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT"
- /*|| vr == "UN"*/ )
+ || vr == "UN" )
{
// The following reserved two bytes (see PS 3.5-2003, section
// "7.1.2 Data element structure with explicit vr", p 27) must be
* and the taken VR. If they are different, the header entry is
* updated with the new VR.
* @param vr Dicom Value Representation
- * @return false if the VR is incorrect of if the VR isn't referenced
+ * @return false if the VR is incorrect or if the VR isn't referenced
* otherwise, it returns true
*/
bool Document::CheckDocEntryVR(VRKey vr)
Filetype = ACR;
return true;
default :
- gdcmWarningMacro( "ACR/NEMA unfound swap info (Really hopeless !)");
+ gdcmWarningMacro("ACR/NEMA unfound swap info (Really hopeless !)");
Filetype = Unknown;
return false;
}
}
/**
- * \brief during parsing, Header Elements too long are not loaded in memory
+ * \brief during parsing, Header Elements too long are not loaded in memory
* @param newSize new size
*/
void Document::SetMaxSizeLoadEntry(long newSize)
group = ReadInt16();
elem = ReadInt16();
}
- catch ( FormatError e )
+ catch ( FormatError )
{
// We reached the EOF (or an error occured) therefore
// header parsing has to be considered as finished.
if ( vr == GDCM_UNKNOWN )
{
if ( elem == 0x0000 ) // Group Length
+ {
realVR = "UL"; // must be UL
+ }
+ else if (group%2 == 1 && (elem >= 0x0010 && elem <=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";
+ }
else
{
DictEntry *dictEntry = GetDictEntry(group,elem);
if ( Global::GetVR()->IsVROfSequence(realVR) )
newEntry = NewSeqEntry(group, elem);
else if ( Global::GetVR()->IsVROfStringRepresentable(realVR) )
- newEntry = NewValEntry(group, elem,vr);
+ newEntry = NewValEntry(group, elem, realVR);
else
- newEntry = NewBinEntry(group, elem,vr);
+ newEntry = NewBinEntry(group, elem, realVR);
if ( vr == GDCM_UNKNOWN )
{
{
FindDocEntryLength(newEntry);
}
- catch ( FormatError e )
+ catch ( FormatError )
{
// Call it quits
delete newEntry;
reversedEndian--;
SwitchByteSwapCode();
}
+ else if (group == 0xfeff && elem == 0xdde0)
+ {
+ // reversed Sequence Terminator found
+ // probabely a bug in the header !
+ // Do what you want, it breaks !
+ //reversedEndian--;
+ //SwitchByteSwapCode();
+ gdcmWarningMacro( "Should never get here! reversed Sequence Terminator!" );
+ // fix the tag
+ group = 0xfffe;
+ elem = 0xe0dd;
+ }
+ else if (group == 0xfffe && elem == 0xe0dd)
+ {
+ gdcmWarningMacro( "Straight Sequence Terminator." );
+ }
}
/**
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff