From 1e670813be403bc4ecd88fb78405d0a8969fca6c Mon Sep 17 00:00:00 2001 From: jpr Date: Fri, 2 Sep 2005 07:10:03 +0000 Subject: [PATCH] Coding style : remove useless trailing ';' from inline function definition --- src/gdcmBase.h | 8 ++++---- src/gdcmBinEntry.h | 8 ++++---- src/gdcmCommon.h | 17 +++++++++-------- src/gdcmContentEntry.h | 11 ++++++----- src/gdcmDebug.h | 12 ++++++------ src/gdcmDicomDirElement.h | 16 ++++++++-------- src/gdcmDicomDirPatient.h | 6 +++--- src/gdcmDicomDirSerie.h | 6 +++--- src/gdcmDicomDirStudy.h | 8 ++++---- src/gdcmDictSet.h | 8 ++++---- src/gdcmDirList.h | 6 +++--- src/gdcmDocEntry.h | 40 +++++++++++++++++++-------------------- src/gdcmDocEntrySet.h | 6 +++--- src/gdcmElementSet.h | 6 +++--- src/gdcmException.h | 14 +++++--------- src/gdcmFileHelper.h | 26 ++++++++++++------------- src/gdcmJPEGFragment.h | 14 +++++++------- src/gdcmOrientation.h | 8 ++++---- src/gdcmRLEFrame.h | 9 +++++---- src/gdcmSQItem.h | 10 +++++----- src/gdcmValEntry.h | 6 +++--- 21 files changed, 122 insertions(+), 123 deletions(-) diff --git a/src/gdcmBase.h b/src/gdcmBase.h index bfaa1f58..c8151f2d 100644 --- a/src/gdcmBase.h +++ b/src/gdcmBase.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmBase.h,v $ Language: C++ - Date: $Date: 2005/07/30 18:16:19 $ - Version: $Revision: 1.6 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -42,10 +42,10 @@ public: /// \brief Sets the print level for the Dicom Header Elements /// \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy Print - void SetPrintLevel(int level) { PrintLevel = level; }; + void SetPrintLevel(int level) { PrintLevel = level; } /// \brief Gets the print level for the Dicom Entries - int GetPrintLevel() { return PrintLevel; }; + int GetPrintLevel() { return PrintLevel; } protected: /// \brief Amount of printed details for each Dicom Entries : diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h index d9abd16d..cff1942b 100644 --- a/src/gdcmBinEntry.h +++ b/src/gdcmBinEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmBinEntry.h,v $ Language: C++ - Date: $Date: 2005/02/17 11:03:32 $ - Version: $Revision: 1.37 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.38 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,9 +53,9 @@ public: void SetBinArea( uint8_t *area, bool self = true ); /// \brief Sets SelfArea - void SetSelfArea(bool area) { SelfArea = area; }; + void SetSelfArea(bool area) { SelfArea = area; } /// \brief Returns SelfArea - bool IsSelfArea() { return SelfArea; }; + bool IsSelfArea() { return SelfArea; } private: /// \brief memory area to hold 'non std::string' representable values diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index a6e031d4..9584586d 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/08/30 15:13:09 $ - Version: $Revision: 1.88 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.89 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -54,9 +54,10 @@ // Old system only have this #include // For uint8_t uint16_t and uint32_t #else -// Broken plateform do not respect C99 and do not provide those typedef -// Special case for recent borland compiler, comes with stdint.h -#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) +// Broken plateforms do not respect C99 and do not provide those typedef +// Special case for recent Borland compiler, comes with stdint.h +#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) \ + || defined(__MINGW32__) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -120,8 +121,8 @@ GDCM_EXPORT extern const std::string GDCM_BINLOADED; GDCM_EXPORT extern const std::string GDCM_NOTLOADED; GDCM_EXPORT extern const std::string GDCM_UNREAD; -/// \brief TagKey is made to hold the standard Dicom Tag (Group number, Element -/// number) +/// \brief TagKey is made to hold the standard Dicom Tag +/// (Group number, Element number) /// Instead of using the two '16 bits integers' as the Hask Table key, we /// converted into a string (e.g. 0x0018,0x0050 converted into "0018|0050") /// It appears to be a huge waste of time. @@ -204,7 +205,7 @@ enum LodModeType LD_NOSEQ = 0x00000001, // Don't load Sequences LD_NOSHADOW = 0x00000002, // Don't load odd groups LD_NOSHADOWSEQ = 0x00000004 // Don't load Sequences if they belong - // to an odd group + // to an odd group // (*exclusive* from LD_NOSEQ and LD_NOSHADOW) }; diff --git a/src/gdcmContentEntry.h b/src/gdcmContentEntry.h index 2fb858c5..0b61d9c1 100644 --- a/src/gdcmContentEntry.h +++ b/src/gdcmContentEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmContentEntry.h,v $ Language: C++ - Date: $Date: 2005/02/02 16:18:48 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -40,10 +40,11 @@ public: virtual void WriteContent(std::ofstream *fp, FileType filetype) = 0; /// Sets the value (string) of the current Dicom entry - virtual void SetValue(std::string const &val) { Value = val; }; - /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted + virtual void SetValue(std::string const &val) { Value = val; } + /// \brief Returns the 'Value' (e.g. "Dupond^Marcel") converted /// into a 'string', event if it's physically stored on disk as an integer - std::string const &GetValue() const { return Value; }; + /// (e.g. : 0x000c returned as "12") + std::string const &GetValue() const { return Value; } void Copy(DocEntry *doc); diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index 2d9cc329..c7f7d65f 100644 --- a/src/gdcmDebug.h +++ b/src/gdcmDebug.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDebug.h,v $ Language: C++ - Date: $Date: 2005/08/22 18:11:34 $ - Version: $Revision: 1.41 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -55,18 +55,18 @@ public: static void SetDebugFlag (bool flag); static bool GetDebugFlag (); /// \brief Sets the Debug Flag to true - static void DebugOn () { SetDebugFlag(true); }; + static void DebugOn () { SetDebugFlag(true); } /// \brief Sets the Debug Flag to false - static void DebugOff () { SetDebugFlag(false); }; + static void DebugOff () { SetDebugFlag(false); } /// \brief This is a global flag that controls if debug are redirected /// to a file or not static void SetDebugToFile (bool flag); static bool GetDebugToFile (); /// \brief Next debug messages will be sent in the debug file - static void DebugToFileOn () { SetDebugToFile(true); }; + static void DebugToFileOn () { SetDebugToFile(true); } /// \brief Next debug messages will be sent in the standard output - static void DebugToFileOff () { SetDebugToFile(false); }; + static void DebugToFileOff () { SetDebugToFile(false); } static void SetDebugFilename (std::string const &filename); diff --git a/src/gdcmDicomDirElement.h b/src/gdcmDicomDirElement.h index c9c5148c..ffb8ba0d 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/07/12 17:08:12 $ - Version: $Revision: 1.30 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -81,41 +81,41 @@ public: * related to the META Elements of a DICOMDIR. */ ListDicomDirMetaElem const &GetDicomDirMetaElements() const - { return DicomDirMetaList; }; + { return DicomDirMetaList; } /** * \brief returns a reference to the chained List * related to the PATIENT Elements of a DICOMDIR. */ ListDicomDirPatientElem const &GetDicomDirPatientElements() const - { return DicomDirPatientList; }; + { return DicomDirPatientList; } /** * \brief returns a reference to the chained List * related to the STUDY Elements of a DICOMDIR. */ ListDicomDirStudyElem const &GetDicomDirStudyElements() const - { return DicomDirStudyList; }; + { return DicomDirStudyList; } /** * \brief returns a reference to the chained List * related to the VISIT Elements of a DICOMDIR. */ ListDicomDirVisitElem const &GetDicomDirVisitElements() const - { return DicomDirVisitList; }; + { return DicomDirVisitList; } /** * \brief returns a reference to the chained List * related to the SERIE Elements of a DICOMDIR. */ ListDicomDirSerieElem const &GetDicomDirSerieElements() const - { return DicomDirSerieList; }; + { return DicomDirSerieList; } /** * \brief returns a reference to the chained List * related to the IMAGE Elements of a DICOMDIR. */ ListDicomDirImageElem const &GetDicomDirImageElements() const - { return DicomDirImageList; }; + { return DicomDirImageList; } // Public method to add an element bool AddEntry(DicomDirType type, Element const &elem); diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h index 97331bf1..737acd7c 100644 --- a/src/gdcmDicomDirPatient.h +++ b/src/gdcmDicomDirPatient.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirPatient.h,v $ Language: C++ - Date: $Date: 2005/02/07 14:48:34 $ - Version: $Revision: 1.26 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -44,7 +44,7 @@ public: // Patient methods /// \brief Adds a new gdcmDicomDirStudy to the Patient - void AddStudy(DicomDirStudy *obj) { Studies.push_back(obj); }; + void AddStudy(DicomDirStudy *obj) { Studies.push_back(obj); } DicomDirStudy *NewStudy(); void ClearStudy(); diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h index 78658e08..27c5adc9 100644 --- a/src/gdcmDicomDirSerie.h +++ b/src/gdcmDicomDirSerie.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirSerie.h,v $ Language: C++ - Date: $Date: 2005/02/07 14:48:34 $ - Version: $Revision: 1.28 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -44,7 +44,7 @@ public: // Image methods DicomDirImage *NewImage(); /// Add a new gdcm::DicomDirImage to the Serie - void AddImage(DicomDirImage *obj) { Images.push_back(obj); }; + void AddImage(DicomDirImage *obj) { Images.push_back(obj); } void ClearImage(); DicomDirImage *GetFirstImage(); diff --git a/src/gdcmDicomDirStudy.h b/src/gdcmDicomDirStudy.h index 0b92b067..bc8245ab 100644 --- a/src/gdcmDicomDirStudy.h +++ b/src/gdcmDicomDirStudy.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirStudy.h,v $ Language: C++ - Date: $Date: 2005/07/11 08:20:25 $ - Version: $Revision: 1.28 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -52,7 +52,7 @@ public: // 'Serie' methods DicomDirSerie *NewSerie(); /// Adds a gdcm::DicomDirSerie to a gdcm::DicomDirStudy - void AddSerie(DicomDirSerie *obj) { Series.push_back(obj); }; + void AddSerie(DicomDirSerie *obj) { Series.push_back(obj); } void ClearSerie(); DicomDirSerie *GetFirstSerie(); DicomDirSerie *GetNextSerie(); @@ -61,7 +61,7 @@ public: // 'Visit' methods DicomDirVisit *NewVisit(); /// Adds a gdcm::DicomDirVisit to a gdcm::DicomDirStudy - void AddVisit(DicomDirVisit *obj) { Visits.push_back(obj); }; + void AddVisit(DicomDirVisit *obj) { Visits.push_back(obj); } void ClearVisit(); DicomDirVisit *GetFirstVisit(); DicomDirVisit *GetNextVisit(); diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index 21900ae2..3cc5eca7 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2005/07/11 20:44:52 $ - Version: $Revision: 1.44 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.45 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,11 +57,11 @@ public: Dict *GetDict( DictKey const &DictName ); /// \brief Returns the default reference DICOM V3 public dictionary. - Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }; + Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } // \ brief Returns the virtual references DICOM dictionary. // \ warning : not end user intended - // Dict *GetVirtualDict() { return &VirtualEntries; }; + // Dict *GetVirtualDict() { return &VirtualEntries; } DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem, TagName vr = GDCM_UNKNOWN, diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h index 74a220a1..7eabc36e 100644 --- a/src/gdcmDirList.h +++ b/src/gdcmDirList.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.h,v $ Language: C++ - Date: $Date: 2005/07/12 17:08:12 $ - Version: $Revision: 1.24 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.25 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -51,7 +51,7 @@ public : std::string const &GetDirName() const { return DirName; } /// Return the file names - DirListType const &GetFilenames() const { return Filenames; }; + DirListType const &GetFilenames() const { return Filenames; } static bool IsDirectory(std::string const &dirName); diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index bb94d11b..29a2522e 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.h,v $ Language: C++ - Date: $Date: 2005/08/24 12:09:13 $ - Version: $Revision: 1.48 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.49 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -42,20 +42,20 @@ class GDCM_EXPORT DocEntry : public Base public: DocEntry(DictEntry*); /// \brief Canonical Destructor - virtual ~DocEntry() {}; + virtual ~DocEntry() {} virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); virtual void WriteContent(std::ofstream *fp, FileType filetype); /// \brief Gets the DicEntry of the current Dicom entry /// @return The DicEntry of the current Dicom entry - DictEntry * GetDictEntry() { return DicomDict; }; + DictEntry * GetDictEntry() { return DicomDict; } /// Returns the Dicom Group number of the current Dicom entry - uint16_t GetGroup() { return DicomDict->GetGroup(); }; + uint16_t GetGroup() { return DicomDict->GetGroup(); } /// Returns the Dicom Element number of the current Dicom entry - uint16_t GetElement() { return DicomDict->GetElement();}; + uint16_t GetElement() { return DicomDict->GetElement();} /// Set the 'key' of the current Dicom entry void SetKey( TagKey const &key ) { Key = key; } @@ -65,42 +65,42 @@ public: /// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom /// Dictionnary of the current Dicom Header Entry - std::string const &GetName() const { return DicomDict->GetName(); }; + std::string const &GetName() const { return DicomDict->GetName(); } /// \brief Returns the 'Value Representation' (e.g. "PN" : Person Name, /// "SL" : Signed Long), found in the Dicom header or in the Dicom /// Dictionnary, of the current Dicom entry - std::string const &GetVR() const { return DicomDict->GetVR(); }; + std::string const &GetVR() const { return DicomDict->GetVR(); } /// \brief Returns the 'Value Multiplicity' (e.g. "1", "1-n", "6"), /// found in the Dicom entry or in the Dicom Dictionnary /// of the current Dicom entry - std::string const &GetVM() const { return DicomDict->GetVM(); }; + std::string const &GetVM() const { return DicomDict->GetVM(); } /// Sets the 'Value Multiplicity' of the current Dicom entry - void SetVM( TagName const &v) { DicomDict->SetVM(v); }; + void SetVM( TagName const &v) { DicomDict->SetVM(v); } /// \brief Returns offset (since the beginning of the file, including /// the File Preamble, if any) of the value of the current Dicom entry /// \warning offset of the *value*, not of the Dicom entry - size_t GetOffset() { return Offset; }; + size_t GetOffset() { return Offset; } /// \brief Sets only 'Read Length' (*not* 'Usable Length') of the current /// Dicom entry - void SetReadLength(uint32_t l) { ReadLength = l; }; + void SetReadLength(uint32_t l) { ReadLength = l; } /// \brief Returns the 'read length' of the current Dicom entry /// \warning this value is the one stored in the Dicom header but not /// mandatoryly the one thats's used (in case on SQ, or delimiters, /// the usable length is set to zero) - uint32_t GetReadLength() { return ReadLength; }; + uint32_t GetReadLength() { return ReadLength; } /// \brief Sets both 'Read Length' and 'Usable Length' of the current /// Dicom entry - void SetLength(uint32_t l) { Length = l; }; + void SetLength(uint32_t l) { Length = l; } /// \brief Returns the actual value length of the current Dicom entry /// \warning this value is not *always* the one stored in the Dicom header /// in case of well knowned bugs - uint32_t GetLength() { return Length; }; + uint32_t GetLength() { return Length; } uint32_t GetFullLength(); @@ -108,22 +108,22 @@ public: /// \brief Sets the offset of the Dicom entry /// \warning use with caution ! /// @param of offset to be set - void SetOffset(size_t of) { Offset = of; }; + void SetOffset(size_t of) { Offset = of; } /// Sets to TRUE the ImplicitVr flag of the current Dicom entry - void SetImplicitVR() { ImplicitVR = true; }; + void SetImplicitVR() { ImplicitVR = true; } /// \brief Tells us if the current Dicom entry was checked as ImplicitVr /// @return true if the current Dicom entry was checked as ImplicitVr - bool IsImplicitVR() { return ImplicitVR; }; + bool IsImplicitVR() { return ImplicitVR; } /// \brief Tells us if the VR of the current Dicom entry is Unknown /// @return true if the VR is unknown - bool IsVRUnknown() { return DicomDict->IsVRUnknown(); }; + bool IsVRUnknown() { return DicomDict->IsVRUnknown(); } /// \brief Tells us if the VM of the current Dicom entry is Unknown /// @return true if the VM is unknown - bool IsVMUnknown() { return DicomDict->IsVMUnknown(); }; + bool IsVMUnknown() { return DicomDict->IsVMUnknown(); } bool IsItemDelimitor(); bool IsItemStarter(); diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 5719f466..33106012 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2005/08/24 12:09:13 $ - Version: $Revision: 1.54 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,7 +62,7 @@ public: /// Canonical Constructor DocEntrySet(); /// Canonical Destructor - virtual ~DocEntrySet() {}; + virtual ~DocEntrySet() {} /// \brief write any type of entry to the entry set virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0; diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h index 12af9bc7..fe681ee4 100644 --- a/src/gdcmElementSet.h +++ b/src/gdcmElementSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.h,v $ Language: C++ - Date: $Date: 2005/02/21 17:47:19 $ - Version: $Revision: 1.44 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.45 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -61,7 +61,7 @@ public: DocEntry *GetNextEntry(); DocEntry *GetDocEntry(uint16_t group, uint16_t elem); /// Tells us if the ElementSet contains no entry - bool IsEmpty() { return TagHT.empty(); }; + bool IsEmpty() { return TagHT.empty(); } protected: diff --git a/src/gdcmException.h b/src/gdcmException.h index c92034ec..3b5c7d2e 100644 --- a/src/gdcmException.h +++ b/src/gdcmException.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmException.h,v $ Language: C++ - Date: $Date: 2005/02/11 16:36:52 $ - Version: $Revision: 1.22 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -47,23 +47,19 @@ public: /** * \brief virtual destructor makes this class dynamic */ - virtual ~Exception() throw() {}; + virtual ~Exception() throw() {} /// exception caught within exception class: print error message and die static void fatal(const char *from) throw(); /// returns error message - const std::string &getError() const throw() { - return Error; - } + const std::string &getError() const throw() { return Error;} /// try to discover this (dynamic) class name virtual std::string getName() const throw(); /// returns exception name string (overloads std::exception::what) - virtual const char *what() const throw() { - return (const char *) *this; - } + virtual const char *what() const throw() { return (const char *) *this;} /// returns exception name string operator const char *() const throw(); diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h index 39348bf7..ee5e9d77 100644 --- a/src/gdcmFileHelper.h +++ b/src/gdcmFileHelper.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFileHelper.h,v $ Language: C++ - Date: $Date: 2005/08/19 13:15:05 $ - Version: $Revision: 1.21 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.22 $ 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,7 @@ public: void SetLoadMode(int loadMode); void SetFileName(std::string const &fileName); bool Load(); - /// to allow user to modify pixel order (e.g. Mirror, TopDown, 90°Rotate,...) + /// to allow user to modify pixel order (e.g. Mirror, TopDown,...) void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) { UserFunction = userFunc; } // File methods @@ -114,31 +114,31 @@ public: /// \brief Tells the writer we want to keep 'Grey pixels + Palettes color' /// when possible (as opposed to convert 'Palettes color' to RGB) - void SetWriteModeToRaw() { SetWriteMode(WMODE_RAW); }; + void SetWriteModeToRaw() { SetWriteMode(WMODE_RAW); } /// \brief Tells the writer we want to write RGB image when possible /// (as opposed to 'Grey pixels + Palettes color') - void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); }; + void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); } /// \brief Sets the Write Mode ( ) - void SetWriteMode(FileMode mode) { WriteMode = mode; }; + void SetWriteMode(FileMode mode) { WriteMode = mode; } /// \brief Gets the Write Mode ( ) - FileMode GetWriteMode() { return WriteMode; }; + FileMode GetWriteMode() { return WriteMode; } // Write format /// \brief Tells the writer we want to write as Implicit VR - void SetWriteTypeToDcmImplVR() { SetWriteType(ImplicitVR); }; + void SetWriteTypeToDcmImplVR() { SetWriteType(ImplicitVR); } /// \brief Tells the writer we want to write as Explicit VR - void SetWriteTypeToDcmExplVR() { SetWriteType(ExplicitVR); }; + void SetWriteTypeToDcmExplVR() { SetWriteType(ExplicitVR); } /// \brief Tells the writer we want to write as ACR-NEMA - void SetWriteTypeToAcr() { SetWriteType(ACR); }; + void SetWriteTypeToAcr() { SetWriteType(ACR); } /// \brief Tells the writer we want to write as LibIDO - void SetWriteTypeToAcrLibido() { SetWriteType(ACR_LIBIDO); }; + void SetWriteTypeToAcrLibido() { SetWriteType(ACR_LIBIDO); } /// \brief Tells the writer which format we want to write /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) - void SetWriteType(FileType format) { WriteType = format; }; + void SetWriteType(FileType format) { WriteType = format; } /// \brief Gets the format we talled the write we wanted to write /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) - FileType GetWriteType() { return WriteType; }; + FileType GetWriteType() { return WriteType; } // Write pixels of ONE image on hard drive // No test is made on processor "endianness" diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h index 70f3312b..fa99e09d 100644 --- a/src/gdcmJPEGFragment.h +++ b/src/gdcmJPEGFragment.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragment.h,v $ Language: C++ - Date: $Date: 2005/02/06 14:43:27 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -52,11 +52,11 @@ public: bool ReadJPEGFile12 (std::ifstream *fp, void *image_buffer, int &statesuspension ); bool ReadJPEGFile16 (std::ifstream *fp, void *image_buffer, int &statesuspension ); - void SetLength(uint32_t length) { Length = length; }; - uint32_t GetLength() { return Length; }; - void SetOffset(uint32_t offset) { Offset = offset; }; - uint32_t GetOffset() { return Offset; }; - uint8_t *GetImage() { return pImage; }; + void SetLength(uint32_t length) { Length = length; } + uint32_t GetLength() { return Length; } + void SetOffset(uint32_t offset) { Offset = offset; } + uint32_t GetOffset() { return Offset; } + uint8_t *GetImage() { return pImage; } private: uint32_t Offset; diff --git a/src/gdcmOrientation.h b/src/gdcmOrientation.h index 3073e98d..cbe498ca 100644 --- a/src/gdcmOrientation.h +++ b/src/gdcmOrientation.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmOrientation.h,v $ Language: C++ - Date: $Date: 2005/07/29 20:50:07 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -41,8 +41,8 @@ class File; class GDCM_EXPORT Orientation : public Base { public: - Orientation() {}; - ~Orientation() {}; + Orientation() {} + ~Orientation() {} double TypeOrientation( File* file ); diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h index 0d5dd3e9..cc1d40d7 100644 --- a/src/gdcmRLEFrame.h +++ b/src/gdcmRLEFrame.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFrame.h,v $ Language: C++ - Date: $Date: 2005/02/01 18:37:31 $ - Version: $Revision: 1.15 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -49,8 +49,9 @@ public: RLEFrame() { NumberOfFragments = 0; } void Print( std::ostream &os = std::cout, std::string indent = "" ); - void SetNumberOfFragments(unsigned int number) { NumberOfFragments = number; }; - unsigned int GetNumberOfFragments() { return NumberOfFragments; }; + void SetNumberOfFragments(unsigned int number) + { NumberOfFragments = number; } + unsigned int GetNumberOfFragments() { return NumberOfFragments; } void SetOffset(unsigned int id, long offset); long GetOffset(unsigned int id); void SetLength(unsigned int id, long length); diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index ba42f1c0..586d650c 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.h,v $ Language: C++ - Date: $Date: 2005/07/12 17:08:12 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/09/02 07:10:03 $ + 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 @@ -59,12 +59,12 @@ public: DocEntry *GetDocEntry(uint16_t group, uint16_t elem); - bool IsEmpty() { return DocEntries.empty(); }; + bool IsEmpty() { return DocEntries.empty(); } /// \brief returns the ordinal position of a given SQItem - int GetSQItemNumber() { return SQItemNumber; }; + int GetSQItemNumber() { return SQItemNumber; } /// \brief Sets the ordinal position of a given SQItem - void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; }; + void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; } /// \brief Accessor on \ref SQDepthLevel. int GetDepthLevel() { return SQDepthLevel; } diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h index aeca4b40..d5c52034 100644 --- a/src/gdcmValEntry.h +++ b/src/gdcmValEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.h,v $ Language: C++ - Date: $Date: 2005/03/22 11:39:04 $ - Version: $Revision: 1.41 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -59,7 +59,7 @@ public: /// \brief returns the size threshold above which an element value /// will NOT be *printed* in order no to polute the screen output - static long GetMaxSizePrintEntry() { return ValEntry::MaxSizePrintEntry; }; + static long GetMaxSizePrintEntry() { return ValEntry::MaxSizePrintEntry; } static void SetMaxSizePrintEntry(long); -- 2.48.1