X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=190c151e03f7c451758cbbc73870df506f756a98;hb=7acc5e4b2b49b027c93e29f871980d0b40fed541;hp=f0f2049c98b396da2975088157dc1df339c6db42;hpb=31c63a6cb25b49a119e0132201c051ade2e17704;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index f0f2049c..190c151e 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/01/11 16:44:43 $ - Version: $Revision: 1.35 $ + Date: $Date: 2005/02/05 01:37:09 $ + 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,6 +59,10 @@ static const char *SpecialStrings[] = { "1.2.840.10008.1.2.4.57", // JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, [Selection Value 1]) "1.2.840.10008.1.2.4.70", + // JPEG-LS Lossless Image Compression + "1.2.840.10008.1.2.4.80", + // JPEG-LS Lossy (Near-Lossless) Image Compression + "1.2.840.10008.1.2.4.81", // JPEG 2000 Lossless "1.2.840.10008.1.2.4.90", // JPEG 2000 @@ -69,7 +73,9 @@ static const char *SpecialStrings[] = { "Unknown Transfer Syntax" }; +//----------------------------------------------------------------------------- void FillDefaultTSDict(TSHT &ts); + //----------------------------------------------------------------------------- // Constructor / Destructor TS::TS() @@ -78,7 +84,7 @@ TS::TS() std::ifstream from(filename.c_str()); if( !from ) { - gdcmVerboseMacro("Can't open dictionary" << filename.c_str()); + gdcmWarningMacro("Can't open dictionary" << filename.c_str()); FillDefaultTSDict( TsMap ); } else @@ -101,30 +107,11 @@ TS::TS() } } -//----------------------------------------------------------------------------- TS::~TS() { TsMap.clear(); } -//----------------------------------------------------------------------------- -// Print -/** - * \ingroup VR - * \brief Print all - * @param os The output stream to be written to. - */ -void TS::Print(std::ostream &os) -{ - std::ostringstream s; - - for (TSHT::const_iterator it = TsMap.begin(); it != TsMap.end(); ++it) - { - s << "TS : " << it->first << " = " << it->second << std::endl; - } - os << s.str(); -} - //----------------------------------------------------------------------------- // Public int TS::Count(TSKey const &key) @@ -132,22 +119,40 @@ int TS::Count(TSKey const &key) return TsMap.count(key); } -TSAtr const & TS::GetValue(TSKey const &key) +TSAtr const &TS::GetValue(TSKey const &key) { - TSHT::const_iterator it = TsMap.find(key); + // First thing clean up the string sometime the transfer syntax is padded with spaces + std::string copy = key; + while ( copy.size() && !isdigit((unsigned char)copy[copy.size()-1]) ) + { + copy.erase(copy.size()-1, 1); + } + + TSHT::const_iterator it = TsMap.find(copy); if (it == TsMap.end()) { return GDCM_UNFOUND; } return it->second; } - +/** + * \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. + */ bool TS::IsTransferSyntax(TSKey const &key) { TSHT::const_iterator it = TsMap.find(key); return it != TsMap.end(); } +/** + * \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. + */ bool TS::IsRLELossless(TSKey const &key) { bool r = false; @@ -162,6 +167,12 @@ bool TS::IsRLELossless(TSKey const &key) return r; } +/** + * \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. + */ bool TS::IsJPEGLossless(TSKey const &key) { bool r = false; @@ -178,6 +189,29 @@ bool TS::IsJPEGLossless(TSKey const &key) return r; } +/** + * \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. + */ +bool TS::IsJPEGLossy(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[JPEGBaselineProcess1] + || key == SpecialStrings[JPEGExtendedProcess2_4] + || key == SpecialStrings[JPEGExtendedProcess3_5] + || key == SpecialStrings[JPEGSpectralSelectionProcess6_8] ) + { + r = true; + } + } + return r; +} + /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a JPEG2000 one @@ -200,8 +234,8 @@ bool TS::IsJPEG2000(TSKey const &key) } /** - * \brief Determines if the Transfer Syntax corresponds to any form - * of Jpeg encoded Pixel data. + * \brief Determines if the Transfer Syntax corresponds to + * 'classical' Jpeg Lossless or Jpeg lossy. * @return True when any form of JPEG found. False otherwise. */ bool TS::IsJPEG(TSKey const &key) @@ -210,12 +244,9 @@ bool TS::IsJPEG(TSKey const &key) // First check this is an actual transfer syntax if( IsTransferSyntax(key) ) { - if ( key == SpecialStrings[JPEGBaselineProcess1] - || key == SpecialStrings[JPEGExtendedProcess2_4] - || key == SpecialStrings[JPEGExtendedProcess3_5] - || key == SpecialStrings[JPEGSpectralSelectionProcess6_8] - || IsJPEGLossless( key ) - || IsJPEG2000( key ) ) + if ( IsJPEGLossy( key ) + || IsJPEGLossless( key ) + ) { r = true; } @@ -224,18 +255,18 @@ bool TS::IsJPEG(TSKey const &key) } /** - * \brief Determines if the Transfer Syntax corresponds to encapsulated - * of encoded Pixel Data (as opposed to native). - * @return True when encapsulated. False when native. + * \brief Determines if the Transfer Syntax corresponds to any form + * of Jpeg-LS encoded Pixel data. + * @return True when any form of JPEG-LS found. False otherwise. */ -bool TS::IsEncapsulate(TSKey const &key) +bool TS::IsJPEGLS(TSKey const &key) { bool r = false; // First check this is an actual transfer syntax if( IsTransferSyntax(key) ) { - if ( key == SpecialStrings[RLELossless] - || IsJPEG(key) ) + if ( key == SpecialStrings[JPEGLSLossless] + || key == SpecialStrings[JPEGLSNearLossless] ) { r = true; } @@ -268,5 +299,21 @@ const char* TS::GetSpecialTransferSyntax(SpecialType t) // Private //----------------------------------------------------------------------------- +// Print +/** + * \brief Print all + * @param os The output stream to be written to. + */ +void TS::Print(std::ostream &os) +{ + std::ostringstream s; + for (TSHT::const_iterator it = TsMap.begin(); it != TsMap.end(); ++it) + { + s << "TS : " << it->first << " = " << it->second << std::endl; + } + os << s.str(); +} + +//----------------------------------------------------------------------------- } // end namespace gdcm