From: jpr Date: Mon, 21 Nov 2005 16:04:43 +0000 (+0000) Subject: I'll try to understand later why LECAGY causes troubles with Pyton, in that X-Git-Tag: Version1.3~52 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=427dd083a10d001c2162b9cb462be49cd4f22fac;p=gdcm.git I'll try to understand later why LECAGY causes troubles with Pyton, in that case. Comment out. --- diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index d6e993b9..de43533a 100644 --- 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 09:46:26 $ - Version: $Revision: 1.329 $ + Date: $Date: 2005/11/21 16:04:43 $ + Version: $Revision: 1.330 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -91,13 +91,13 @@ bool Document::Load( ) return DoTheLoadingDocumentJob( ); } -#ifndef GDCM_LEGACY_REMOVE +//#ifndef GDCM_LEGACY_REMOVE bool Document::Load( std::string const &fileName ) { Filename = fileName; return DoTheLoadingDocumentJob( ); } -#endif +//#endif /** * \brief Performs the Loading Job (internal use only) diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 55666c11..ed872a58 100644 --- 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 12:25:41 $ - Version: $Revision: 1.133 $ + Date: $Date: 2005/11/21 16:04:43 $ + Version: $Revision: 1.134 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -47,7 +47,8 @@ public: // Loading //Deprecated : use SetFileName() + Load() - GDCM_LEGACY( virtual bool Load( std::string const &filename ) ); + //GDCM_LEGACY( virtual bool Load( std::string const &filename ) ); + virtual bool Load( std::string const &filename ) virtual bool Load( ); // Dictionaries