Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 16:33:54 $
- Version: $Revision: 1.159 $
+ Date: $Date: 2005/01/06 17:16:15 $
+ Version: $Revision: 1.160 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Unknown
"Unknown Transfer Syntax"
};
-
+
//-----------------------------------------------------------------------------
// Refer to Document::CheckSwap()
//const unsigned int Document::HEADER_LENGTH_TO_READ = 256;
long l_max, bool delim_mode)
{
DocEntry *newDocEntry = 0;
+ ValEntry* newValEntry;
+ BinEntry* newBinEntry;
+ SeqEntry* newSeqEntry;
+ VRKey vr;
+ bool used=false;
+ long offsetEntry,readEntry;
while (true)
{
{
break;
}
+
+ used=true;
newDocEntry = ReadNextDocEntry( );
if ( !newDocEntry )
{
break;
}
- VRKey vr = newDocEntry->GetVR();
- if ( vr != "SQ" )
+ vr = newDocEntry->GetVR();
+ newValEntry = dynamic_cast<ValEntry*>(newDocEntry);
+ newBinEntry = dynamic_cast<BinEntry*>(newDocEntry);
+ newSeqEntry = dynamic_cast<SeqEntry*>(newDocEntry);
+
+ if ( newValEntry || newBinEntry )
{
+ offsetEntry=newDocEntry->GetOffset();
+ readEntry=newDocEntry->GetReadLength();
- if ( Global::GetVR()->IsVROfGdcmStringRepresentable(vr) )
+ if ( newBinEntry )
+ {
+ if ( ! Global::GetVR()->IsVROfBinaryRepresentable(vr) )
+ {
+ ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
+ dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
+ "nor BinEntry. Probably unknown VR.");
+ }
+
+ //////////////////// BinEntry or UNKOWN VR:
+ // When "this" is a Document the Key is simply of the
+ // form ( group, elem )...
+ if (Document* dummy = dynamic_cast< Document* > ( set ) )
+ {
+ (void)dummy;
+ newBinEntry->SetKey( newBinEntry->GetKey() );
+ }
+ // but when "this" is a SQItem, we are inserting this new
+ // valEntry in a sequence item, and the kay has the
+ // generalized form (refer to \ref BaseTagKey):
+ if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
+ {
+ newBinEntry->SetKey( parentSQItem->GetBaseTagKey()
+ + newBinEntry->GetKey() );
+ }
+
+ LoadDocEntry( newBinEntry );
+ if( !set->AddEntry( newBinEntry ) )
+ {
+ //Expect big troubles if here
+ //delete newBinEntry;
+ used=false;
+ }
+ }
+ else
{
/////////////////////// ValEntry
- ValEntry* newValEntry =
- new ValEntry( newDocEntry->GetDictEntry() ); //LEAK
- newValEntry->Copy( newDocEntry );
-
// When "set" is a Document, then we are at the top of the
// hierarchy and the Key is simply of the form ( group, elem )...
if (Document* dummy = dynamic_cast< Document* > ( set ) )
if( !set->AddEntry( newValEntry ) )
{
// If here expect big troubles
- delete newValEntry; //otherwise mem leak
+ //delete newValEntry; //otherwise mem leak
+ used=false;
}
if (delimitor)
{
- delete newDocEntry;
+ if(!used)
+ delete newDocEntry;
break;
}
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
- delete newDocEntry;
+ if(!used)
+ delete newDocEntry;
break;
}
}
- else
- {
- if ( ! Global::GetVR()->IsVROfGdcmBinaryRepresentable(vr) )
- {
- ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
- dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
- "nor BinEntry. Probably unknown VR.");
- }
-
- //////////////////// BinEntry or UNKOWN VR:
- BinEntry* newBinEntry = new BinEntry( newDocEntry ); //LEAK
-
- // When "this" is a Document the Key is simply of the
- // form ( group, elem )...
- if (Document* dummy = dynamic_cast< Document* > ( set ) )
- {
- (void)dummy;
- newBinEntry->SetKey( newBinEntry->GetKey() );
- }
- // but when "this" is a SQItem, we are inserting this new
- // valEntry in a sequence item, and the kay has the
- // generalized form (refer to \ref BaseTagKey):
- if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
- {
- newBinEntry->SetKey( parentSQItem->GetBaseTagKey()
- + newBinEntry->GetKey() );
- }
-
- LoadDocEntry( newBinEntry );
- if( !set->AddEntry( newBinEntry ) )
- {
- //Expect big troubles if here
- delete newBinEntry;
- }
- }
if ( ( newDocEntry->GetGroup() == 0x7fe0 )
&& ( newDocEntry->GetElement() == 0x0010 ) )
TransferSyntaxType ts = GetTransferSyntax();
if ( ts == RLELossless )
{
- long PositionOnEntry = Fp->tellg();
+ long positionOnEntry = Fp->tellg();
Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
ComputeRLEInfo();
- Fp->seekg( PositionOnEntry, std::ios::beg );
+ Fp->seekg( positionOnEntry, std::ios::beg );
}
else if ( IsJPEG() )
{
- long PositionOnEntry = Fp->tellg();
+ long positionOnEntry = Fp->tellg();
Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
ComputeJPEGFragmentInfo();
- Fp->seekg( PositionOnEntry, std::ios::beg );
+ Fp->seekg( positionOnEntry, std::ios::beg );
}
}
// Just to make sure we are at the beginning of next entry.
- SkipToNextDocEntry(newDocEntry);
- //delete newDocEntry;
+ SkipToNextDocEntry(offsetEntry,readEntry);
}
else
{
}
}
// no other way to create it ...
- SeqEntry* newSeqEntry =
- new SeqEntry( newDocEntry->GetDictEntry() );
- newSeqEntry->Copy( newDocEntry );
newSeqEntry->SetDelimitorMode( delim_mode );
// At the top of the hierarchy, stands a Document. When "set"
set->AddEntry( newSeqEntry );
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
- delete newDocEntry;
break;
}
}
- delete newDocEntry;
+
+ if(!used)
+ delete newDocEntry;
}
}
* \warning NOT end user intended method !
* @param entry entry to skip
*/
-void Document::SkipToNextDocEntry(DocEntry *entry)
+void Document::SkipToNextDocEntry(long offset,long readLgth)
{
- Fp->seekg((long)(entry->GetOffset()), std::ios::beg);
- Fp->seekg( (long)(entry->GetReadLength()), std::ios::cur);
+ Fp->seekg((long)(offset), std::ios::beg);
+ Fp->seekg( (long)(readLgth), std::ios::cur);
}
/**
}
HandleBrokenEndian(group, elem);
- std::string vr=FindDocEntryVR();
+ std::string vr = FindDocEntryVR();
+ std::string realVR = vr;
+
+ if( vr == GDCM_UNKNOWN)
+ {
+ DictEntry *dictEntry = GetDictEntryByNumber(group,elem);
+ if( dictEntry )
+ realVR = dictEntry->GetVR();
+ }
+
+ DocEntry *newEntry;
+ if( Global::GetVR()->IsVROfSequence(realVR) )
+ newEntry = NewSeqEntryByNumber(group, elem);
+ else if( Global::GetVR()->IsVROfStringRepresentable(realVR) )
+ newEntry = NewValEntryByNumber(group, elem,vr);
+ else
+ newEntry = NewBinEntryByNumber(group, elem,vr);
- DocEntry *newEntry = NewDocEntryByNumber(group, elem, vr);
if( vr == GDCM_UNKNOWN )
{
if( Filetype == ExplicitVR )
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 13:35:38 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2005/01/06 17:16:16 $
+ Version: $Revision: 1.26 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \ref VR::IsVROfGdcmStringRepresentable .
* @param tested value representation to check for.
*/
-bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested)
+bool VR::IsVROfBinaryRepresentable(VRKey const & tested)
{
//std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
// << tested << std::endl;
if ( tested == GDCM_UNKNOWN)
return true;
- if ( ! IsValidVR(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+ if ( IsVROfStringRepresentable(tested) )
return false;
- }
- if ( IsVROfGdcmStringRepresentable(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
+ if ( IsVROfSequence(tested) )
return false;
- }
return true;
}
-//-----------------------------------------------------------------------------
/**
* \brief Simple predicate that checks wether the given argument
* corresponds to the Value Representation of a \ref ValEntry
* but NOT a \ref BinEntry.
* @param tested value representation to check for.
*/
-bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
+bool VR::IsVROfStringRepresentable(VRKey const & tested)
{
+ return tested == "AE" ||
+ tested == "AS" ||
+ tested == "CS" ||
+ tested == "DA" ||
+ tested == "DS" ||
+ tested == "IS" ||
+ tested == "LO" ||
+ tested == "LT" ||
+ tested == "PN" ||
+ tested == "SH" ||
+ tested == "SL" ||
+ tested == "SS" ||
+ tested == "ST" ||
+ tested == "TM" ||
+ tested == "UI" ||
+ tested == "UL" ||
+ tested == "UN" ||
+ tested == "US";
+}
- if ( ! IsValidVR(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
- return false;
- }
-
- if ( tested == "AE" ||
- tested == "AS" ||
- tested == "CS" ||
- tested == "DA" ||
- tested == "DS" ||
- tested == "IS" ||
- tested == "LO" ||
- tested == "LT" ||
- tested == "PN" ||
- tested == "SH" ||
- tested == "SL" ||
- tested == "SS" ||
- tested == "ST" ||
- tested == "TM" ||
- tested == "UI" ||
- tested == "UL" ||
- tested == "UN" ||
- tested == "US" )
- {
- return true;
- }
- return false;
+/**
+ * \brief Simple predicate that checks wether the given argument
+ * corresponds to the Value Representation of a \ref SeqEntry
+ * @param tested value representation to check for.
+ */
+bool VR::IsVROfSequence(VRKey const & tested)
+{
+ return tested == "SQ";
}
bool VR::IsValidVR(VRKey const & key)
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff