X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=96e9cb562ccfa99d3809d8f54915dbf9c0e27090;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=4641bc8dacb56a260ba0169c042f76198e3fcf2e;hpb=ca18f7520f2d5bbf584bfce7883ae6dfa84261e0;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index 4641bc8d..96e9cb56 100644 --- a/src/gdcmTS.cxx +++ b/src/gdcmTS.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmTS.cxx,v $ Language: C++ - Date: $Date: 2005/07/02 18:09:36 $ - Version: $Revision: 1.49 $ + Date: $Date: 2005/10/26 08:04:16 $ + Version: $Revision: 1.52 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -75,7 +75,8 @@ static const char *SpecialStrings[] = { // MPEG2 Main Profile @ Main Level "1.2.840.10008.1.2.4.100", // Unknown - "Unknown Transfer Syntax" + "Unknown Transfer Syntax", // Pretty sure we never use this case... + NULL // Compilers have no obligation to finish by NULL, do it ourself }; //----------------------------------------------------------------------------- @@ -128,11 +129,11 @@ int TS::Count(TSKey const &key) return TsMap.count(key); } -/// \brief returns the human reabable value of a Transfer Synatx string +/// \brief returns the human readable value of a Transfer Syntax string TSAtr const &TS::GetValue(TSKey const &key) { // First thing clean up the string - // (sometime the transfer syntax is padded with spaces) + // (sometimes the transfer syntax is padded with spaces) std::string copy = key; while ( copy.size() && !isdigit((unsigned char)copy[copy.size()-1]) ) { @@ -149,8 +150,8 @@ TSAtr const &TS::GetValue(TSKey const &key) /** * \brief Determines if the key passed corresponds to a 'Transfer Syntax' * as defined in DICOM (and stored in gdcm::TS class) - * @return True when key is an actual 'Transfer Syntax'. False in all - * other cases. + * @return True when key is an actual 'Transfer Syntax'. + * False in all other cases. */ bool TS::IsTransferSyntax(TSKey const &key) { @@ -161,8 +162,8 @@ bool TS::IsTransferSyntax(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a Run Length Encoding Lossless one - * @return True when Run Length Encoding Lossless found. False in all - * other cases. + * @return True when Run Length Encoding Lossless found. + * False in all other cases. */ bool TS::IsRLELossless(TSKey const &key) { @@ -181,8 +182,8 @@ bool TS::IsRLELossless(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a 'classical' JPEG Lossless one - * @return True when 'classical' Lossless found. False in all - * other cases. + * @return True when 'classical' Lossless found. + * False in all other cases. */ bool TS::IsJPEGLossless(TSKey const &key) { @@ -203,8 +204,8 @@ bool TS::IsJPEGLossless(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a 'classical' JPEG Lossy one - * @return True when 'classical' Lossy found. False in all - * other cases. + * @return True when 'classical' Lossy found. + * False in all other cases. */ bool TS::IsJPEGLossy(TSKey const &key) { @@ -226,8 +227,8 @@ bool TS::IsJPEGLossy(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a JPEG2000 one - * @return True when JPEG2000 (Lossly or LossLess) found. False in all - * other cases. + * @return True when JPEG2000 (Lossly or LossLess) found. + * False in all other cases. */ bool TS::IsJPEG2000(TSKey const &key) { @@ -345,7 +346,7 @@ const char* TS::GetSpecialTransferSyntax(SpecialType t) * \brief Print all * @param os The output stream to be written to. */ -void TS::Print(std::ostream &os) +void TS::Print(std::ostream &os,std::string const &) { std::ostringstream s;