From: jpr Date: Tue, 30 Oct 2007 09:14:41 +0000 (+0000) Subject: Fix Comments X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;p=gdcm.git Fix Comments --- diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index ca55ae56..7263a80e 100644 --- a/src/gdcmDataEntry.cxx +++ b/src/gdcmDataEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.cxx,v $ Language: C++ - Date: $Date: 2007/09/28 14:16:09 $ - Version: $Revision: 1.50 $ + Date: $Date: 2007/10/30 09:14:41 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -545,6 +545,7 @@ std::string const &DataEntry::GetHexaRepresentation() const return *StrHexaArea; // When short integer(s) are stored, convert the following (n * 2) characters // as a displayable string, the values being separated by a back-slash + s2 << std::hex; if( vr == "US" ) @@ -594,7 +595,8 @@ std::string const &DataEntry::GetHexaRepresentation() const s2 << data[i]; } *StrHexaArea=s2.str(); - } else if( vr == "FL" ) + } + else if( vr == "FL" ) { float *data=(float *)BinArea; for (unsigned int i=0; i < GetValueCount(); i++) diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 9768d484..747a1479 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2007/09/25 16:06:46 $ - Version: $Revision: 1.95 $ + Date: $Date: 2007/10/30 09:14:42 $ + Version: $Revision: 1.96 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -33,7 +33,7 @@ namespace GDCM_NAME_SPACE // Constructor / Destructor /** - * \brief Constructor from a given DictEntry + * \brief Constructor from a given DocEntry * @param group Group number * @param elem Element number * @param vr VR @@ -42,7 +42,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr) { ImplicitVR = false; DicomDict = 0; - Offset = 0 ; // To avoid further missprinting + Offset = 0 ; // To avoid further misprinting // init some variables ReadLength = 0; @@ -53,7 +53,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr) } /** - * \brief Destructor from a given DictEntry + * \brief Destructor from a given DocEntry */ DocEntry::~DocEntry() { diff --git a/src/gdcmSegmentedPalette.h b/src/gdcmSegmentedPalette.h index c2d9fa14..3c9c1387 100644 --- a/src/gdcmSegmentedPalette.h +++ b/src/gdcmSegmentedPalette.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSegmentedPalette.h,v $ Language: C++ - Date: $Date: 2007/10/27 17:34:16 $ - Version: $Revision: 1.14 $ + Date: $Date: 2007/10/30 09:14:42 $ + 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 @@ -36,7 +36,7 @@ // And both were coming from a ALOKA SSD-4000 station // // JPRx : -// It compiles fine under gcc 4.1.2 and msvc 7 +// It compiles fine under gcc 4.1.2, msvc 7 and DarwinG5-g++ // It doesn't compile on msvc 6, borland and SunOS // Any fix welcome ! @@ -90,7 +90,7 @@ namespace GDCM_NAME_SPACE virtual bool Expand(const SegmentMap& instances, std::vector& expanded) const = 0; const EntryType* First() const { return _first; } - const EntryType* Last() const { return _last; } + const EntryType* Last() const { return _last; } struct ToMap { typename SegmentMap::value_type operator()(const Segment* segment) const diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h index 1ac0829f..77f5f892 100644 --- a/src/gdcmUtil.h +++ b/src/gdcmUtil.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.h,v $ Language: C++ - Date: $Date: 2007/10/01 09:25:06 $ - Version: $Revision: 1.70 $ + Date: $Date: 2007/10/30 09:14:42 $ + Version: $Revision: 1.71 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -124,6 +124,7 @@ private: static std::string RootUID; static const std::string GDCM_UID; static uint8_t *FileMetaInformationVersion; + static const uint16_t FMIV; static std::string GDCM_MAC_ADRESS; @@ -151,7 +152,7 @@ private: ghost@aladdin.com */ -/* $Id: gdcmUtil.h,v 1.70 2007/10/01 09:25:06 jpr Exp $ */ +/* $Id: gdcmUtil.h,v 1.71 2007/10/30 09:14:42 jpr Exp $ */ /* Independent implementation of MD5 (RFC 1321). This code implements the MD5 Algorithm defined in RFC 1321, whose