STYLE: A Debug statement is not a warning, a warning is not an error.. you get the...

[gdcm.git] / src / gdcmDictEntry.cxx

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index a56a454b93c3111c0d902e2d38eeae6c0c5dcef5..ed1052af3d9bd019dfb0f02ab742bd4bc3c34c78 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 14:00:03 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2005/10/18 12:58:27 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@ namespace gdcm
 */
 
 DictEntry::DictEntry(uint16_t group, uint16_t elem,
-                     TagName const &vr, 
+                     VRKey const &vr, 
                      TagName const &vm,
                      TagName const &name)
 {
@@ -57,7 +57,7 @@ DictEntry::DictEntry(uint16_t group, uint16_t elem,
  * \            is unset then overwrite it.
  * @param vr    New V(alue) R(epresentation) to be set.
  */
-void DictEntry::SetVR(TagName const &vr) 
+void DictEntry::SetVR(VRKey const &vr) 
 {
    if ( IsVRUnknown() )
    {
@@ -100,9 +100,16 @@ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
    // Let's try to shorten it !
  
    //return Util::Format("%04x|%04x", group, elem); // too much time !
+#if FASTTAGKEY
+   TagKey r;
+   r.tab[0] = group;
+   r.tab[1] = elem;
+   return r;
+#else
    char res[10];
    sprintf(res,"%04x|%04x", group, elem);
    return res;
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -120,17 +127,17 @@ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
  */
 void DictEntry::Print(std::ostream &os, std::string const & )
 {
-   std::string vr;
+   VRKey vr;
    std::ostringstream s;
 
    vr = GetVR();
-   if(vr==GDCM_UNKNOWN)
+   if ( IsVRUnknown() )
       vr="  ";
 
    s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
    s << " [" << vr  << "] ";
 
-   if (PrintLevel >= 1)
+   if ( PrintLevel >= 1 )
    {
       s.setf(std::ios::left);
       s << std::setw(66-GetName().length()) << " ";