Fix mistypings

[gdcm.git] / src / gdcmTS.h

diff --git a/src/gdcmTS.h b/src/gdcmTS.h
index 04666918a37e4ef0514c9e720e3bccb8cd6e8032..deb30770ae3d7c3b7539b20a82146978a5ecf501 100644 (file)
--- a/src/gdcmTS.h
+++ b/src/gdcmTS.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.h,v $
   Language:  C++
-  Date:      $Date: 2005/04/22 13:37:57 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,16 +16,16 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMTS_H
-#define GDCMTS_H
+#ifndef _GDCMTS_H_
+#define _GDCMTS_H_
 
-#include "gdcmCommon.h"
+#include "gdcmRefCounter.h"
 
 #include <map>
 #include <string>
 #include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 typedef std::string TSKey;
@@ -38,36 +38,43 @@ typedef std::map<TSKey, TSAtr> TSHT;    // Transfer Syntax Hash Table
  * \brief Container for dicom 'Transfer Syntax' Hash Table
  * \note   This is a singleton
  */
-class GDCM_EXPORT TS
+class GDCM_EXPORT TS : public RefCounter
 {
+   gdcmTypeMacro(TS);
+
 public:
-enum SpecialType {
-  ImplicitVRLittleEndian = 0,
-  ImplicitVRLittleEndianDLXGE,
-  ExplicitVRLittleEndian,
-  DeflatedExplicitVRLittleEndian,
-  ExplicitVRBigEndian,
-  JPEGBaselineProcess1,
-  JPEGExtendedProcess2_4,
-  JPEGExtendedProcess3_5,
-  JPEGSpectralSelectionProcess6_8,
-  JPEGFullProgressionProcess10_12,
-  JPEGLosslessProcess14,
-  JPEGLosslessProcess14_1,
-  JPEGLSLossless,
-  JPEGLSNearLossless,
-  JPEG2000Lossless,  
-  JPEG2000,
-  RLELossless,
-  MPEG2MainProfile,  
-  UnknownTS
-};
+   enum SpecialType {
+   ImplicitVRLittleEndian = 0,
+   ImplicitVRBigEndianPrivateGE,
+   ExplicitVRLittleEndian,
+   DeflatedExplicitVRLittleEndian,
+   ExplicitVRBigEndian,
+   JPEGBaselineProcess1,
+   JPEGExtendedProcess2_4,
+   JPEGExtendedProcess3_5,
+   JPEGSpectralSelectionProcess6_8,
+   JPEGFullProgressionProcess10_12,
+   JPEGLosslessProcess14,
+   JPEGLosslessProcess14_1,
+   JPEGLSLossless,
+   JPEGLSNearLossless,
+   JPEG2000Lossless,  
+   JPEG2000,
+   RLELossless,
+   MPEG2MainProfile,
+   
+// The following are *not* Transfer Syntaxes, but SOP uid   
+   UltrasoundImageStorage_Retired,
+   
+   UnknownTS
+   };
 
 public:
-   TS();
-   ~TS();
+/// \brief Constructs a gdcmTS with a RefCounter
+   static TS *New() {return new TS();}
 
-   void Print(std::ostream &os = std::cout);
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const & = "" );
 
    int Count(TSKey const &key);
    TSAtr const &GetValue(TSKey const &key);
@@ -79,10 +86,17 @@ public:
    bool IsJPEG(TSKey const &key);
    bool IsJPEGLS(TSKey const &key);
    bool IsMPEG(TSKey const &key);
-
+   
    // This should be deprecated very soon
    SpecialType GetSpecialTransferSyntax(TSKey const &key);
    const char* GetSpecialTransferSyntax(SpecialType t);
+   
+   // The following are *not* Transfer Syntaxes.      
+   bool IsUltrasoundImageStorage_Retired(TSKey const &key);
+  
+protected:
+   TS();
+   ~TS();
 
 private:
    TSHT TsMap;