Index: /branches/eam_branches/20091201/psLib/src/imageops/psImageInterpolate.c
===================================================================
--- /branches/eam_branches/20091201/psLib/src/imageops/psImageInterpolate.c	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/imageops/psImageInterpolate.c	(revision 26504)
@@ -197,10 +197,10 @@
 {
     // 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);
 }
 
Index: /branches/eam_branches/20091201/psLib/src/math/psBinaryOp.c
===================================================================
--- /branches/eam_branches/20091201/psLib/src/math/psBinaryOp.c	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/math/psBinaryOp.c	(revision 26504)
@@ -379,5 +379,5 @@
 }
 
-psMathType* psBinaryOp(psPtr out, const psPtr in1, const char *op, const psPtr in2)
+psMathType* psBinaryOp(psPtr out, psPtr in1, const char *op, psPtr in2)
 {
 
Index: /branches/eam_branches/20091201/psLib/src/math/psBinaryOp.h
===================================================================
--- /branches/eam_branches/20091201/psLib/src/math/psBinaryOp.h	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/math/psBinaryOp.h	(revision 26504)
@@ -55,7 +55,7 @@
 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.
 );
 
Index: /branches/eam_branches/20091201/psLib/src/math/psHistogram.c
===================================================================
--- /branches/eam_branches/20091201/psLib/src/math/psHistogram.c	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/math/psHistogram.c	(revision 26504)
@@ -127,5 +127,5 @@
 static void histogramFree(psHistogram* myHist)
 {
-    psFree((void *)myHist->bounds);
+    psFree(myHist->bounds);
     psFree(myHist->nums);
 }
Index: /branches/eam_branches/20091201/psLib/src/math/psUnaryOp.c
===================================================================
--- /branches/eam_branches/20091201/psLib/src/math/psUnaryOp.c	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/math/psUnaryOp.c	(revision 26504)
@@ -211,5 +211,5 @@
 }
 
-psMathType* psUnaryOp(psPtr out, const psPtr in, const char *op)
+psMathType* psUnaryOp(psPtr out, psPtr in, const char *op)
 {
     #define psUnaryOp_EXIT { \
Index: /branches/eam_branches/20091201/psLib/src/math/psUnaryOp.h
===================================================================
--- /branches/eam_branches/20091201/psLib/src/math/psUnaryOp.h	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/math/psUnaryOp.h	(revision 26504)
@@ -59,5 +59,5 @@
 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.
 );
Index: /branches/eam_branches/20091201/psLib/src/sys/psMemory.h
===================================================================
--- /branches/eam_branches/20091201/psLib/src/sys/psMemory.h	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/sys/psMemory.h	(revision 26504)
@@ -336,5 +336,5 @@
 #ifndef SWIG
 #define psFree(ptr) \
-        psMemDecrRefCounter(ptr)
+    ptr = psMemDecrRefCounter((void *)ptr);
 #endif // ifndef SWIG
 #endif // ifdef DOXYGEN
Index: /branches/eam_branches/20091201/psLib/src/sys/psTrace.c
===================================================================
--- /branches/eam_branches/20091201/psLib/src/sys/psTrace.c	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/sys/psTrace.c	(revision 26504)
@@ -119,5 +119,5 @@
 
     psMemSetPersistent((psPtr)comp->name,false);
-    psFree((void *)comp->name);
+    psFree(comp->name);
 }
 
Index: /branches/eam_branches/20091201/psLib/src/types/psArray.c
===================================================================
--- /branches/eam_branches/20091201/psLib/src/types/psArray.c	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/types/psArray.c	(revision 26504)
@@ -166,5 +166,5 @@
 // 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);
Index: /branches/eam_branches/20091201/psLib/src/types/psArray.h
===================================================================
--- /branches/eam_branches/20091201/psLib/src/types/psArray.h	(revision 26503)
+++ /branches/eam_branches/20091201/psLib/src/types/psArray.h	(revision 26504)
@@ -186,5 +186,5 @@
 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
 );