From 4073467af614547a6cdd2b5d09d481fbea1a1f0c Mon Sep 17 00:00:00 2001 From: regrain Date: Wed, 26 Oct 2005 08:04:15 +0000 Subject: [PATCH] * Remove compilation warnings -- BeNours --- src/gdcmDicomDirElement.cxx | 6 +++--- src/gdcmDicomDirElement.h | 7 ++++--- src/gdcmDictGroupName.cxx | 6 +++--- src/gdcmDictGroupName.h | 7 ++++--- src/gdcmTS.cxx | 6 +++--- src/gdcmTS.h | 7 ++++--- src/gdcmVR.cxx | 6 +++--- src/gdcmVR.h | 7 ++++--- 8 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx index 4af127cd..b96ae416 100644 --- a/src/gdcmDicomDirElement.cxx +++ b/src/gdcmDicomDirElement.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirElement.cxx,v $ Language: C++ - Date: $Date: 2005/10/19 12:01:50 $ - Version: $Revision: 1.40 $ + Date: $Date: 2005/10/26 08:04:15 $ + Version: $Revision: 1.41 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -169,7 +169,7 @@ void DicomDirElement::AddDicomDirElement(DicomDirType type, * \brief Print all * @param os The output stream to be written to. */ -void DicomDirElement::Print(std::ostream &os) +void DicomDirElement::Print(std::ostream &os,std::string const &) { std::ostringstream s; std::list::iterator it; diff --git a/src/gdcmDicomDirElement.h b/src/gdcmDicomDirElement.h index 37c605ec..e3e0983e 100644 --- a/src/gdcmDicomDirElement.h +++ b/src/gdcmDicomDirElement.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirElement.h,v $ Language: C++ - Date: $Date: 2005/10/25 14:52:33 $ - Version: $Revision: 1.33 $ + Date: $Date: 2005/10/26 08:04:15 $ + 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 @@ -75,7 +75,8 @@ public: /** * \brief canonical Printer */ - void Print(std::ostream &os); + virtual void Print(std::ostream &os = std::cout, + std::string const &indent = "" ); /** * \brief returns a reference to the chained List diff --git a/src/gdcmDictGroupName.cxx b/src/gdcmDictGroupName.cxx index 66194b34..9d07f287 100644 --- a/src/gdcmDictGroupName.cxx +++ b/src/gdcmDictGroupName.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictGroupName.cxx,v $ Language: C++ - Date: $Date: 2005/10/23 15:32:30 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/10/26 08:04:15 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -103,7 +103,7 @@ const TagName &DictGroupName::GetName(uint16_t group) * \brief Print all * @param os The output stream to be written to. */ -void DictGroupName::Print(std::ostream &os) +void DictGroupName::Print(std::ostream &os,std::string const &) { std::ostringstream s; diff --git a/src/gdcmDictGroupName.h b/src/gdcmDictGroupName.h index c31266d6..e75c0704 100644 --- a/src/gdcmDictGroupName.h +++ b/src/gdcmDictGroupName.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictGroupName.h,v $ Language: C++ - Date: $Date: 2005/10/25 14:52:34 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/10/26 08:04:15 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,7 +44,8 @@ class GDCM_EXPORT DictGroupName : public RefCounter public: static DictGroupName *New() {return new DictGroupName();} - void Print(std::ostream &os = std::cout); + virtual void Print(std::ostream &os = std::cout, + std::string const &indent = "" ); const TagName &GetName(uint16_t group); diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index c6277def..96e9cb56 100644 --- a/src/gdcmTS.cxx +++ b/src/gdcmTS.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmTS.cxx,v $ Language: C++ - Date: $Date: 2005/10/25 17:51:17 $ - Version: $Revision: 1.51 $ + Date: $Date: 2005/10/26 08:04:16 $ + Version: $Revision: 1.52 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -346,7 +346,7 @@ const char* TS::GetSpecialTransferSyntax(SpecialType t) * \brief Print all * @param os The output stream to be written to. */ -void TS::Print(std::ostream &os) +void TS::Print(std::ostream &os,std::string const &) { std::ostringstream s; diff --git a/src/gdcmTS.h b/src/gdcmTS.h index 8a5e3408..1033846f 100644 --- a/src/gdcmTS.h +++ b/src/gdcmTS.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmTS.h,v $ Language: C++ - Date: $Date: 2005/10/25 14:52:35 $ - Version: $Revision: 1.22 $ + Date: $Date: 2005/10/26 08:04:16 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -68,7 +68,8 @@ public: public: static TS *New() {return new TS();} - void Print(std::ostream &os = std::cout); + virtual void Print(std::ostream &os = std::cout, + std::string const &indent = "" ); int Count(TSKey const &key); TSAtr const &GetValue(TSKey const &key); diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 03150d58..839e1617 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.cxx,v $ Language: C++ - Date: $Date: 2005/10/23 14:56:27 $ - Version: $Revision: 1.46 $ + Date: $Date: 2005/10/26 08:04:16 $ + Version: $Revision: 1.47 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -185,7 +185,7 @@ bool VR::IsValidVR(VRKey const &key) * \brief Print all * @param os The output stream to be written to. */ -void VR::Print(std::ostream &os) +void VR::Print(std::ostream &os,std::string const &) { for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it) { diff --git a/src/gdcmVR.h b/src/gdcmVR.h index 7a2af7b5..2fed34d1 100644 --- a/src/gdcmVR.h +++ b/src/gdcmVR.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.h,v $ Language: C++ - Date: $Date: 2005/10/25 14:52:35 $ - Version: $Revision: 1.25 $ + Date: $Date: 2005/10/26 08:04:16 $ + Version: $Revision: 1.26 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -46,7 +46,8 @@ class GDCM_EXPORT VR : public RefCounter public: static VR *New() {return new VR();} - void Print(std::ostream &os = std::cout); + virtual void Print(std::ostream &os = std::cout, + std::string const &indent = "" ); /// \brief Get the count for an element int Count(VRKey const &key) { return vr.count(key); }; -- 2.45.1