From 2e83306e5f3ef870cd6959d163a88d0731b9fcd5 Mon Sep 17 00:00:00 2001 From: frog Date: Mon, 21 Jun 2004 08:47:13 +0000 Subject: [PATCH] * Test/TestWriteSimple.cxx: fix to gdcmHeader-gdcmHeaderHelper revamping. The default constructor invoked by the line gdcmHeader *f1 = new gdcmHeader( header ); was gdcmHeader::gdcmHeader(bool) instead of the expected gdcmHeader::gdcmHeader(std::string const &, bool = false, bool, bool). Hence the parsing wasn't executed... See also below. * src/gdcmHeader.h: the declaration of gdcmHeader::gdcmHeader(bool) as explicit constructor didn't do the trick to fix the above problem. Could anyone explain why ? --- Frog --- ChangeLog | 11 +++++++++++ Testing/TestWriteSimple.cxx | 2 +- src/gdcmHeader.h | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb3908f3..2253ee22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-06-21 Eric Boix + * Test/TestWriteSimple.cxx: fix to gdcmHeader-gdcmHeaderHelper revamping. + The default constructor invoked by the line + gdcmHeader *f1 = new gdcmHeader( header ); + was gdcmHeader::gdcmHeader(bool) instead of the expected + gdcmHeader::gdcmHeader(std::string const &, bool = false, bool, bool). + Hence the parsing wasn't executed... See also below. + * src/gdcmHeader.h: the declaration of gdcmHeader::gdcmHeader(bool) + as explicit constructor didn't do the trick to fix the above problem. + Could anyone explain why ? + 2004-06-20 Eric Boix * In order to fix memory leaks: - Test/TestWriteSimple.cxx: added cleaning of free store through diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 74531f9b..49c7a530 100644 --- a/Testing/TestWriteSimple.cxx +++ b/Testing/TestWriteSimple.cxx @@ -13,7 +13,7 @@ int TestWriteSimple(int argc, char* argv[]) return 0; } - const char *header = argv[1]; + std::string header = argv[1]; const char *output = argv[2]; gdcmHeader *f1 = new gdcmHeader( header ); diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h index 75d5eb1a..19326cc9 100644 --- a/src/gdcmHeader.h +++ b/src/gdcmHeader.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.h,v $ Language: C++ - Date: $Date: 2004/06/21 04:18:26 $ - Version: $Revision: 1.75 $ + Date: $Date: 2004/06/21 08:47:14 $ + Version: $Revision: 1.76 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -107,7 +107,7 @@ protected: guint16 GrPixel; public: - gdcmHeader(bool exception_on_error = false); + explicit gdcmHeader(bool exception_on_error = false); gdcmHeader(std::string const & filename, bool exception_on_error = false, bool enable_sequences = false, -- 2.48.1