Fix trouble with BCC

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 75dca7bb91f2bcaf56072a096c7433fc764a31bb..3ce163c154a88b9413ad368634f910b7b652db2c 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/20 14:25:47 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/11/22 12:09:27 $
+  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
@@ -23,6 +23,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <string.h>
 
 namespace gdcm 
 {
@@ -42,7 +43,7 @@ VR::VR()
    std::ifstream from(filename.c_str());
    if ( !from )
    {
-      gdcmWarningMacro("Can't open dictionary" << filename.c_str());
+      gdcmWarningMacro("Can't open dictionary " << filename.c_str());
       FillDefaultVRDict(vr);
    }
    else
@@ -55,6 +56,9 @@ VR::VR()
       {
          from >> std::ws;
          from.getline(buff, 1024, ' ');
+         if( strcmp(buff,"") == 0)
+            continue;
+
          key = buff;
          from >> std::ws;
          from.getline(buff, 1024, ';');
@@ -63,10 +67,7 @@ VR::VR()
          from >> std::ws;
          from.getline(buff, 1024, '\n');
    
-         if ( key != "" )
-         {
-            vr[key] = name;
-         }
+         vr[key] = name;
       }
       from.close();
    }
@@ -90,13 +91,6 @@ VR::~VR()
  */
 bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   //if ( tested == GDCM_UNKNOWN)
-   //{
-   //std::cout << "---------- never used --------------" << tested 
-   //          << std::endl;
-   //   return true;
-   //}
-
    if ( IsVROfStringRepresentable(tested) )
       return false;
 
@@ -108,17 +102,20 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 
 /**
  * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a representable
- *          string.
+ *          corresponds to the Value Representation of a
+ *          'std::string representable' value.
  * @param   tested value representation to be checked.
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
+
    return tested == "AE" ||
           tested == "AS" ||
           tested == "CS" ||
           tested == "DA" ||
           tested == "DS" ||
+          tested == "FL" ||
+          tested == "FD" || 
           tested == "IS" || 
           tested == "LO" ||
           tested == "LT" ||
@@ -133,17 +130,18 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "US" ||
           tested == "UT";
 
-   // Should be quicker --> But it doesn't work : revert to old code
+   // Should be quicker
+   // --> will *never* work : any rotten value would be considered as OK !
 /*
-   return tested != "FL" &&
-          tested != "FD" &&
-          tested != "OB" &&
+   return tested != "OB" &&
           tested != "OW" &&
-          tested != "AT" && // Attribute Tag ?!?
+          tested != "OF" &&
+          tested != "AT" && // Attribute Tag ?!? contain no printable character
+          tested != "UN" && // UN is an actual VR !
           tested != "SQ" ;
 */
 }
-
+/// \brief returns the length of a elementary elem whose VR is passed
 unsigned short VR::GetAtomicElementLength(VRKey const &tested)
 {
    // Unsigned & signed short
@@ -161,9 +159,21 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested)
    // Word string
    if( tested == "OW" )
       return 2;
+   // Float string
+   if( tested == "OF" )
+      return 4;   
    return 1;
 }
 
+// VS6 need a single implementation in the dll
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
+/// \brief checks is a supposed-to-be VR is a 'legal' one.
+bool VR::IsValidVR(VRKey const &key)
+{
+  return vr.find(key) != vr.end();
+}
+#endif
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -176,7 +186,7 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested)
  * \brief   Print all 
  * @param   os The output stream to be written to.
  */
-void VR::Print(std::ostream &os) 
+void VR::Print(std::ostream &os,std::string const &) 
 {
    for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
    {