Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/01/28 10:34:28 $
- Version: $Revision: 1.216 $
+ Date: $Date: 2005/01/31 12:19:34 $
+ Version: $Revision: 1.217 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
CloseFile();
- // --------------------------------------------------------------
+ // ----------------------------
// 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)
SetValEntry(columns, 0x0028, 0x0010);
SetValEntry(rows , 0x0028, 0x0011);
}
- // ----------------- End of ACR-LibIDO kludge ------------------
+ // --- End of ACR-LibIDO kludge ---
}
/**
return true;
}
+/**
+ * \brief Predicate for dicom version 3 file.
+ * @return True when the file is a dicom version 3.
+ */
+bool Document::IsDicomV3()
+{
+ // Checking if Transfer Syntax exists is enough
+ // Anyway, it's to late check if the 'Preamble' was found ...
+ // And ... would it be a rich idea to check ?
+ // (some 'no Preamble' DICOM images exist !)
+ return GetDocEntry(0x0002, 0x0010) != NULL;
+}
+
+/**
+ * \brief Predicate for Papyrus file
+ * Dedicated to whomsoever it may concern
+ * @return True when the file is a Papyrus file.
+ */
+bool Document::IsPapyrus()
+{
+ // check for Papyrus private Sequence
+ DocEntry *e = GetDocEntry(0x0041, 0x1050);
+ if ( !e )
+ return false;
+ // check if it's actually a Sequence
+ if ( !dynamic_cast<SeqEntry*>(e) )
+ return false;
+ return true;
+}
+
+/**
+ * \brief returns the File Type
+ * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown)
+ * @return the FileType code
+ */
+FileType Document::GetFileType()
+{
+ return Filetype;
+}
+
/**
* \brief Accessor to the Transfer Syntax (when present) of the
* current document (it internally handles reading the
}
/**
- * \brief Predicate for dicom version 3 file.
- * @return True when the file is a dicom version 3.
+ * \brief Accesses the info from 0002,0010 : Transfer Syntax and TS
+ * @return The full Transfer Syntax Name (as opposed to Transfer Syntax UID)
*/
-bool Document::IsDicomV3()
+std::string Document::GetTransferSyntaxName()
{
- // Checking if Transfer Syntax exists is enough
- // Anyway, it's to late check if the 'Preamble' was found ...
- // And ... would it be a rich idea to check ?
- // (some 'no Preamble' DICOM images exist !)
- return GetDocEntry(0x0002, 0x0010) != NULL;
-}
+ // use the TS (TS : Transfer Syntax)
+ std::string transferSyntax = GetEntryValue(0x0002,0x0010);
+
+ if ( (transferSyntax.find(GDCM_NOTLOADED) < transferSyntax.length()) )
+ {
+ gdcmErrorMacro( "Transfer Syntax not loaded. " << std::endl
+ << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" );
+ return "Uncompressed ACR-NEMA";
+ }
+ if ( transferSyntax == GDCM_UNFOUND )
+ {
+ gdcmVerboseMacro( "Unfound Transfer Syntax (0002,0010)");
+ return "Uncompressed ACR-NEMA";
+ }
+
+ // we do it only when we need it
+ const TSKey &tsName = Global::GetTS()->GetValue( transferSyntax );
+ // Global::GetTS() is a global static you shall never try to delete it!
+ return tsName;
+}
+//
+// --------------- Swap Code ------------------
/**
- * \brief Predicate for Papyrus file
- * Dedicated to whomsoever it may concern
- * @return True when the file is a Papyrus file.
+ * \brief Swaps the bytes so they agree with the processor order
+ * @return The properly swaped 16 bits integer.
*/
-bool Document::IsPapyrus()
+uint16_t Document::SwapShort(uint16_t a)
{
- // check for Papyrus private Sequence
- DocEntry *e = GetDocEntry(0x0041, 0x1050);
- if ( !e )
- return false;
- // check if it's actually a Sequence
- if ( !dynamic_cast<SeqEntry*>(e) )
- return false;
- return true;
+ if ( SwapCode == 4321 || SwapCode == 2143 )
+ {
+ a = ((( a << 8 ) & 0x0ff00 ) | (( a >> 8 ) & 0x00ff ) );
+ }
+ return a;
}
/**
- * \brief returns the File Type
- * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown)
- * @return the FileType code
+ * \brief Swaps back the bytes of 4-byte long integer accordingly to
+ * processor order.
+ * @return The properly swaped 32 bits integer.
*/
-FileType Document::GetFileType()
+uint32_t Document::SwapLong(uint32_t a)
{
- return Filetype;
-}
+ switch (SwapCode)
+ {
+ case 1234 :
+ break;
+ case 4321 :
+ a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) |
+ ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) );
+ break;
+ case 3412 :
+ a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) );
+ break;
+ case 2143 :
+ a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) );
+ break;
+ default :
+ gdcmErrorMacro( "Unset swap code:" << SwapCode );
+ a = 0;
+ }
+ return a;
+}
+//
+// -----------------File I/O ---------------
/**
* \brief Tries to open the file \ref Document::Filename and
* checks the preamble when existing.
ElementSet::WriteContent(fp, filetype); // This one is recursive
}
-//-----------------------------------------------------------------------------
-// Protected
+// -----------------------------------------
+// Content entries
+
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
CloseFile();
}
-/**
- * \brief Sets a 'non string' value to a given Dicom Element
- * @param area area containing the 'non string' value
- * @param group Group number of the searched Dicom Element
- * @param elem Element number of the searched Dicom Element
- * @return
- */
-/*bool Document::SetEntryBinArea(uint8_t *area,
- uint16_t group, uint16_t elem)
-{
- DocEntry *currentEntry = GetDocEntry(group, elem);
- if ( !currentEntry )
- {
- return false;
- }
-
- if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(currentEntry) )
- {
- binEntry->SetBinArea( area );
- return true;
- }
-
- return false;
-}*/
-
-
/**
* \brief Loads the element while preserving the current
* underlying file position indicator as opposed to
}
}
+//-----------------------------------------------------------------------------
+// Protected
+
+// Constructors and destructors are protected to avoid user to invoke directly
+
/**
- * \brief Swaps back the bytes of 4-byte long integer accordingly to
- * processor order.
- * @return The properly swaped 32 bits integer.
+ * \brief Reads a supposed to be 16 Bits integer
+ * (swaps it depending on processor endianity)
+ * @return read value
*/
-uint32_t Document::SwapLong(uint32_t a)
+uint16_t Document::ReadInt16()
+ throw( FormatError )
{
- switch (SwapCode)
+ uint16_t g;
+ Fp->read ((char*)&g, (size_t)2);
+ if ( Fp->fail() )
{
- case 1234 :
- break;
- case 4321 :
- a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) |
- ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) );
- break;
- case 3412 :
- a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) );
- break;
- case 2143 :
- a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) );
- break;
- default :
- gdcmErrorMacro( "Unset swap code:" << SwapCode );
- a = 0;
+ throw FormatError( "Document::ReadInt16()", " file error." );
}
- return a;
-}
+ if( Fp->eof() )
+ {
+ throw FormatError( "Document::ReadInt16()", "EOF." );
+ }
+ g = SwapShort(g);
+ return g;
+}
/**
- * \brief Unswaps back the bytes of 4-byte long integer accordingly to
- * processor order.
- * @return The properly unswaped 32 bits integer.
+ * \brief Reads a supposed to be 32 Bits integer
+ * (swaps it depending on processor endianity)
+ * @return read value
*/
-uint32_t Document::UnswapLong(uint32_t a)
+uint32_t Document::ReadInt32()
+ throw( FormatError )
{
- return SwapLong(a);
+ uint32_t g;
+ Fp->read ((char*)&g, (size_t)4);
+ if ( Fp->fail() )
+ {
+ throw FormatError( "Document::ReadInt32()", " file error." );
+ }
+ if( Fp->eof() )
+ {
+ throw FormatError( "Document::ReadInt32()", "EOF." );
+ }
+ g = SwapLong(g);
+ return g;
}
/**
- * \brief Swaps the bytes so they agree with the processor order
- * @return The properly swaped 16 bits integer.
+ * \brief skips bytes inside the source file
+ * \warning NOT end user intended method !
+ * @return
*/
-uint16_t Document::SwapShort(uint16_t a)
+void Document::SkipBytes(uint32_t nBytes)
{
- if ( SwapCode == 4321 || SwapCode == 2143 )
- {
- a = ((( a << 8 ) & 0x0ff00 ) | (( a >> 8 ) & 0x00ff ) );
- }
- return a;
+ //FIXME don't dump the returned value
+ Fp->seekg((long)nBytes, std::ios::cur);
}
/**
- * \brief Unswaps the bytes so they agree with the processor order
- * @return The properly unswaped 16 bits integer.
+ * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
+ * @param filetype Type of the File to be written
*/
-uint16_t Document::UnswapShort(uint16_t a)
+int Document::ComputeGroup0002Length( FileType filetype )
{
- return SwapShort(a);
+ uint16_t gr;
+ std::string vr;
+
+ int groupLength = 0;
+ bool found0002 = false;
+
+ // for each zero-level Tag in the DCM Header
+ DocEntry *entry = GetFirstEntry();
+ while( entry )
+ {
+ gr = entry->GetGroup();
+
+ if( gr == 0x0002 )
+ {
+ found0002 = true;
+
+ if( entry->GetElement() != 0x0000 )
+ {
+ vr = entry->GetVR();
+
+ if( filetype == ExplicitVR )
+ {
+ if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") )
+ {
+ // explicit VR AND OB, OW, SQ : 4 more bytes
+ groupLength += 4;
+ }
+ }
+ groupLength += 2 + 2 + 4 + entry->GetLength();
+ }
+ }
+ else if (found0002 )
+ break;
+
+ entry = GetNextEntry();
+ }
+ return groupLength;
}
//-----------------------------------------------------------------------------
}
/**
- * \brief Loads the element content if its length doesn't exceed
- * the value specified with Document::SetMaxSizeLoadEntry()
- * @param entry Header Entry (Dicom Element) to be dealt with
+ * \brief Loads the element content if its length doesn't exceed
+ * the value specified with Document::SetMaxSizeLoadEntry()
+ * @param entry Header Entry (Dicom Element) to be dealt with
*/
void Document::LoadDocEntry(DocEntry *entry)
{
}
}
-
/**
* \brief Find the value Length of the passed Header Entry
* @param entry Header Entry whose length of the value shall be loaded.
}
}
+/**
+ * \brief Find the Length till the next sequence delimiter
+ * \warning NOT end user intended method !
+ * @return
+ */
+uint32_t Document::FindDocEntryLengthOBOrOW()
+ throw( FormatUnexpected )
+{
+ // See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data.
+ long positionOnEntry = Fp->tellg();
+ bool foundSequenceDelimiter = false;
+ uint32_t totalLength = 0;
+
+ while ( !foundSequenceDelimiter )
+ {
+ uint16_t group;
+ uint16_t elem;
+ try
+ {
+ group = ReadInt16();
+ elem = ReadInt16();
+ }
+ catch ( FormatError )
+ {
+ throw FormatError("Unexpected end of file encountered during ",
+ "Document::FindDocEntryLengthOBOrOW()");
+ }
+ // We have to decount the group and element we just read
+ totalLength += 4;
+ if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) )
+ {
+ long filePosition = Fp->tellg();
+ gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag on :"
+ << std::hex << group << " , " << elem
+ << ") -before- position x(" << filePosition << ")" );
+
+ Fp->seekg(positionOnEntry, std::ios::beg);
+ throw FormatUnexpected( "Neither an Item tag nor a Sequence delimiter tag.");
+ }
+ if ( elem == 0xe0dd )
+ {
+ foundSequenceDelimiter = true;
+ }
+ uint32_t itemLength = ReadInt32();
+ // We add 4 bytes since we just read the ItemLength with ReadInt32
+ totalLength += itemLength + 4;
+ SkipBytes(itemLength);
+
+ if ( foundSequenceDelimiter )
+ {
+ break;
+ }
+ }
+ Fp->seekg( positionOnEntry, std::ios::beg);
+ return totalLength;
+}
+
/**
* \brief Find the Value Representation of the current Dicom Element.
* @return Value Representation of the current Entry
#endif //GDCM_NO_ANSI_STRING_STREAM
return s.str();
}
-
return ((ValEntry *)entry)->GetValue();
}
}
/**
- * \brief Skips to the begining of the next Header Entry
+ * \brief Skips to the beginning of the next Header Entry
* \warning NOT end user intended method !
* @param currentDocEntry entry to skip
*/
{
foundLength = 0;
}
- }
-
+ }
entry->SetLength(foundLength);
}
// gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm].
// Since for dicom compliant and well behaved headers, the present
// test is useless (and might even look a bit paranoid), when we
- // encounter such an ill-formed image, we simply display a warning
- // message and proceed on parsing (while crossing fingers).
- long filePosition = Fp->tellg();
- gdcmVerboseMacro( "Erroneous Group Length element length on : ("
- << std::hex << group << " , " << elem
- << ") -before- position x(" << filePosition << ")"
- << "lgt : " << length );
- }
- }
-
- if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" )
- {
- return true;
- }
- return false;
-}
-
-/**
- * \brief Find the Length till the next sequence delimiter
- * \warning NOT end user intended method !
- * @return
- */
-
-uint32_t Document::FindDocEntryLengthOBOrOW()
- throw( FormatUnexpected )
-{
- // See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data.
- long positionOnEntry = Fp->tellg();
- bool foundSequenceDelimiter = false;
- uint32_t totalLength = 0;
-
- while ( !foundSequenceDelimiter )
- {
- uint16_t group;
- uint16_t elem;
- try
- {
- group = ReadInt16();
- elem = ReadInt16();
- }
- catch ( FormatError )
- {
- throw FormatError("Unexpected end of file encountered during ",
- "Document::FindDocEntryLengthOBOrOW()");
- }
-
- // We have to decount the group and element we just read
- totalLength += 4;
-
- if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) )
- {
- long filePosition = Fp->tellg();
- gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag on :"
- << std::hex << group << " , " << elem
- << ") -before- position x(" << filePosition << ")" );
-
- Fp->seekg(positionOnEntry, std::ios::beg);
- throw FormatUnexpected( "Neither an Item tag nor a Sequence delimiter tag.");
- }
-
- if ( elem == 0xe0dd )
- {
- foundSequenceDelimiter = true;
- }
-
- uint32_t itemLength = ReadInt32();
- // We add 4 bytes since we just read the ItemLength with ReadInt32
- totalLength += itemLength + 4;
- SkipBytes(itemLength);
-
- if ( foundSequenceDelimiter )
- {
- break;
- }
- }
- Fp->seekg( positionOnEntry, std::ios::beg);
- return totalLength;
-}
-
-/**
- * \brief Reads a supposed to be 16 Bits integer
- * (swaps it depending on processor endianity)
- * @return read value
- */
-uint16_t Document::ReadInt16()
- throw( FormatError )
-{
- uint16_t g;
- Fp->read ((char*)&g, (size_t)2);
- if ( Fp->fail() )
- {
- throw FormatError( "Document::ReadInt16()", " file error." );
- }
- if( Fp->eof() )
- {
- throw FormatError( "Document::ReadInt16()", "EOF." );
+ // encounter such an ill-formed image, we simply display a warning
+ // message and proceed on parsing (while crossing fingers).
+ long filePosition = Fp->tellg();
+ gdcmVerboseMacro( "Erroneous Group Length element length on : ("
+ << std::hex << group << " , " << elem
+ << ") -before- position x(" << filePosition << ")"
+ << "lgt : " << length );
+ }
}
- g = SwapShort(g);
- return g;
-}
-/**
- * \brief Reads a supposed to be 32 Bits integer
- * (swaps it depending on processor endianity)
- * @return read value
- */
-uint32_t Document::ReadInt32()
- throw( FormatError )
-{
- uint32_t g;
- Fp->read ((char*)&g, (size_t)4);
- if ( Fp->fail() )
- {
- throw FormatError( "Document::ReadInt32()", " file error." );
- }
- if( Fp->eof() )
+ if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" )
{
- throw FormatError( "Document::ReadInt32()", "EOF." );
- }
- g = SwapLong(g);
- return g;
-}
-
-/**
- * \brief skips bytes inside the source file
- * \warning NOT end user intended method !
- * @return
- */
-void Document::SkipBytes(uint32_t nBytes)
-{
- //FIXME don't dump the returned value
- Fp->seekg((long)nBytes, std::ios::cur);
+ return true;
+ }
+ return false;
}
/**
MaxSizeLoadEntry = newSize;
}
-
/**
* \brief Header Elements too long will not be printed
* \todo See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE
}
-
-/**
- * \brief Handle broken private tag from Philips NTSCAN
- * where the endianess is being switch to BigEndian for no
- * apparent reason
- * @return no return
- */
-void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem)
-{
- // Endian reversion. Some files contain groups of tags with reversed endianess.
- static int reversedEndian = 0;
- // try to fix endian switching in the middle of headers
- if ((group == 0xfeff) && (elem == 0x00e0))
- {
- // start endian swap mark for group found
- reversedEndian++;
- SwitchByteSwapCode();
- // fix the tag
- group = 0xfffe;
- elem = 0xe000;
- }
- else if (group == 0xfffe && elem == 0xe00d && reversedEndian)
- {
- // end of reversed endian group
- reversedEndian--;
- SwitchByteSwapCode();
- }
-}
-
-/**
- * \brief Accesses the info from 0002,0010 : Transfer Syntax and TS
- * @return The full Transfer Syntax Name (as opposed to Transfer Syntax UID)
- */
-std::string Document::GetTransferSyntaxName()
-{
- // use the TS (TS : Transfer Syntax)
- std::string transferSyntax = GetEntryValue(0x0002,0x0010);
-
- if ( (transferSyntax.find(GDCM_NOTLOADED) < transferSyntax.length()) )
- {
- gdcmErrorMacro( "Transfer Syntax not loaded. " << std::endl
- << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" );
- return "Uncompressed ACR-NEMA";
- }
- if ( transferSyntax == GDCM_UNFOUND )
- {
- gdcmVerboseMacro( "Unfound Transfer Syntax (0002,0010)");
- return "Uncompressed ACR-NEMA";
- }
-
- // we do it only when we need it
- const TSKey &tsName = Global::GetTS()->GetValue( transferSyntax );
-
- // Global::GetTS() is a global static you shall never try to delete it!
- return tsName;
-}
-
-/**
- * \brief Group 0002 is always coded Little Endian
- * whatever Transfer Syntax is
- * @return no return
- */
-void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem)
-{
- // Endian reversion. Some files contain groups of tags with reversed endianess.
- if ( !Group0002Parsed && group != 0x0002)
- {
- Group0002Parsed = true;
- // we just came out of group 0002
- // if Transfer syntax is Big Endian we have to change CheckSwap
-
- std::string ts = GetTransferSyntax();
- if ( !Global::GetTS()->IsTransferSyntax(ts) )
- {
- gdcmVerboseMacro("True DICOM File, with NO Tansfer Syntax: " << ts );
- return;
- }
-
- // Group 0002 is always 'Explicit ...' enven when Transfer Syntax says 'Implicit ..."
-
- if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian )
- {
- Filetype = ImplicitVR;
- }
-
- // FIXME Strangely, this works with
- //'Implicit VR Transfer Syntax (GE Private)
- if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian )
- {
- gdcmVerboseMacro("Transfer Syntax Name = ["
- << GetTransferSyntaxName() << "]" );
- SwitchByteSwapCode();
- group = SwapShort(group);
- elem = SwapShort(elem);
- }
- }
-}
-
/**
* \brief Read the next tag but WITHOUT loading it's value
* (read the 'Group Number', the 'Element Number',
// Sometimes file contains groups of tags with reversed endianess.
HandleBrokenEndian(group, elem);
-// In 'true DICOM' files Group 0002 is always little endian
+ // In 'true DICOM' files Group 0002 is always little endian
if ( HasDCMPreamble )
HandleOutOfGroup0002(group, elem);
return newEntry;
}
-//GenerateFreeTagKeyInGroup? What was it designed for ?!?
+/**
+ * \brief Handle broken private tag from Philips NTSCAN
+ * where the endianess is being switch to BigEndian for no
+ * apparent reason
+ * @return no return
+ */
+void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem)
+{
+ // Endian reversion. Some files contain groups of tags with reversed endianess.
+ static int reversedEndian = 0;
+ // try to fix endian switching in the middle of headers
+ if ((group == 0xfeff) && (elem == 0x00e0))
+ {
+ // start endian swap mark for group found
+ reversedEndian++;
+ SwitchByteSwapCode();
+ // fix the tag
+ group = 0xfffe;
+ elem = 0xe000;
+ }
+ else if (group == 0xfffe && elem == 0xe00d && reversedEndian)
+ {
+ // end of reversed endian group
+ reversedEndian--;
+ SwitchByteSwapCode();
+ }
+}
+
+/**
+ * \brief Group 0002 is always coded Little Endian
+ * whatever Transfer Syntax is
+ * @return no return
+ */
+void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem)
+{
+ // Endian reversion. Some files contain groups of tags with reversed endianess.
+ if ( !Group0002Parsed && group != 0x0002)
+ {
+ Group0002Parsed = true;
+ // we just came out of group 0002
+ // if Transfer syntax is Big Endian we have to change CheckSwap
+
+ std::string ts = GetTransferSyntax();
+ if ( !Global::GetTS()->IsTransferSyntax(ts) )
+ {
+ gdcmVerboseMacro("True DICOM File, with NO Tansfer Syntax: " << ts );
+ return;
+ }
+
+ // Group 0002 is always 'Explicit ...' enven when Transfer Syntax says 'Implicit ..."
+
+ if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian )
+ {
+ Filetype = ImplicitVR;
+ }
+
+ // FIXME Strangely, this works with
+ //'Implicit VR Transfer Syntax (GE Private)
+ if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian )
+ {
+ gdcmVerboseMacro("Transfer Syntax Name = ["
+ << GetTransferSyntaxName() << "]" );
+ SwitchByteSwapCode();
+ group = SwapShort(group);
+ elem = SwapShort(elem);
+ }
+ }
+}
+
+// GenerateFreeTagKeyInGroup?
+// --> What was it designed for ?!?
/**
* \brief Generate a free TagKey i.e. a TagKey that is not present
* in the TagHt dictionary.
return false;
}
-/**
- * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
- * @param filetype Type of the File to be written
- */
-int Document::ComputeGroup0002Length( FileType filetype )
-{
- uint16_t gr;
- std::string vr;
-
- int groupLength = 0;
- bool found0002 = false;
-
- // for each zero-level Tag in the DCM Header
- DocEntry *entry = GetFirstEntry();
- while( entry )
- {
- gr = entry->GetGroup();
-
- if( gr == 0x0002 )
- {
- found0002 = true;
-
- if( entry->GetElement() != 0x0000 )
- {
- vr = entry->GetVR();
-
- if( filetype == ExplicitVR )
- {
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") )
- {
- // explicit VR AND OB, OW, SQ : 4 more bytes
- groupLength += 4;
- }
- }
- groupLength += 2 + 2 + 4 + entry->GetLength();
- }
- }
- else if (found0002 )
- break;
-
- entry = GetNextEntry();
- }
- return groupLength;
-}
-
/*
* \brief Walk recursively the given \ref DocEntrySet, and feed
* the given hash table (\ref TagDocEntryHT) with all the
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff