X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=bc2b6c2f581a11586529e463ed6db2a0f38fc2b2;hb=80dc5ecf0d3915f6c2a5505a540ff14957e07cc5;hp=83a8290587024a25345066f11c6f72b20bd9705f;hpb=9ca0e4bb2208be93bebf21d0c5d75c8018e7605a;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 83a82905..bc2b6c2f 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/06/24 10:55:59 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/12/09 12:23:39 $
+  Version:   $Revision: 1.53 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,12 +24,17 @@
 #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
+// troubles expected with TS : 1.2.840.113619.5.2
 // Implicit VR - Big Endian
 // http://www.gemedicalsystemseurope.com/euen/it_solutions/pdf/lsqxi_rev2.pdf
-// 
+// G.E. deliberately violated a lot of Dicom rules are
+// (probabely to to avoid other people to read their images)
+// Just try and error on new images :
+// PrintFile debug filein=...
+// and fix the bugs
 
 namespace gdcm 
 {
@@ -38,7 +43,7 @@ namespace gdcm
 static const char *SpecialStrings[] =  {
   // Implicit VR Little Endian
   "1.2.840.10008.1.2",
-  // Implicit VR Big Endian DLX (G.E Private)
+  // Implicit VR Big Endian (G.E Private)
   "1.2.840.113619.5.2",
   // Explicit VR Little Endian
   "1.2.840.10008.1.2.1",
@@ -74,7 +79,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
 };
 
 //-----------------------------------------------------------------------------
@@ -127,11 +133,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]) )
    {
@@ -148,8 +154,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)
 {
@@ -160,8 +166,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)
 {
@@ -180,8 +186,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)
 {
@@ -202,8 +208,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)
 {
@@ -225,8 +231,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)
 {
@@ -344,7 +350,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;