Inline some methods, to speed gdcm up.

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3e461697ba8c319de06d5007c58d3f486dcc807a..f42fec4184e1698f187fb926fe7a61fe7c94cd8c 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/06/24 10:55:59 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/09/06 15:36:02 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -82,14 +82,6 @@ VR::~VR()
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   Get the count for an element
- * @param   key key to count
- */
-int VR::Count(VRKey const &key) 
-{
-   return vr.count(key);
-}
 
 /**
  * \brief   Simple predicate that checks whether the given argument
@@ -98,8 +90,12 @@ int VR::Count(VRKey const &key)
  */
 bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   if ( tested == GDCM_UNKNOWN)
-      return true;
+   //if ( tested == GDCM_UNKNOWN)
+   //{
+   //std::cout << "---------- never used --------------" << tested 
+   //          << std::endl;
+   //   return true;
+   //}
 
    if ( IsVROfStringRepresentable(tested) )
       return false;
@@ -118,6 +114,8 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
+
+/*
    return tested == "AE" ||
           tested == "AS" ||
           tested == "CS" ||
@@ -134,23 +132,17 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "TM" ||
           tested == "UI" ||
           tested == "UL" ||
-          tested == "UN" ||
-          tested == "US";
-}
+          tested == "US" ||
+          tested == "UT";
+*/
+   // Should be quicker 
 
-/**
- * \brief   Simple predicate that checks whether the given argument
- *          corresponds to the Value Representation of a \ref SeqEntry
- * @param   tested value representation to check for.
- */
-bool VR::IsVROfSequence(VRKey const &tested)
-{
-   return tested == "SQ";
-}
+   return tested != "FL" &&
+          tested != "FD" &&
+          tested != "OB" &&
+          tested != "OW" &&
+          tested != "SQ" ;
 
-bool VR::IsValidVR(VRKey const &key)
-{
-   return vr.find(key) != vr.end();
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 1b4af5611dcc34ab95d61a7eb731bdbc991a54ba..118ad3d8bdec874378ecd5f17424de3007696da9 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/09/06 15:36:03 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -46,12 +46,17 @@ public:
 
    void Print(std::ostream &os = std::cout);
 
-   int Count(VRKey const &key);
+   /// \brief   Get the count for an element
+   int Count(VRKey const &key) { return vr.count(key); };
+
    bool IsVROfBinaryRepresentable(VRKey const &tested);
    bool IsVROfStringRepresentable(VRKey const &tested);
-   bool IsVROfSequence(VRKey const &tested);
 
-   bool IsValidVR(VRKey const &key);
+   /// \brief   Simple predicate that checks whether the given argument
+   ///          corresponds to the Value Representation of a \ref SeqEntry
+   bool IsVROfSequence(VRKey const &tested) { return tested == "SQ"; }
+
+   bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
 
 private:
    VRHT vr;