From: malaterre Date: Sat, 23 Jul 2005 01:59:21 +0000 (+0000) Subject: COMP: Fix some more deprecated forward X-Git-Tag: Version1.2.bp~270 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3d6874613ae6753dac9af37afc0f7172342301cd;p=gdcm.git COMP: Fix some more deprecated forward --- diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 52d239d7..bcdc5ad1 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/07/21 05:02:11 $ - Version: $Revision: 1.151 $ + Date: $Date: 2005/07/23 01:59:21 $ + Version: $Revision: 1.152 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -148,7 +148,8 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): ParseDir = parseDir; SetLoadMode (0x00000000); // concerns only dicom files - Load( fileName ); + SetFileName( fileName ); + Load( ); } #endif diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx index 40c088ea..0bf7bf7d 100644 --- a/src/gdcmFileHelper.cxx +++ b/src/gdcmFileHelper.cxx @@ -4,8 +4,8 @@ Module: $RCSfile: gdcmFileHelper.cxx,v $ Language: C++ - Date: $Date: 2005/07/19 15:19:27 $ - Version: $Revision: 1.49 $ + Date: $Date: 2005/07/23 01:59:21 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1559,7 +1559,9 @@ void FileHelper::Print(std::ostream &os, std::string const &) */ FileHelper::FileHelper(std::string const &filename ) { - FileInternal = new File( filename ); + FileInternal = new File( ); + FileInternal->SetFileName( filename ); + FileInternal->Load(); SelfHeader = true; Initialize(); }