* src/gdcmDocument.cxx: FIX ::ComputeRLEInfo() rleSegmentOffsetTable[]

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index b45fbbb667d92a5066785bf53ad748a3d5360a50..22e54fc60198393f2d36066295eeaaba54dbc72f 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: 2004/10/12 04:35:48 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/11/16 14:48:19 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,39 +26,45 @@
 
 namespace gdcm 
 {
-
+void FillDefaultVRDict(VRHT & vr);
 //-----------------------------------------------------------------------------
 /**
  * \brief Constructor
  */
 VR::VR() 
 {
-   std::string filename=DictSet::BuildDictPath() + std::string(DICT_VR);
+   std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "VR::VR: can't open dictionary",filename.c_str());
-
-   char buff[1024];
-   std::string key;
-   std::string name;
-
-   while (!from.eof()) 
+   if(!from)
    {
-      from >> std::ws; // used to be eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
-      from >> std::ws; // used to be eatwhite(from);
-      from.getline(buff, 1024, ';');
-      name = buff;
-
-      from >> std::ws; // used to be eatwhite(from);
-      from.getline(buff, 1024, '\n');
-
-      if(key!="")
+      dbg.Verbose(2, "VR::VR: can't open dictionary", filename.c_str());
+      FillDefaultVRDict(vr);
+   }
+   else
+   {
+      char buff[1024];
+      VRKey key;
+      VRAtr name;
+   
+      while (!from.eof()) 
       {
-         vr[key]=name;
+         from >> std::ws;
+         from.getline(buff, 1024, ' ');
+         key = buff;
+         from >> std::ws;
+         from.getline(buff, 1024, ';');
+         name = buff;
+   
+         from >> std::ws;
+         from.getline(buff, 1024, '\n');
+   
+         if(key != "")
+         {
+            vr[key] = name;
+         }
       }
+      from.close();
    }
-   from.close();
 }
 
 //-----------------------------------------------------------------------------
@@ -82,7 +88,7 @@ void VR::Print(std::ostream &os)
 
    for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
    {
-      s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
+      s << "VR : " << it->first << " = " << it->second << std::endl;
    }
    os << s.str();
 }
@@ -93,7 +99,7 @@ void VR::Print(std::ostream &os)
  * \brief   Get the count for an element
  * @param   key key to count
  */
-int VR::Count(VRKey key) 
+int VR::Count(VRKey const & key) 
 {
    return vr.count(key);
 }
@@ -106,7 +112,7 @@ int VR::Count(VRKey key)
  *          \ref VR::IsVROfGdcmStringRepresentable .
  * @param   tested value representation to check for.
  */
-bool VR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested)
 {
    //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
    //   << tested << std::endl;
@@ -136,7 +142,7 @@ bool VR::IsVROfGdcmBinaryRepresentable(VRKey tested)
  *          but NOT a \ref BinEntry.
  * @param   tested value representation to check for.
  */
-bool VR::IsVROfGdcmStringRepresentable(VRKey tested)
+bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
 {
 
    if ( ! Count(tested) )
@@ -145,11 +151,24 @@ bool VR::IsVROfGdcmStringRepresentable(VRKey tested)
       return false;
    }
 
-   if (tested == "AE" || tested == "AS" || tested == "DA" || tested == "PN" ||
-       tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
-       tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
-       tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
-       tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
+   if ( tested == "AE" ||
+        tested == "AS" ||
+        tested == "CS" ||
+        tested == "DA" ||
+        tested == "DS" ||
+        tested == "IS" || 
+        tested == "LO" ||
+        tested == "LT" ||
+        tested == "PN" ||
+        tested == "SH" ||
+        tested == "SL" ||
+        tested == "SS" ||
+        tested == "ST" ||
+        tested == "TM" ||
+        tested == "UI" ||
+        tested == "UL" ||
+        tested == "UN" ||
+        tested == "US" )
    {
       return true;
    }