Changeset 26504

Timestamp:

Jan 4, 2010, 10:02:37 AM (16 years ago)

Author:

eugene

Message:

on free (not just decrement), set the pointer to NULL in the psFree macro; cast the pointer supplied to psFree to (void *) in case we are supplied a const pointer; in cases where we were casting away a const to pass it to psFree, drop this cast (it breaks the assignement code); change the arguments for several functions where parameter is claimed as const, but is not really const (ie, it may be freed)

Location:

branches/eam_branches/20091201/psLib/src

Files:

• imageops/psImageInterpolate.c (modified) (1 diff)
• math/psBinaryOp.c (modified) (1 diff)
• math/psBinaryOp.h (modified) (1 diff)
• math/psHistogram.c (modified) (1 diff)
• math/psUnaryOp.c (modified) (1 diff)
• math/psUnaryOp.h (modified) (1 diff)
• sys/psMemory.h (modified) (1 diff)
• sys/psTrace.c (modified) (1 diff)
• types/psArray.c (modified) (1 diff)
• types/psArray.h (modified) (1 diff)

branches/eam_branches/20091201/psLib/src/imageops/psImageInterpolate.c

@@ -197 +197 @@
 {
     // Casting away const
-    psFree((psImage*)interp->image);
-    psFree((psImage*)interp->mask);
-    psFree((psImage*)interp->variance);
-    psFree((psImage*)interp->kernel);
-    psFree((psImage*)interp->kernel2);
-    psFree((psVector*)interp->sumKernel2);
+    psFree(interp->image);
+    psFree(interp->mask);
+    psFree(interp->variance);
+    psFree(interp->kernel);
+    psFree(interp->kernel2);
+    psFree(interp->sumKernel2);
 }
 

branches/eam_branches/20091201/psLib/src/math/psBinaryOp.c

@@ -379 +379 @@
 }
 
-psMathType* psBinaryOp(psPtr out, const psPtr in1, const char *op, const psPtr in2)
+psMathType* psBinaryOp(psPtr out, psPtr in1, const char *op, psPtr in2)
 {
 

branches/eam_branches/20091201/psLib/src/math/psBinaryOp.h

@@ -55 +55 @@
 psMathType* psBinaryOp(
     psPtr out,                         ///< Output type, either psImage or psVector.
-    const psPtr in1,                   ///< First input, either psImage or psVector.
+    psPtr in1,                   ///< First input, either psImage or psVector.
     const char *op,                    ///< Operator.
-    const psPtr in2                    ///< Second input, either psImage or psVector.
+    psPtr in2                    ///< Second input, either psImage or psVector.
 );
 

branches/eam_branches/20091201/psLib/src/math/psHistogram.c

@@ -127 +127 @@
 static void histogramFree(psHistogram* myHist)
 {
-    psFree((void *)myHist->bounds);
+    psFree(myHist->bounds);
     psFree(myHist->nums);
 }

branches/eam_branches/20091201/psLib/src/math/psUnaryOp.c

@@ -211 +211 @@
 }
 
-psMathType* psUnaryOp(psPtr out, const psPtr in, const char *op)
+psMathType* psUnaryOp(psPtr out, psPtr in, const char *op)
 {
     #define psUnaryOp_EXIT { \

branches/eam_branches/20091201/psLib/src/math/psUnaryOp.h

@@ -59 +59 @@
 psMathType* psUnaryOp(
     psPtr out,                         ///< Output type, either psImage or psVector.
-    const psPtr in,                    ///< Input, either psImage or psVector.
+    psPtr in,                          ///< Input, either psImage or psVector.
     const char *op                     ///< Operator.
 );

branches/eam_branches/20091201/psLib/src/sys/psMemory.h

@@ -336 +336 @@
 #ifndef SWIG
 #define psFree(ptr) \
-        psMemDecrRefCounter(ptr)
+    ptr = psMemDecrRefCounter((void *)ptr);
 #endif // ifndef SWIG
 #endif // ifdef DOXYGEN

branches/eam_branches/20091201/psLib/src/sys/psTrace.c

@@ -119 +119 @@
 
     psMemSetPersistent((psPtr)comp->name,false);
-    psFree((void *)comp->name);
+    psFree(comp->name);
 }
 

branches/eam_branches/20091201/psLib/src/types/psArray.c

@@ -166 +166 @@
 // drop an item from the array and free it
 bool psArrayRemoveData(psArray* array,
-                       const psPtr data)
+                       psPtr data)
 {
     PS_ASSERT_ARRAY_NON_NULL(array, false);

branches/eam_branches/20091201/psLib/src/types/psArray.h

@@ -186 +186 @@
 bool psArrayRemoveData(
     psArray* array,                    ///< array to operate on
-    const psPtr data                   ///< the data pointer to remove from psArray
+    psPtr data                         ///< the data pointer to remove from psArray
 );