X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmVR.cxx;h=4cc07ea90e32e005e658d7ec3aff2bee6a5d2778;hb=879f56a62d0772c95e92d0657882eb1886b4153d;hp=3fcb456cd0774173e51602ae22be8882d0a67ead;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3fcb456c..4cc07ea9 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2004/10/08 04:43:38 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -16,20 +16,19 @@
                                                                                 
 =========================================================================*/
 
-#include <fstream>
-
-#include <iostream>
-
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
 #include "gdcmDictSet.h"
 #include "gdcmDebug.h"
 
+#include <fstream>
+#include <iostream>
+
 //-----------------------------------------------------------------------------
 /**
  * \brief Constructor
  */
-gdcmVR::gdcmVR(void) 
+gdcmVR::gdcmVR() 
 {
    std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
    std::ifstream from(filename.c_str());
@@ -41,14 +40,14 @@ gdcmVR::gdcmVR(void)
 
    while (!from.eof()) 
    {
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ' ');
       key = buff;
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ';');
       name = buff;
 
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, '\n');
 
       if(key!="")
@@ -59,10 +58,12 @@ gdcmVR::gdcmVR(void)
    from.close();
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
-gdcmVR::~gdcmVR() {
+gdcmVR::~gdcmVR()
+{
    vr.clear();
 }
 
@@ -94,15 +95,22 @@ int gdcmVR::Count(gdcmVRKey key)
    return vr.count(key);
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief   Simple predicate that checks wether the given argument
  *          corresponds to the Value Representation of a \ref gdcmBinEntry .
  *          This predicate is the negation of
  *          \ref gdcmVR::IsVROfGdcmStringRepresentable .
- * @param   tested value represenation to check for.
+ * @param   tested value representation to check for.
  */
 bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
 {
+   //std::cout << "gdcmVR::IsVROfGdcmBinaryRepresentable===================="
+   //   << tested << std::endl;
+
+   if ( tested == "unkn")
+      return true;
+
    if ( ! Count(tested) )
    {
       dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
@@ -118,14 +126,16 @@ bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
    return true;
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief   Simple predicate that checks wether the given argument
  *          corresponds to the Value Representation of a \ref gdcmValEntry
  *          but NOT a \ref gdcmBinEntry.
- * @param   tested value represenation to check for.
+ * @param   tested value representation to check for.
  */
 bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
 {
+
    if ( ! Count(tested) )
    {
       dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");