From 2012716d624d631dcdb825fdd4470908e115a717 Mon Sep 17 00:00:00 2001 From: frog Date: Sun, 20 Jun 2004 18:08:46 +0000 Subject: [PATCH] * Erroneous leading white fix: - src/gdcmDict.cxx: getline(from,xxx) doesn't remove the leading white[s] (as opposed to from >> xxx, that removes it [them]. - src/gdcmTS.cxx: ditto. - gdcmPython/testSuite.py: dirty related kludge removed. * src/*: remaining references to gdcmParser removed. * src/*[cxx|h]: added copy[way]left header. --- Frog --- ChangeLog | 7 ++++++ gdcmPython/testSuite.py | 4 +--- src/gdcm.h | 20 +++++++++++++++-- src/gdcmBinEntry.cxx | 16 +++++++------- src/gdcmBinEntry.h | 22 ++++++++++++++++--- src/gdcmCommon.h | 24 ++++++++++++++++---- src/gdcmDebug.cxx | 25 +++++++++++++++------ src/gdcmDebug.h | 20 +++++++++++++++-- src/gdcmDicomDirElement.cxx | 26 +++++++++++++++------- src/gdcmDicomDirElement.h | 31 +++++++++++++++++++------- src/gdcmDicomDirImage.cxx | 20 +++++++++++++++-- src/gdcmDicomDirImage.h | 20 +++++++++++++++-- src/gdcmDicomDirMeta.cxx | 20 +++++++++++++++-- src/gdcmDicomDirMeta.h | 20 +++++++++++++++-- src/gdcmDicomDirPatient.cxx | 20 +++++++++++++++-- src/gdcmDicomDirPatient.h | 20 +++++++++++++++-- src/gdcmDicomDirSerie.cxx | 20 +++++++++++++++-- src/gdcmDicomDirSerie.h | 20 +++++++++++++++-- src/gdcmDicomDirStudy.cxx | 20 +++++++++++++++-- src/gdcmDicomDirStudy.h | 20 +++++++++++++++-- src/gdcmDict.cxx | 21 ++++++++++++++++-- src/gdcmDict.h | 44 +++++++++++++++++++++++++------------ src/gdcmDictEntry.cxx | 20 +++++++++++++++-- src/gdcmDictEntry.h | 20 +++++++++++++++-- src/gdcmDictSet.cxx | 20 +++++++++++++++-- src/gdcmDictSet.h | 20 +++++++++++++++-- src/gdcmDirList.cxx | 20 +++++++++++++++-- src/gdcmDirList.h | 20 +++++++++++++++-- src/gdcmDocEntry.cxx | 20 ++++++++++++++--- src/gdcmDocEntry.h | 20 +++++++++++++++-- src/gdcmDocEntrySet.cxx | 21 +++++++++++++++--- src/gdcmDocEntrySet.h | 20 +++++++++++++++-- src/gdcmDocument.cxx | 19 ++++++++++++++-- src/gdcmElementSet.cxx | 21 +++++++++++++++--- src/gdcmElementSet.h | 18 ++++++++++++++- src/gdcmException.cxx | 20 +++++++++++++++-- src/gdcmException.h | 20 +++++++++++++++-- src/gdcmFile.cxx | 20 +++++++++++++++-- src/gdcmFile.h | 20 +++++++++++++++-- src/gdcmGlobal.cxx | 20 +++++++++++++++-- src/gdcmGlobal.h | 20 +++++++++++++++-- src/gdcmHeader.cxx | 25 ++++++++++++++++----- src/gdcmHeader.h | 21 +++++++++++++++--- src/gdcmHeaderHelper.cxx | 20 +++++++++++++++-- src/gdcmHeaderHelper.h | 20 +++++++++++++++-- src/gdcmObject.cxx | 20 +++++++++++++++-- src/gdcmObject.h | 30 ++++++++++++++++++------- src/gdcmParsePixels.cxx | 20 +++++++++++++++-- src/gdcmRLE.cxx | 22 ++++++++++++++++--- src/gdcmSQItem.h | 8 +++---- src/gdcmSeqEntry.cxx | 21 +++++++++++++++--- src/gdcmSeqEntry.h | 22 ++++++++++++++++--- src/gdcmTS.cxx | 21 ++++++++++++++++-- src/gdcmTS.h | 20 +++++++++++++++-- src/gdcmUtil.cxx | 20 +++++++++++++++-- src/gdcmUtil.h | 20 +++++++++++++++-- src/gdcmVR.cxx | 20 +++++++++++++++-- src/gdcmVR.h | 22 ++++++++++++++++--- src/gdcmValEntry.cxx | 33 ++++++++++++++++++++-------- src/gdcmValEntry.h | 24 ++++++++++++++++---- 60 files changed, 1064 insertions(+), 184 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5c22113..cb3908f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,13 @@ of 2004-06-18 in Changelog file for the call to valgrind). - on segfaults: ctest now passes all the tests but one (no more segfaults). + * Erroneous leading white fix: + - src/gdcmDict.cxx: getline(from,xxx) doesn't remove the leading + white[s] (as opposed to from >> xxx, that removes it [them]. + - src/gdcmTS.cxx: ditto. + - gdcmPython/testSuite.py: dirty related kludge removed. + * src/*: remaining references to gdcmParser removed. + * src/*[cxx|h]: added copy[way]left header. 2004-06-18 Eric Boix * In order to fix writing of dicom files: diff --git a/gdcmPython/testSuite.py b/gdcmPython/testSuite.py index 39b3bdaf..8ef87055 100644 --- a/gdcmPython/testSuite.py +++ b/gdcmPython/testSuite.py @@ -545,9 +545,7 @@ class gdcmTestCase(unittest.TestCase): valDict = reader.GetEntry() for subEntry in entry[1]: - #### BUG FIXME TODO: an odd space was introduced ! Previously - #### it worked with element = subEntry[0] - element = " " + subEntry[0] + element = subEntry[0] value = subEntry[1] self.assertEqual(valDict[element], value, ("Wrong %s for file %s (got %s, shoud be %s)" diff --git a/src/gdcm.h b/src/gdcm.h index fd2500fc..6b7a9b7d 100644 --- a/src/gdcm.h +++ b/src/gdcm.h @@ -1,5 +1,21 @@ -// gdcm.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcm.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.48 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCM_H #define GDCM_H diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index b24d5c38..0a18e65f 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmBinEntry.cxx,v $ Language: C++ - Date: $Date: 2004/06/19 23:51:03 $ - Version: $Revision: 1.10 $ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,12 +36,12 @@ gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e) { */ gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry()){ this->UsableLength = e->GetLength(); - this->ReadLength = e->GetReadLength(); - this->ImplicitVR = e->IsImplicitVR(); - this->Offset = e->GetOffset(); - this->printLevel = e->GetPrintLevel(); - this->SQDepthLevel = e->GetDepthLevel(); - + this->ReadLength = e->GetReadLength(); + this->ImplicitVR = e->IsImplicitVR(); + this->Offset = e->GetOffset(); + this->printLevel = e->GetPrintLevel(); + this->SQDepthLevel = e->GetDepthLevel(); + this->voidArea = NULL; // let's be carefull ! } diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h index 5144e03f..3865bcd2 100644 --- a/src/gdcmBinEntry.h +++ b/src/gdcmBinEntry.h @@ -1,5 +1,21 @@ -// gdcmBinEntry.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmBinEntry.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.8 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMBinEntry_H #define GDCMBinEntry_H @@ -20,7 +36,7 @@ class GDCM_EXPORT gdcmBinEntry : public gdcmValEntry { public: gdcmBinEntry(gdcmDictEntry* e); - gdcmBinEntry(gdcmDocEntry* d); + gdcmBinEntry(gdcmDocEntry* d); ~gdcmBinEntry(void); void Print(std::ostream &os = std::cout); diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 46c3bc29..2eaca042 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -1,5 +1,21 @@ -//gdcmCommon.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmCommon.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.27 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMCOMMON_H #define GDCMCOMMON_H @@ -40,7 +56,7 @@ typedef unsigned short guint16; typedef unsigned int guint32; typedef short gint16; -typedef int gint32; +typedef int gint32; #define UINT32_MAX (4294967295U) #endif //HAVE_NO_STDINT_H #endif @@ -48,7 +64,7 @@ typedef int gint32; #ifdef _MSC_VER typedef unsigned short guint16; typedef unsigned int guint32; -typedef short gint16; +typedef short gint16; typedef int gint32; #define UINT32_MAX (4294967295U) #endif diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx index 9963df5a..6868b8a4 100644 --- a/src/gdcmDebug.cxx +++ b/src/gdcmDebug.cxx @@ -1,3 +1,21 @@ +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDebug.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.2 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include #include "gdcmDebug.h" @@ -8,7 +26,6 @@ gdcmDebug dbg; /** - * \ingroup gdcmDebug * \brief constructor * @param level debug level */ @@ -17,7 +34,6 @@ gdcmDebug::gdcmDebug(int level) { } /** - * \ingroup gdcmDebug * \brief Accessor * @param level Set the debug level */ @@ -26,7 +42,6 @@ void gdcmDebug::SetDebug(int level) { } /** - * \ingroup gdcmDebug * \brief Verbose * @param Level level * @param Msg1 first message part @@ -39,7 +54,6 @@ void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) { } /** - * \ingroup gdcmDebug * \brief Error * @param Test test * @param Msg1 first message part @@ -53,7 +67,6 @@ void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { } /** - * \ingroup gdcmDebug * \brief Error * @param Msg1 first message part * @param Msg2 second message part @@ -66,7 +79,6 @@ void gdcmDebug::Error(const char* Msg1, const char* Msg2, } /** - * \ingroup gdcmDebug * \brief Assert * @param Level level * @param Test test @@ -82,7 +94,6 @@ void gdcmDebug::Error(const char* Msg1, const char* Msg2, } /** - * \ingroup gdcmDebug * \brief Exit * @param a return code */ diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index 86a20022..e1e8fde9 100644 --- a/src/gdcmDebug.h +++ b/src/gdcmDebug.h @@ -1,5 +1,21 @@ -// gdcmDebug.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDebug.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.3 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDEBUG_H #define GDCMDEBUG_H diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx index f0f82ed1..edef2e05 100644 --- a/src/gdcmDicomDirElement.cxx +++ b/src/gdcmDicomDirElement.cxx @@ -1,5 +1,21 @@ -// gdcmDicomDirElement.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirElement.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.12 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include #include // For sprintf #include @@ -10,16 +26,10 @@ #include "gdcmDictSet.h" -/** - * \ingroup gdcmDicomDirElement - * \brief Class for the chained lists from the file 'Dicts/DicomDir.dic' - */ - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDicomDirElement * \brief constructor : populates the chained lists * from the file 'Dicts/DicomDir.dic' */ diff --git a/src/gdcmDicomDirElement.h b/src/gdcmDicomDirElement.h index cfbb4c63..578dfa77 100644 --- a/src/gdcmDicomDirElement.h +++ b/src/gdcmDicomDirElement.h @@ -1,5 +1,21 @@ -// gdcmDicomDirElement.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirElement.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.8 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICOMDIRELEMENT_H #define GDCMDICOMDIRELEMENT_H @@ -11,11 +27,11 @@ typedef struct { /// DicomGroup number - unsigned short int group; + unsigned short int group; /// DicomElement number - unsigned short int elem; - /// value (coded as a std::string) of the Element - std::string value; + unsigned short int elem; + /// value (coded as a std::string) of the Element + std::string value; } gdcmElement; typedef std::list ListDicomDirMetaElem; @@ -28,7 +44,7 @@ typedef std::list ListDicomDirImageElem; /** * \ingroup gdcmDicomDirElement * \brief gdcmDicomDirElement represents elements contained in a dicom dir - * + * Class for the chained lists from the file 'Dicts/DicomDir.dic' */ class GDCM_EXPORT gdcmDicomDirElement { @@ -37,7 +53,6 @@ public: ~gdcmDicomDirElement(void); /** - * \ingroup gdcmParser * \brief canonical Printer * \sa SetPrintLevel */ diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx index a8905981..445bbb97 100644 --- a/src/gdcmDicomDirImage.cxx +++ b/src/gdcmDicomDirImage.cxx @@ -1,5 +1,21 @@ -// gdcmDicomDirImage.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirImage.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.7 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDicomDirImage.h" #include "gdcmValEntry.h" //----------------------------------------------------------------------------- diff --git a/src/gdcmDicomDirImage.h b/src/gdcmDicomDirImage.h index e2d74927..82a0ced0 100644 --- a/src/gdcmDicomDirImage.h +++ b/src/gdcmDicomDirImage.h @@ -1,5 +1,21 @@ -// gdcmDicomDirImage.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirImage.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + 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 + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICOMIMAGE_H #define GDCMDICOMIMAGE_H diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx index 9a017cac..2cec741b 100644 --- a/src/gdcmDicomDirMeta.cxx +++ b/src/gdcmDicomDirMeta.cxx @@ -1,5 +1,21 @@ -// gdcmDicomDirMeta.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirMeta.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.4 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDicomDirMeta.h" #include "gdcmDocument.h" diff --git a/src/gdcmDicomDirMeta.h b/src/gdcmDicomDirMeta.h index eef83e02..1f9b3a40 100644 --- a/src/gdcmDicomDirMeta.h +++ b/src/gdcmDicomDirMeta.h @@ -1,5 +1,21 @@ -// gdcmDicomDirMeta.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirMeta.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.4 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICOMDIRMETA_H #define GDCMDICOMDIRMETA_H diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx index 5c42ad6d..e4c646d0 100644 --- a/src/gdcmDicomDirPatient.cxx +++ b/src/gdcmDicomDirPatient.cxx @@ -1,5 +1,21 @@ -// gdcmDicomDirPatient.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirPatient.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.8 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDicomDirPatient.h" #include "gdcmDicomDirElement.h" #include "gdcmGlobal.h" diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h index 87c039bd..cbd99e4a 100644 --- a/src/gdcmDicomDirPatient.h +++ b/src/gdcmDicomDirPatient.h @@ -1,5 +1,21 @@ -// gdcmDicomDirPatient.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirPatient.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.4 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMPATIENT_H #define GDCMPATIENT_H diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx index f3566ae0..ecdb07c2 100644 --- a/src/gdcmDicomDirSerie.cxx +++ b/src/gdcmDicomDirSerie.cxx @@ -1,5 +1,21 @@ -// gdcmDicomDirSerie.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirSerie.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.10 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDicomDirSerie.h" #include "gdcmDicomDirElement.h" #include "gdcmGlobal.h" diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h index c009dc08..f96f18bf 100644 --- a/src/gdcmDicomDirSerie.h +++ b/src/gdcmDicomDirSerie.h @@ -1,5 +1,21 @@ -// gdcmDicomDirSerie.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirSerie.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.4 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICOMDIRSERIE_H #define GDCMDICOMDIRSERIE_H diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx index 9a9f401c..3dffdb3a 100644 --- a/src/gdcmDicomDirStudy.cxx +++ b/src/gdcmDicomDirStudy.cxx @@ -1,5 +1,21 @@ -// gdcmDicomDirStudy.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirStudy.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.7 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirElement.h" #include "gdcmGlobal.h" diff --git a/src/gdcmDicomDirStudy.h b/src/gdcmDicomDirStudy.h index 75dbfa86..26c7834f 100644 --- a/src/gdcmDicomDirStudy.h +++ b/src/gdcmDicomDirStudy.h @@ -1,5 +1,21 @@ -// gdcmDicomDirStudy.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDirStudy.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.4 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICOMDIRSTUDY_H #define GDCMDICOMDIRSTUDY_H diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 46edb403..4a210c3b 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -1,5 +1,21 @@ -// gdcmDict.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDict.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.35 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDict.h" #include "gdcmUtil.h" #include "gdcmDebug.h" @@ -31,6 +47,7 @@ gdcmDict::gdcmDict(std::string & FileName) { from >> element; from >> vr; from >> fourth; + eatwhite(from); getline(from, name); /// MEMORY LEAK in std::getline<> gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, diff --git a/src/gdcmDict.h b/src/gdcmDict.h index 66f0df52..9931f7bc 100644 --- a/src/gdcmDict.h +++ b/src/gdcmDict.h @@ -1,5 +1,21 @@ -// gdcmDict.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDict.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.15 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICT_H #define GDCMDICT_H @@ -28,22 +44,22 @@ typedef std::map TagNameHT; class GDCM_EXPORT gdcmDict { public: gdcmDict(std::string & FileName); - ~gdcmDict(); + ~gdcmDict(); // Print - void Print(std::ostream &os = std::cout); - void PrintByKey(std::ostream &os = std::cout); - void PrintByName(std::ostream &os = std::cout); + void Print(std::ostream &os = std::cout); + void PrintByKey(std::ostream &os = std::cout); + void PrintByName(std::ostream &os = std::cout); // Entries bool AddNewEntry (gdcmDictEntry *NewEntry); - bool ReplaceEntry(gdcmDictEntry *NewEntry); - bool RemoveEntry (TagKey key); - bool RemoveEntry (guint16 group, guint16 element); - + bool ReplaceEntry(gdcmDictEntry *NewEntry); + bool RemoveEntry (TagKey key); + bool RemoveEntry (guint16 group, guint16 element); + // Tag - gdcmDictEntry *GetDictEntryByName(TagName name); - gdcmDictEntry *GetDictEntryByNumber(guint16 group, guint16 element); + gdcmDictEntry *GetDictEntryByName(TagName name); + gdcmDictEntry *GetDictEntryByNumber(guint16 group, guint16 element); std::list *GetDictEntryNames(void); std::map > * @@ -67,9 +83,9 @@ private: /// ASCII file holding the Dictionnary std::string filename; /// Access through TagKey (see alternate access with NameHt) - TagKeyHT KeyHt; + TagKeyHT KeyHt; /// Access through TagName (see alternate access with KeyHt) - TagNameHT NameHt; + TagNameHT NameHt; }; //----------------------------------------------------------------------------- diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index 598a083c..8001f2d9 100644 --- a/src/gdcmDictEntry.cxx +++ b/src/gdcmDictEntry.cxx @@ -1,5 +1,21 @@ -// gdcmDictEntry.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictEntry.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.21 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDictEntry.h" #include "gdcmDebug.h" diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h index affbd53d..fda8b998 100644 --- a/src/gdcmDictEntry.h +++ b/src/gdcmDictEntry.h @@ -1,5 +1,21 @@ -// gdcmDictEntry.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictEntry.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.14 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICTENTRY_H #define GDCMDICTENTRY_H diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 882344ae..e15f6a7f 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,5 +1,21 @@ -// gdcmDictEntry -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictSet.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.31 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDictSet.h" #include "gdcmDebug.h" #include diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index 2c480fff..c4cca7c9 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -1,5 +1,21 @@ -// gdcmDictSet.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictSet.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.20 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICTSET_H #define GDCMDICTSET_H diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 5f8f3ccc..e30f6337 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -1,5 +1,21 @@ -// gdcmDirList.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDirList.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.16 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDirList.h" #include "gdcmUtil.h" diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h index 0ffb6c1e..de357666 100644 --- a/src/gdcmDirList.h +++ b/src/gdcmDirList.h @@ -1,5 +1,21 @@ -// gdcmDirList.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDirList.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.7 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDIRLIST_H #define GDCMDIRLIST_H diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index e1154793..0afb302f 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -1,6 +1,20 @@ -// gdcmDocEntry.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDocEntry.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.7 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmDocEntry.h" #include "gdcmTS.h" diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index 33a8b2df..2f7dc1d4 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -1,5 +1,21 @@ -// gdcmDocEntry.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDocEntry.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.9 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDocEntry_H #define GDCMDocEntry_H diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 9b7286f0..c888737b 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -1,6 +1,21 @@ -// gdcmDocEntrySet.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDocEntrySet.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.9 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include #include "gdcmDebug.h" #include "gdcmCommon.h" diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 48e183d0..95e6b9ab 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -1,5 +1,21 @@ -// gdcmDocEntrySet.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDocEntrySet.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.10 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDOCENTRYSET_H #define GDCMDOCENTRYSET_H diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 3e3c3ac1..834a3d1e 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -1,5 +1,20 @@ -// gdcmDocument.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDocument.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.19 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmDocument.h" #include "gdcmValEntry.h" diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index b9d59ac0..8c10b275 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -1,6 +1,21 @@ -// gdcmElementSet.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmElementSet.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.8 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmElementSet.h" #include "gdcmDebug.h" diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h index 826b85cf..56486efe 100644 --- a/src/gdcmElementSet.h +++ b/src/gdcmElementSet.h @@ -1,4 +1,20 @@ -// gdcmElementSet.h +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmElementSet.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.8 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #ifndef GDCMELEMENTSET_H #define GDCMELEMENTSET_H diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx index 2d2a9b06..03715605 100644 --- a/src/gdcmException.cxx +++ b/src/gdcmException.cxx @@ -1,5 +1,21 @@ -// gdcmException.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmException.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.16 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmException.h" #include diff --git a/src/gdcmException.h b/src/gdcmException.h index 510ef725..95d9a3c5 100644 --- a/src/gdcmException.h +++ b/src/gdcmException.h @@ -1,5 +1,21 @@ -// gdcmException.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmException.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.13 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCM_EXCEPTION_H #define GDCM_EXCEPTION_H diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 288e53ce..d4ff7330 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -1,5 +1,21 @@ -// gdcmFile.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmFile.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.103 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmFile.h" #include "gdcmDebug.h" #include "jpeg/ljpg/jpegless.h" diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 95906988..dd5b4655 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -1,5 +1,21 @@ -// gdcmFile.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmFile.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.30 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMFILE_H #define GDCMFILE_H diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index 7be5abe6..f6278f62 100644 --- a/src/gdcmGlobal.cxx +++ b/src/gdcmGlobal.cxx @@ -1,5 +1,21 @@ -// gdcmGlobal.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmGlobal.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.2 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmGlobal.h" #include "gdcmDebug.h" #include diff --git a/src/gdcmGlobal.h b/src/gdcmGlobal.h index e17c8ed5..677f97cc 100644 --- a/src/gdcmGlobal.h +++ b/src/gdcmGlobal.h @@ -1,5 +1,21 @@ -// gdcmGlobal.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmGlobal.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.2 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMGLOBAL_H #define GDCMGLOBAL_H diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index b8b91119..19d00890 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -1,5 +1,21 @@ -// gdcmHeader.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmHeader.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.165 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmHeader.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" @@ -85,12 +101,11 @@ gdcmHeader::~gdcmHeader (void) { // Public /** - * \ingroup gdcmHeader * \brief This predicate, based on hopefully reasonable heuristics, - * decides whether or not the current gdcmParser was properly parsed + * decides whether or not the current gdcmHeader was properly parsed * and contains the mandatory information for being considered as * a well formed and usable Dicom/Acr File. - * @return true when gdcmParser is the one of a reasonable Dicom/Acr file, + * @return true when gdcmHeader is the one of a reasonable Dicom/Acr file, * false otherwise. */ bool gdcmHeader::IsReadable(void) { diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h index ad4881ff..88c5dcdb 100644 --- a/src/gdcmHeader.h +++ b/src/gdcmHeader.h @@ -1,10 +1,25 @@ -// gdcmHeader.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmHeader.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.74 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMHEADER_H #define GDCMHEADER_H #include "gdcmCommon.h" -//#include "gdcmParser.h" #include "gdcmDocument.h" //----------------------------------------------------------------------------- /** diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx index 54f9b4ec..1b1af705 100644 --- a/src/gdcmHeaderHelper.cxx +++ b/src/gdcmHeaderHelper.cxx @@ -1,5 +1,21 @@ -// gdcmHeaderHelper.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmHeaderHelper.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.37 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmHeaderHelper.h" #include "gdcmDirList.h" diff --git a/src/gdcmHeaderHelper.h b/src/gdcmHeaderHelper.h index 9fdcffbd..9381f7f9 100644 --- a/src/gdcmHeaderHelper.h +++ b/src/gdcmHeaderHelper.h @@ -1,5 +1,21 @@ -// gdcmHeaderHelper.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmHeaderHelper.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.16 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMHEADERHELPER_H #define GDCMHEADERHELPER_H diff --git a/src/gdcmObject.cxx b/src/gdcmObject.cxx index 25cba3b5..73172ae2 100644 --- a/src/gdcmObject.cxx +++ b/src/gdcmObject.cxx @@ -1,5 +1,21 @@ -// gdcmObject.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmObject.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.20 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmObject.h" #include "gdcmGlobal.h" #include "gdcmDebug.h" diff --git a/src/gdcmObject.h b/src/gdcmObject.h index 13eff680..92a10313 100644 --- a/src/gdcmObject.h +++ b/src/gdcmObject.h @@ -1,5 +1,21 @@ -// gdcmObject.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmObject.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.17 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMOBJECT_H #define GDCMOBJECT_H @@ -7,7 +23,6 @@ #include #include "gdcmCommon.h" #include "gdcmDocEntry.h" -//#include "gdcmParser.h" #include "gdcmDocument.h" #include "gdcmDicomDirElement.h" #include "gdcmSQItem.h" @@ -26,7 +41,6 @@ class GDCM_EXPORT gdcmObject : public gdcmSQItem public: /** - * \ingroup gdcmParser * \brief Sets the print level for the Dicom Header * \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy */ @@ -38,13 +52,13 @@ public: protected: - // constructor and destructor are protected to avoid end user to instanciate this class. + // Constructor and destructor are protected to avoid end user to + // instanciate from this class. gdcmObject(TagDocEntryHT *ptagHT, int depth = 0); virtual ~gdcmObject(void); -// variables : - -///\brief detail level to be printed +// Members : + ///\brief detail level to be printed int printLevel; private: diff --git a/src/gdcmParsePixels.cxx b/src/gdcmParsePixels.cxx index c7233f30..268492e7 100644 --- a/src/gdcmParsePixels.cxx +++ b/src/gdcmParsePixels.cxx @@ -1,5 +1,21 @@ -// gdcmParse.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmParsePixels.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + 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 + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmCommon.h" #include "gdcmFile.h" diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx index 14f2431c..52f9a9f2 100644 --- a/src/gdcmRLE.cxx +++ b/src/gdcmRLE.cxx @@ -1,8 +1,24 @@ -// gdcmRLE.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmRLE.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.18 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include #include "gdcmFile.h" -#include // to declare isprint() +#include // For isprint() #define str2num(str, typeNum) *((typeNum *)(str)) diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index 9aa9b716..e08ae79c 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.h,v $ Language: C++ - Date: $Date: 2004/06/19 23:51:04 $ - Version: $Revision: 1.8 $ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -50,10 +50,10 @@ public: std::string GetEntryByNumber(guint16 group, guint16 element); std::string GetEntryByName(TagName name); - + inline int GetSQItemNumber() { return SQItemNumber;}; - inline void SetSQItemNumber(int itemNumber) { SQItemNumber=itemNumber;}; + inline void SetSQItemNumber(int itemNumber) { SQItemNumber=itemNumber;}; protected: // DocEntry related utilities diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 2273a11f..11f048da 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -1,6 +1,21 @@ -// gdcmSeqEntry.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmSeqEntry.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.12 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" #include "gdcmTS.h" diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h index 69aae040..8ba49bf0 100644 --- a/src/gdcmSeqEntry.h +++ b/src/gdcmSeqEntry.h @@ -1,4 +1,20 @@ -// gdcmSeqEntry.h +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmSeqEntry.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.10 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #ifndef GDCMSQDOCENTRY_H #define GDCMSQDOCENTRY_H @@ -29,8 +45,8 @@ public: /// \brief Sets the Sequence Delimitation Item inline void SetSequenceDelimitationItem(gdcmDocEntry * e) { seq_term = e;} - void AddEntry(gdcmSQItem *it, int itemNumber); - gdcmSQItem *GetSQItemByOrdinalNumber(int itemNumber); + void AddEntry(gdcmSQItem *it, int itemNumber); + gdcmSQItem *GetSQItemByOrdinalNumber(int itemNumber); void SetDepthLevel(int depth); diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index e6543d8c..cc214c63 100644 --- a/src/gdcmTS.cxx +++ b/src/gdcmTS.cxx @@ -1,5 +1,21 @@ -// gdcmTS.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmTS.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.18 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include #include #include @@ -25,6 +41,7 @@ gdcmTS::gdcmTS(void) while (!from.eof()) { from >> key; + eatwhite(from); getline(from, name); /// MEMORY LEAK if(key!="") diff --git a/src/gdcmTS.h b/src/gdcmTS.h index 65b4a35d..f3e6e04c 100644 --- a/src/gdcmTS.h +++ b/src/gdcmTS.h @@ -1,5 +1,21 @@ -// gdcmTS.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmTS.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.7 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMTS_H #define GDCMTS_H diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index c6a9d036..cabc9675 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,5 +1,21 @@ -// gdcmUtil.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.44 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmUtil.h" #include "gdcmDebug.h" #include diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h index 403397b7..ae4f23f4 100644 --- a/src/gdcmUtil.h +++ b/src/gdcmUtil.h @@ -1,5 +1,21 @@ -// gdcmUtil.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.29 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMUTIL_H #define GDCMUTIL_H diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 12370084..dbe4d2d5 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -1,5 +1,21 @@ -// gdcmVR.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmVR.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.13 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include #include diff --git a/src/gdcmVR.h b/src/gdcmVR.h index 7dd8e1ff..8d18dfdd 100644 --- a/src/gdcmVR.h +++ b/src/gdcmVR.h @@ -1,5 +1,21 @@ -// gdcmVR.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmVR.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.9 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMVR_H #define GDCMVR_H @@ -21,7 +37,7 @@ typedef std::map VRHT; // Value Representation Hash Table class GDCM_EXPORT gdcmVR { public: - gdcmVR(void); + gdcmVR(void); ~gdcmVR(); void Print(std::ostream &os = std::cout); diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 656dd2a1..045ce967 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -1,6 +1,21 @@ -// gdcmValEntry.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmValEntry.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.7 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmValEntry.h" #include "gdcmTS.h" #include "gdcmGlobal.h" @@ -27,12 +42,12 @@ gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e) { */ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry()){ this->UsableLength = e->GetLength(); - this->ReadLength = e->GetReadLength(); - this->ImplicitVR = e->IsImplicitVR(); - this->Offset = e->GetOffset(); - this->printLevel = e->GetPrintLevel(); - this->SQDepthLevel = e->GetDepthLevel(); - + this->ReadLength = e->GetReadLength(); + this->ImplicitVR = e->IsImplicitVR(); + this->Offset = e->GetOffset(); + this->printLevel = e->GetPrintLevel(); + this->SQDepthLevel = e->GetDepthLevel(); + this->voidArea = NULL; // will be in BinEntry ? } diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h index 9a5912ba..164b910f 100644 --- a/src/gdcmValEntry.h +++ b/src/gdcmValEntry.h @@ -1,5 +1,21 @@ -// gdcmValEntry.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmValEntry.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:48 $ + Version: $Revision: 1.10 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMValEntry_H #define GDCMValEntry_H @@ -19,7 +35,7 @@ class GDCM_EXPORT gdcmValEntry : public gdcmDocEntry { public: gdcmValEntry(gdcmDictEntry* e); - gdcmValEntry(gdcmDocEntry* d); + gdcmValEntry(gdcmDocEntry* d); ~gdcmValEntry(void); /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a @@ -35,7 +51,7 @@ public: protected: /// \brief for 'non string' values. Will be move to gdcmBinEntry, later - void* voidArea; // clean it out later + void* voidArea; // clean it out later private: -- 2.48.1