Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2006/02/09 10:48:04 $
- Version: $Revision: 1.341 $
+ Date: $Date: 2006/02/16 20:06:14 $
+ Version: $Revision: 1.342 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return DoTheLoadingDocumentJob( );
}
+#ifndef GDCM_LEGACY_REMOVE
+/**
+ * \brief Loader. (DEPRECATED : not to break the API)
+ * @param fileName 'Document' (File or DicomDir) to be open for parsing
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ */
+bool Document::Load( std::string const &fileName )
+{
+ Filename = fileName;
+ return DoTheLoadingDocumentJob( );
+}
+#endif
+
/**
* \brief Performs the Loading Job (internal use only)
* @return false if file cannot be open or no swap info was found,
Group0002Parsed = false;
gdcmDebugMacro( "Starting parsing of file: " << Filename.c_str());
-
+
// Computes the total length of the file
Fp->seekg(0, std::ios::end); // Once per Document !
long lgt = Fp->tellg(); // Once per Document !
// -- Neither ACR/No Preamble Dicom nor DICOMV3 file
CloseFile();
- // Don't user Warning nor Error, not to polute the output
+ // Don't user Warning nor Error, not to pollute the output
// while directory recursive parsing ...
gdcmDebugMacro( "Neither ACR/No Preamble Dicom nor DICOMV3 file: "
<< Filename.c_str());
// explicit VR AND (OB, OW, SQ, UT) : 4 more bytes
groupLength += 4;
}
-
groupLength += 2 + 2 + 4 + entry->GetLength();
}
}
// Private
/**
* \brief Loads all the needed Dictionaries
+ * \warning NOT end user intended method !
*/
void Document::Initialize()
{
// but we didn't get it (private Sequence + Implicit VR)
// we have to backtrack.
if ( !first && newDocEntry->IsItemStarter() )
- {
- // Debug message within the method !
- newDocEntry = Backtrack(newDocEntry);
+ {
+ // Debug message within the method !
+ newDocEntry = Backtrack(newDocEntry);
}
else
{
newEntry->SetOffset(offset);
// Move back to the beginning of the Sequence
- // Fp->seekg( 0, std::ios::beg); // JPRx
- // Fp->seekg(offset, std::ios::cur); // JPRx
+
Fp->seekg(offset, std::ios::beg); // Only for Shadow Implicit VR SQ
return newEntry;
}
// (fffe e000) tells us an Element is beginning
// (fffe e00d) tells us an Element just ended
// (fffe e0dd) tells us the current SeQuence just ended
- //
// (fffe 0000) is an 'impossible' tag value,
// found in MR-PHILIPS-16-Multi-Seq.dcm
// The following reserved two bytes (see PS 3.5-2003, section
// "7.1.2 Data element structure with explicit vr", p 27) must be
// skipped before proceeding on reading the length on 4 bytes.
-
+
Fp->seekg( 2L, std::ios::cur); // Once per OW,OB,SQ DocEntry
uint32_t length32 = ReadInt32();
// Well ... group 0002 is always coded in 'Explicit VR Litle Endian'
// even if Transfer Syntax is 'Implicit VR ...'
// --> Except for 'Implicit VR Big Endian Transfer Syntax GE Private'
-
+
FixDocEntryFoundLength( entry, ReadInt32() );
return;
}
/**
* \brief Find the Length till the next sequence delimiter
+ * \warning NOT end user intended method !
* @return
*/
uint32_t Document::FindDocEntryLengthOBOrOW()
{
// See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data.
long positionOnEntry = Fp->tellg(); // Only for OB,OW DataElements
-
+
bool foundSequenceDelimiter = false;
uint32_t totalLength = 0;
totalLength += 4;
if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) )
{
- // long filePosition = Fp->tellg(); JPRx
gdcmWarningMacro(
"Neither an Item tag nor a Sequence delimiter tag on :"
<< std::hex << group << " , " << elem
- //<< ") -before- position x(" << filePosition // JPRx
<< ")" );
Fp->seekg(positionOnEntry, std::ios::beg); // Once per fragment (if any) of OB,OW DataElements
// Position the file position indicator at first tag
// (i.e. after the file preamble and the "DICM" string).
- //Fp->seekg(0, std::ios::beg); // JPRx
-
Fp->seekg ( 132L, std::ios::beg); // Once per Document
return true;
} // ------------------------------- End of DicomV3 ----------------
}
// In 'true DICOM' files Group 0002 is always little endian
- if ( HasDCMPreamble )
+ if ( HasDCMPreamble )
{
if ( !Group0002Parsed && CurrentGroup != 0x0002) // avoid calling a function when useless
HandleOutOfGroup0002(CurrentGroup, CurrentElem);
}
}
}
-
+
DocEntry *newEntry;
//if ( Global::GetVR()->IsVROfSequence(realVR) )
if (realVR == "SQ")
group = SwapShort(group);
elem = SwapShort(elem);
}
-
+
/// \todo find a trick to warn user and stop processing
if ( s == TS::DeflatedExplicitVRLittleEndian)
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff