Changeset 13825 for trunk

Timestamp:

05/23/12 10:30:21 (13 years ago)

Author:

tbretz

Message:

Fixed the size of the FEEDBACK/DEVIATION and fixed a warning of mixed delete / delete [] by valgrind

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -1254 +1254 @@
         }
 
-        delete fEventData;
+        delete [] reinterpret_cast<char*>(fEventData);
         fEventData = reinterpret_cast<EVENT*>(new char[d.size()]);
         memcpy(fEventData, d.ptr<void>(), d.size());
@@ -2276 +2276 @@
     void handleFeedbackDeviation(const DimData &d)
     {
-        if (!CheckSize(d, 2*416*sizeof(float)+2))
+        if (!CheckSize(d, (2*416+2)*sizeof(float)))
             return;
 
@@ -4243 +4243 @@
             delete i->second;
 
-        delete fEventData;
+        // This is allocated as a chuck of chars
+        delete [] reinterpret_cast<char*>(fEventData);
     }
 };