- (try to) optimize time consuming IsItemStarter() method.

- inline Isxxx methods (well, with gcc it seems not to have any effect)

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 4391cd064a62c6ca6064f94e21c294c6b8ebb970..1e7555f33c69b91937aabd067119881fccf22928 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/07/06 12:38:06 $
-  Version:   $Revision: 1.85 $
+  Date:      $Date: 2006/07/06 16:57:06 $
+  Version:   $Revision: 1.86 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -234,33 +234,6 @@ uint32_t DocEntry::GetFullLength()
    return l;
 }
 
-/**
- * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
- *          (fffe,e00d) 
- */
-bool DocEntry::IsItemDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
-}
-
-/**
- * \brief   tells us if entry is the first one of an Item 
- *          (fffe,e000) 
- */
-bool DocEntry::IsItemStarter()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe000);
-}
-
-/**
- * \brief   tells us if entry is the last one of a 'no length' Sequence 
- *          (fffe,e0dd) 
- */
-bool DocEntry::IsSequenceDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
-}
-
 /**
  * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 6d4c119f1cf9be02263670462bc9d44f9229909f..2534f3fabc6270f5f4bee35c8c0558f6812c68c4 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2006/07/06 15:06:35 $
-  Version:   $Revision: 1.65 $
+  Date:      $Date: 2006/07/06 16:57:06 $
+  Version:   $Revision: 1.66 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -136,9 +136,18 @@ public:
    /// @return true if the VM is unknown
 //   bool IsVMUnknown() const { return DicomDict->IsVMUnknown(); }
    bool IsVMUnknown() { return GetVM() == GDCM_UNKNOWN; }
-   bool IsItemDelimitor();
-   bool IsItemStarter();
-   bool IsSequenceDelimitor();   
+
+/// \brief   tells us if entry is the last one of a 'no length' SequenceItem 
+///        (fffe,e00d) 
+   bool IsItemDelimitor() 
+                      {return (GetGroup() == 0xfffe && GetElement() == 0xe00d);}
+///\brief   tells us if entry is the last one of a 'no length' Sequence 
+///         (fffe,e0dd)       
+   bool IsItemStarter(){ if (GetGroup() != 0xfffe) return false;
+                         return (GetElement() == 0xe000); }
+ /// \brief   tells us if entry is the last one of a 'no length' Sequence 
+ ///          (fffe,e0dd) 
+   bool IsSequenceDelimitor() { return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);}  
 
    virtual void Copy(DocEntry *doc);
 

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3ce163c154a88b9413ad368634f910b7b652db2c..0ac11a47c5bd720f8632ef5953547b9a8bd2897a 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/11/22 12:09:27 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2006/07/06 16:57:06 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -115,7 +115,7 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "DA" ||
           tested == "DS" ||
           tested == "FL" ||
-          tested == "FD" || 
+          tested == "FD" ||
           tested == "IS" || 
           tested == "LO" ||
           tested == "LT" ||