Comments: It shouldn't be too difficult to 'manualy' ask memory merging

[gdcm.git] / src / gdcmTS.cxx

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 256758b92dc1b7a2c07b0f14428a7f25bef02901..4641bc8dacb56a260ba0169c042f76198e3fcf2e 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/09 21:14:43 $
-  Version:   $Revision: 1.47 $
+  Date:      $Date: 2005/07/02 18:09:36 $
+  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
@@ -24,6 +24,7 @@
 #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
@@ -88,7 +89,7 @@ TS::TS()
 {
    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 );
@@ -104,7 +105,7 @@ TS::TS()
          from >> std::ws;
          std::getline(from, name);
 
-         if(key != "")
+         if (key != "")
          {
             TsMap[key] = name;
          }
@@ -167,7 +168,7 @@ 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] )
       {
@@ -187,7 +188,7 @@ 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]
@@ -209,7 +210,7 @@ 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]
@@ -232,7 +233,7 @@ 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] )
@@ -252,7 +253,7 @@ bool TS::IsJPEG(TSKey const &key)
 {
    bool r = false;
    // First check this is an actual transfer syntax
-   if( IsTransferSyntax(key) )
+   if ( IsTransferSyntax(key) )
    {
       if ( IsJPEGLossy( key )
         || IsJPEGLossless( key )
@@ -275,7 +276,7 @@ bool TS::IsJPEGLS(TSKey const &key)
 {
    bool r = false;
    // First check this is an actual transfer syntax
-   if( IsTransferSyntax(key) )
+   if ( IsTransferSyntax(key) )
    {
       if ( key == SpecialStrings[JPEGLSLossless]
         || key == SpecialStrings[JPEGLSNearLossless] ) 
@@ -295,7 +296,7 @@ bool TS::IsMPEG(TSKey const &key)
 {
    bool r = false;
    // First check this is an actual transfer syntax
-   if( IsTransferSyntax(key) )
+   if ( IsTransferSyntax(key) )
    {
       if ( key == SpecialStrings[MPEG2MainProfile] ) 
       {