From 30b680071d4c288bd8807140cf605bd0108d6de2 Mon Sep 17 00:00:00 2001 From: jpr Date: Tue, 22 Jun 2004 14:57:10 +0000 Subject: [PATCH] Removal of now useless gdcmDocument::LoadVLEntry method --- src/gdcmDocument.cxx | 16 +++------------- src/gdcmDocument.h | 5 ++--- src/gdcmSeqEntry.cxx | 11 +++++------ 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index ece8f619..7373cb4f 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/06/22 14:07:05 $ - Version: $Revision: 1.23 $ + Date: $Date: 2004/06/22 14:57:10 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1180,7 +1180,7 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, long offset, long l_max, bool NewValEntry->SetDepthLevel(depth); set->AddEntry(NewValEntry); LoadDocEntry(NewValEntry); - if (/*!delim_mode && */NewValEntry->isItemDelimitor()) + if (NewValEntry->isItemDelimitor()) break; if ( !delim_mode && ftell(fp)-offset >= l_max) { @@ -1777,16 +1777,6 @@ void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *entry) (void)fseek(fp, (long)(entry->GetReadLength()), SEEK_CUR); } -/** - * \brief Loads the value for a a given VLEntry - * \warning NOT end user intended method ! - * @param entry - */ -void gdcmDocument::LoadVLEntry(gdcmDocEntry *entry) -{ - //SkipBytes(entry->GetLength()); - LoadDocEntry(entry); -} /** * \brief When the length of an element value is obviously wrong (because * the parser went Jabberwocky) one can hope improving things by diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 3cf32f68..5a85583e 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2004/06/22 13:47:33 $ - Version: $Revision: 1.13 $ + Date: $Date: 2004/06/22 14:57:11 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -152,7 +152,6 @@ public: bool ReplaceIfExistByNumber (char *Value, guint16 Group, guint16 Elem); virtual void *LoadEntryVoidArea (guint16 Group, guint16 Element); - void LoadVLEntry (gdcmDocEntry *entry); // System access guint16 SwapShort(guint16); // needed by gdcmFile diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 57e733f6..26989164 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2004/06/22 13:59:48 $ - Version: $Revision: 1.15 $ + Date: $Date: 2004/06/22 14:57:11 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -55,7 +55,6 @@ gdcmSeqEntry::~gdcmSeqEntry() { //----------------------------------------------------------------------------- // Print /* - * \ingroup gdcmSeqEntry * \brief canonical Printer */ void gdcmSeqEntry::Print(std::ostream &os){ @@ -101,7 +100,7 @@ void gdcmSeqEntry::Write(FILE *fp, FileType filetype) { cc != GetSQItems().end(); ++cc) { std::cout << "Et un SQItem !" << std::endl; - (*cc)->Write(fp, filetype); + (*cc)->Write(fp, filetype); // Don't remove param filetype ! } } //----------------------------------------------------------------------------- @@ -118,7 +117,7 @@ void gdcmSeqEntry::SetDepthLevel(int depth) { SQDepthLevel = depth; } -/// \brief return a pointer to th SQItem referenced by its ordinal number +/// \brief return a pointer to the SQItem referenced by its ordinal number /// (returns the first one if ordinal number is <0 /// returns the last one if ordinal number is > item number @@ -132,7 +131,7 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) { if (count==nb) return (*cc); } - return (*(items.end())); + return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME } //----------------------------------------------------------------------------- // Protected -- 2.46.2