comment out deprecated method Load(filename), everywhere.

Hope there is no longer any warning about it

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index de43533a2a901ba7de041bb099dcd45d139aac2a..1a3f177c3525696ae6a6126d146b0625c3f84943 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: 2005/11/21 16:04:43 $
-  Version:   $Revision: 1.330 $
+  Date:      $Date: 2005/11/21 16:28:06 $
+  Version:   $Revision: 1.331 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -91,6 +91,7 @@ bool Document::Load(  )
    return DoTheLoadingDocumentJob( );
 }
 
+/*
 //#ifndef GDCM_LEGACY_REMOVE 
 bool Document::Load( std::string const &fileName ) 
 {
@@ -98,6 +99,7 @@ bool Document::Load( std::string const &fileName )
    return DoTheLoadingDocumentJob( );
 }
 //#endif
+*/
 
 /**
  * \brief   Performs the Loading Job (internal use only)  

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index bf0f1d919dc63b8db9d08eb4d0924e03bdbcbd34..76ed0956d54dd1c66fd2e56723a7b7259274b979 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: 2005/11/21 16:14:39 $
-  Version:   $Revision: 1.135 $
+  Date:      $Date: 2005/11/21 16:28:06 $
+  Version:   $Revision: 1.136 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,7 +48,7 @@ public:
 // Loading
    //Deprecated : use SetFileName() + Load()
    //GDCM_LEGACY(  virtual bool Load( std::string const &filename )  ); 
-   virtual bool Load( std::string const &filename );
+   //virtual bool Load( std::string const &filename );
    virtual bool Load( ); 
 
 // Dictionaries

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 891a03f862a77fc3b460574652a6912fcbc4f5ff..3afec3bc0a62f3b0ab46d4262c6210958f9e20a0 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: 2005/11/09 11:21:47 $
-  Version:   $Revision: 1.304 $
+  Date:      $Date: 2005/11/21 16:28:06 $
+  Version:   $Revision: 1.305 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -155,7 +155,6 @@ bool File::Load( )
  */
 bool File::DoTheLoadingJob( ) 
 {
-
    // for some ACR-NEMA images GrPixel, NumPixel is *not* 7fe0,0010
    // We may encounter the 'RETired' (0x0028, 0x0200) tag
    // (Image Location") . This entry contains the number of
@@ -1816,7 +1815,7 @@ void File::ReadEncapsulatedBasicOffsetTable()
 
 // These are the deprecated method that one day should be removed (after the next release)
 
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
 /*
  * \ brief   Loader. (DEPRECATED :  temporaryly kept not to break the API)
  * @ param   fileName file to be open for parsing
@@ -1824,6 +1823,7 @@ void File::ReadEncapsulatedBasicOffsetTable()
  *         or no tag was found.
  * @ deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
  */
+ /*
 bool File::Load( std::string const &fileName ) 
 {
    GDCM_LEGACY_REPLACED_BODY(File::Load(std::string), "1.2",
@@ -1834,7 +1834,8 @@ bool File::Load( std::string const &fileName )
 
    return DoTheLoadingJob( );
 }
-#endif
+*/
+//#endif
 
 //-----------------------------------------------------------------------------
 // Print

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index d23d61303833751400678938f0d26ec86995d026..cea32f0a4cd189d21f42810ab81dbfb560299b90 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/26 09:15:19 $
-  Version:   $Revision: 1.119 $
+  Date:      $Date: 2005/11/21 16:28:07 $
+  Version:   $Revision: 1.120 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -104,7 +104,7 @@ public:
    static File *New() {return new File();}
 
    // Loading
-   GDCM_LEGACY(bool Load( std::string const &filename ));
+   //GDCM_LEGACY(bool Load( std::string const &filename ));
    bool Load(); 
    // Standard values and informations contained in the header
    bool IsReadable();