- Avoid useless creation of std::string

- Avoid loosing time with std::string comparisons

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 36aa38e2af16e073d6adbf3d38d34f9a11dd053c..5bdfe968afebd336c100987a906cd635fa7bd524 100644 (file)
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/07/04 09:36:18 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2006/07/10 08:27:27 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,9 +26,9 @@
 #include <fstream>
 
 #if defined(__BORLANDC__)
- #include <mem.h> // for memcpy
+ #include <mem.h>    // for memcpy
  #include <stdlib.h> // for atof
- #include <ctype.h> // for isdigit
+ #include <ctype.h>  // for isdigit
 #endif
 
 namespace gdcm 
@@ -52,6 +52,7 @@ DataEntry::DataEntry(uint16_t group,uint16_t elem,
    State = STATE_LOADED;
    Flag = FLAG_NONE;
 
+   StrArea = 0;
    BinArea = 0;
    SelfArea = true;
 }
@@ -66,6 +67,7 @@ DataEntry::DataEntry(DocEntry *e)
 {
    Flag = FLAG_NONE;
    BinArea = 0;
+   
    SelfArea = true;
 
    Copy(e);
@@ -77,6 +79,7 @@ DataEntry::DataEntry(DocEntry *e)
 DataEntry::~DataEntry ()
 {
    DeleteBinArea();
+   
 }
 
 //-----------------------------------------------------------------------------
@@ -437,10 +440,14 @@ std::string const &DataEntry::GetString() const
   static std::ostringstream s;
   const VRKey &vr = GetVR();
   s.str("");
-  StrArea="";
+  
+  if (!StrArea)
+     StrArea = new std::string();
+  else 
+     *StrArea="";
 
   if( !BinArea )
-     return StrArea;
+     return *StrArea;
       // When short integer(s) are stored, convert the following (n * 2) characters
   // as a displayable string, the values being separated by a back-slash
   if( vr == "US" )
@@ -452,7 +459,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else if (vr == "SS" )
   {
@@ -463,7 +470,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }      // See above comment on multiple short integers (mutatis mutandis).
   else if( vr == "UL" )
   {
@@ -474,7 +481,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else if( vr == "SL" )
   {
@@ -485,7 +492,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }    else if( vr == "FL" )
   {
      float *data=(float *)BinArea;
@@ -495,7 +502,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else if( vr == "FD" )
   {
@@ -506,22 +513,22 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else
   {
-     StrArea.append((const char *)BinArea,GetLength());
+     StrArea->append((const char *)BinArea,GetLength());
      // to avoid gdcm to propagate oddities in lengthes
      if ( GetLength()%2)
-        StrArea.append(" ",1);   }
-  return StrArea;
+        StrArea->append(" ",1);   }
+  return *StrArea;
 }
 
 
 /**
  * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
- * @remarks The content BinArea is copied too
+ * @remarks The content BinArea is copied too (StrArea is not)
  */
 void DataEntry::Copy(DocEntry *doc)
 {
@@ -532,7 +539,7 @@ void DataEntry::Copy(DocEntry *doc)
    {
       State = entry->State;
       Flag = entry->Flag;
-      CopyBinArea(entry->BinArea,entry->GetLength());
+      CopyBinArea(entry->BinArea,entry->GetLength());      
    }
 }
 
@@ -644,7 +651,8 @@ uint32_t DataEntry::ComputeFullLength()
 
 //-----------------------------------------------------------------------------
 // Protected
-/// \brief Creates a DataEntry owned BinArea (remove previous one if any)
+/// \brief Creates a DataEntry owned BinArea 
+///       (remove previous one if any and relevant StrArea if any)
 void DataEntry::NewBinArea( )
 {
    DeleteBinArea();
@@ -652,7 +660,8 @@ void DataEntry::NewBinArea( )
       BinArea = new uint8_t[GetLength()];
    SelfArea = true;
 }
-/// \brief Removes the BinArea, if owned by the DataEntry
+/// \brief Removes the BinArea, if owned by the DataEntry, 
+///        and the relevant StrArea if any
 void DataEntry::DeleteBinArea(void)
 {
    if (BinArea && SelfArea)
@@ -660,6 +669,11 @@ void DataEntry::DeleteBinArea(void)
       delete[] BinArea;
       BinArea = NULL;
    }
+   if (StrArea)
+   {
+      delete StrArea;
+      StrArea = 0;
+   }
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmDataEntry.h b/src/gdcmDataEntry.h
index 1b9aba72dc86437a185a52ff689a6a7effd6d1e6..0a891f5eff3ff858c5ad347e440a63abeb11f6c2 100644 (file)
--- a/src/gdcmDataEntry.h
+++ b/src/gdcmDataEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.h,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2006/07/10 08:27:28 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -144,7 +144,8 @@ protected:
    bool SelfArea;
    /// \brief  std::string representable value of the Entry. 
    ///        Parts of a multivaluated data are separated by back-slash
-   mutable std::string StrArea;
+   //mutable std::string StrArea;
+   mutable std::string *StrArea; // to avoid allocating useless std::string
 
 private:
    /// \brief 0 for straight entries, FLAG_PIXELDATA for Pixel Data entries

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 0ac11a47c5bd720f8632ef5953547b9a8bd2897a..f553919142c66e4467eb75fb05e8892580294706 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: 2006/07/06 16:57:06 $
-  Version:   $Revision: 1.50 $
+  Date:      $Date: 2006/07/10 08:27:27 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,6 +71,7 @@ VR::VR()
       }
       from.close();
    }
+   char *VRvalues = "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
 }
 
 /**
@@ -108,7 +109,6 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
  */
 bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
-
    return tested == "AE" ||
           tested == "AS" ||
           tested == "CS" ||
@@ -170,7 +170,18 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested)
 /// \brief checks is a supposed-to-be VR is a 'legal' one.
 bool VR::IsValidVR(VRKey const &key)
 {
-  return vr.find(key) != vr.end();
+//  return vr.find(key) != vr.end();
+
+  int nbVal=26;
+  char *pt = VRvalues;
+  for (int i=0;i<nbVal;i++)
+  {
+     if(tested[0] == *pt++)
+       if(tested[1] == *pt++)
+          return true;       
+  }
+  return false;
+
 }
 #endif
 

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index b08a5ba4bf3ecf1a131cbb260d967526bcae32b4..0799cd4f4c41a8dabbe4504ecb549336af3b0279 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/11/29 17:10:12 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2006/07/10 08:27:28 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -75,6 +75,7 @@ protected:
 
 private:
    VRHT vr;
+   static char *VRvalues;
 };
 } // end namespace gdcm