Changeset 1786 for GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

Timestamp:

11/24/06 00:24:41 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -407 +407 @@
 void Pvs<T, S>::MergeInPlace(const Pvs<T, S> &a)
 {
+        // early exit
+        if (a.Empty())
+        {
+                return;
+        }
+        else if (Empty())
+        {
+                mEntries.reserve(a.GetSize());
+                mEntries = a.mEntries;
+                mSamples = a.mSamples;
+                return;
+        }
+
         ObjectPvs interPvs;
         
@@ -467 +480 @@
         mEntries.clear();
         mSamples = 0;
-        vector<PvsEntry<T,S> >().swap(mEntries);
+
+        if (trim)
+        {
+                vector<PvsEntry<T,S> >().swap(mEntries);
+        }
 }
 
@@ -473 +490 @@
 template <typename T, typename S> void Pvs<T, S>::Trim()
 {
-        vector<PvsEntry<T,S> >(mEntries).swap(mEntries);//trim vi
+        vector<PvsEntry<T,S> >(mEntries).swap(mEntries);
 }