Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/07/02 16:51:16 $
- Version: $Revision: 1.253 $
+ Date: $Date: 2005/07/05 18:44:21 $
+ Version: $Revision: 1.255 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
SwapCode = 1234;
Filetype = ExplicitVR;
Group0002Parsed = false;
- LoadMode = 0x00000000; // Load everything
+ LoadMode = 0x00000000; // Load everything, later
// Load will set it to true if sucessfull
IsDocumentAlreadyLoaded = false;
lgt -= beg; // remaining length to parse
- ParseDES( this, beg, lgt, false); // Loading is done during parsing
+ // Recursive call.
+ // Loading is done during parsing
+ ParseDES( this, beg, lgt, false); // delim_mode is first defaulted to false
if ( IsEmpty() )
{
/// altered on PURPOSE but now contains a WRONG value.
/// In order to fix things and restore the dictionary to its
/// correct value, one needs to decided of the semantics by deciding
- /// whether the following tags are either:
+ /// whether the following tags are either :
/// - multivaluated US, and hence loaded as ValEntry, but afterwards
/// also used as BinEntry, which requires the proper conversion,
/// - OW, and hence loaded as BinEntry, but afterwards also used
// ----------------------------
// Specific code to allow gdcm to read ACR-LibIDO formated images
// Note: ACR-LibIDO is an extension of the ACR standard that was
- // used at CREATIS. For the time being (say a couple years)
+ // used at CREATIS. For the time being (say a couple of years)
// we keep this kludge to allow CREATIS users
// reading their old images.
//
/**
* \brief Parses a DocEntrySet (Zero-level DocEntries or SQ Item DocEntries)
- * @param set DocEntrySet we are going to parse ('zero level' or a SQItem)
+ * @param set DocEntrySet we are going to parse ('zero level' or a SQItem)
* @param offset start of parsing
* @param l_max length to parse
* @param delim_mode : whether we are in 'delimitor mode' (l=0xffffff) or not
SeqEntry *newSeqEntry;
VRKey vr;
bool used;
+ bool delim_mode_intern;
while (true)
{
{
//Expect big troubles if here
//delete newBinEntry;
+ gdcmWarningMacro("in ParseDES : shouldn't get here !");
used=false;
}
}
/////////////////////// SeqEntry : VR = "SQ"
unsigned long l = newDocEntry->GetReadLength();
- if ( l != 0 ) // don't mess the delim_mode for zero-length sequence
+ if ( l != 0 ) // don't mess the delim_mode for 'zero-length sequence'
{
if ( l == 0xffffffff )
{
- delim_mode = true;
+ delim_mode_intern = true;
}
else
{
- delim_mode = false;
+ delim_mode_intern = false;
}
}
-
- if ( (LoadMode & NO_SHADOWSEQ) && ! delim_mode )
- {
- // User asked to skip SQ only if they belong to Shadow group
- if ( newDocEntry->GetGroup()%2 != 0 )
- {
- Fp->seekg( l, std::ios::cur);
- used = false;
- continue;
- }
- }
-
- if ( (LoadMode & NO_SEQ) && ! delim_mode )
+
+ if ( (LoadMode & NO_SHADOWSEQ) && ! delim_mode_intern )
+ {
+ // User asked to skip SeQuences *only* if they belong to Shadow Group
+ if ( newDocEntry->GetGroup()%2 != 0 )
+ {
+ Fp->seekg( l, std::ios::cur);
+ used = false;
+ continue;
+ }
+ }
+ if ( (LoadMode & NO_SEQ) && ! delim_mode_intern )
{
// User asked to skip *any* SeQuence
Fp->seekg( l, std::ios::cur);
used = false;
continue;
- }
+ }
// no other way to create it ...
- newSeqEntry->SetDelimitorMode( delim_mode );
+ newSeqEntry->SetDelimitorMode( delim_mode_intern );
// At the top of the hierarchy, stands a Document. When "set"
// is a Document, then we are building the first depth level.
{ // Don't try to parse zero-length sequences
ParseSQ( newSeqEntry,
newDocEntry->GetOffset(),
- l, delim_mode);
+ l, delim_mode_intern);
}
if ( !set->AddEntry( newSeqEntry ) )
{
used = false;
}
-
+
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
if ( !used )
if ( !newDocEntry )
{
// FIXME Should warn user
+ gdcmWarningMacro("in ParseSQ : should never get here!");
break;
}
if ( delim_mode )
delete newDocEntry;
Fp->seekg(offsetStartCurrentSQItem, std::ios::beg);
// fill up the current SQItem, starting at the beginning of fff0,e000
+
ParseDES(itemSQ, offsetStartCurrentSQItem, l+8, dlm_mod);
+
offsetStartCurrentSQItem = Fp->tellg();
// end try -----------------
}
// The elements whose length is bigger than the specified upper bound
- // are not loaded. Instead we leave a short notice of the offset of
+ // are not loaded. Instead we leave a short notice on the offset of
// the element content and it's length.
std::ostringstream s;
}
/**
- * \brief Read the next tag but WITHOUT loading it's value
+ * \brief Read the next tag WITHOUT loading it's value
* (read the 'Group Number', the 'Element Number',
* gets the Dict Entry
* gets the VR, gets the length, gets the offset value)
- * @return On succes the newly created DocEntry, NULL on failure.
+ * @return On succes : the newly created DocEntry, NULL on failure.
*/
DocEntry *Document::ReadNextDocEntry()
{
{
std::string msg;
int offset = Fp->tellg();
- msg = Util::Format("Entry (%04x,%04x) at %x should be Explicit VR\n",
+ msg = Util::Format("Entry (%04x,%04x) at 0x(%x) should be Explicit VR\n",
newEntry->GetGroup(), newEntry->GetElement(), offset );
gdcmWarningMacro( msg.c_str() );
}
/**
* \brief Handle broken private tag from Philips NTSCAN
- * where the endianess is being switched to BigEndian for no
- * apparent reason
+ * where the endianess is being switched to BigEndian
+ * for no apparent reason
* @return no return
*/
void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem)
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff