removal of methode gdcmDocument::WriteF, replaced by gdcmDocument::Write

(beware of 'virtual' !)

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index e0d531a7e382d6cb1268fb6741a96759cf59d497..e145dc0e5ca0a364ccafb88491e05da4315490d6 100644 (file)
--- 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/25 12:56:39 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2004/06/25 17:48:45 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -516,8 +516,8 @@ bool gdcmDocument::CloseFile(void) {
  *          (ACR-NEMA, ExplicitVR, ImplicitVR)
  * \return Always true.
  */
-bool gdcmDocument::WriteF(FileType filetype) {
-/// \todo
+void gdcmDocument::Write(FILE* fp,FileType filetype) {
+///
 /// ==============
 ///      The stuff is rewritten using the SeQuence based 
 ///       tree-like stucture (cf : Print )
@@ -530,8 +530,8 @@ bool gdcmDocument::WriteF(FileType filetype) {
    /// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA
    /// no way (check : FileType est un champ de gdcmDocument ...)
    /// a moins de se livrer a un tres complique ajout des champs manquants.
-   /// faire un CheckAndCorrectHeader (?)  
-
+   /// faire un CheckAndCorrectHeader (?) 
+ 
    if (filetype == gdcmImplicitVR) 
    {
       std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2;
@@ -572,9 +572,9 @@ bool gdcmDocument::WriteF(FileType filetype) {
  *    UpdateGroupLength(true,ACR);
  */
  
-   gdcmElementSet::Write(fp,filetype);
+   gdcmElementSet::Write(fp,filetype); 
 
-   return true;
+  // return true;
 }
 
 /**

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 4a5873f0495153b5091a008050edc837e6b14577..c5354856ad626e8ac6548639e15ddf731efd6c89 100644 (file)
--- 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/24 18:03:14 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2004/06/25 17:48:45 $
+  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
@@ -142,7 +142,7 @@ public:
 
 // Write (used in gdcmFile, gdcmDicomDir)
 
-   virtual bool WriteF(FileType type); // New stuff, with recursive exploration
+    void Write(FILE * fp,FileType type); // New stuff, with recursive exploration
 
    gdcmValEntry * ReplaceOrCreateByNumber(std::string Value,
                                              guint16 Group, guint16 Elem);
@@ -238,7 +238,7 @@ private:
    void SetMaxSizeLoadEntry(long);
    void SetMaxSizePrintEntry(long);
 
-        
+ 
    // DocEntry related utilities
    gdcmDocEntry *ReadNextDocEntry   ();
 

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index fa98cf0d5d56175ecafbf36fa0d833dcbaafea21..44579afa9b691c5fe3dda825c9fc480292882f8f 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 16:22:21 $
-  Version:   $Revision: 1.109 $
+  Date:      $Date: 2004/06/25 17:48:45 $
+  Version:   $Revision: 1.110 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -293,7 +293,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
  */
 void * gdcmFile::GetImageDataRaw () {
    if (Header->HasLUT())
-      /// \todo Let gdcmHeadar user a chance to get the right value
+      /// \todo Let gdcmHeader user a chance to get the right value
       /// Create a member lgrTotaleRaw ???
       lgrTotale /= 3;
    PixelData = new unsigned char[lgrTotale];