Program: gdcm
Module: $RCSfile: gdcmTS.cxx,v $
Language: C++
- Date: $Date: 2005/04/22 13:37:57 $
- Version: $Revision: 1.45 $
+ Date: $Date: 2005/09/20 09:09:43 $
+ Version: $Revision: 1.50 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
#include <string>
#include <iostream>
+#include <ctype.h> // for isdigit
// TODO
// a lot of troubles expected with TS : 1.2.840.113619.5.2
{
std::string filename = DictSet::BuildDictPath() + DICT_TS;
std::ifstream from(filename.c_str());
- if( !from )
+ if ( !from )
{
gdcmWarningMacro("Can't open dictionary" << filename.c_str());
FillDefaultTSDict( TsMap );
from >> std::ws;
std::getline(from, name);
- if(key != "")
+ if (key != "")
{
TsMap[key] = name;
}
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]) )
{
/**
* \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)
{
/**
* \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)
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( key == SpecialStrings[RLELossless] )
{
/**
* \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)
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( key == SpecialStrings[JPEGFullProgressionProcess10_12]
|| key == SpecialStrings[JPEGLosslessProcess14]
/**
* \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)
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( key == SpecialStrings[JPEGBaselineProcess1]
|| key == SpecialStrings[JPEGExtendedProcess2_4]
/**
* \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)
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( key == SpecialStrings[JPEG2000Lossless]
|| key == SpecialStrings[JPEG2000] )
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( IsJPEGLossy( key )
|| IsJPEGLossless( key )
+ || IsJPEG2000( key )
+ || IsJPEGLS( key )
)
{
r = true;
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( key == SpecialStrings[JPEGLSLossless]
|| key == SpecialStrings[JPEGLSNearLossless] )
{
bool r = false;
// First check this is an actual transfer syntax
- if( IsTransferSyntax(key) )
+ if ( IsTransferSyntax(key) )
{
if ( key == SpecialStrings[MPEG2MainProfile] )
{