Changeset 15454 for trunk/psLib/src/mathtypes

Timestamp:

Nov 5, 2007, 1:42:46 PM (19 years ago)

Author:

Paul Price

Message:

Propagating allocation information, so leaks can be tracked down easier.

File:

• trunk/psLib/src/mathtypes/psImage.c (modified) (3 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.130 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-20 23:48:30 $
+ *  @version $Revision: 1.131 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-05 23:42:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
     // if I am a child, remove me from my parent's array of children
     if (parent != NULL) {
-        // sanity check : a child cannot also be a parent
-        if ((image->children != NULL) && (image->children->n > 0)) {
-            psAbort ("psImage cannot be both child and parent!");
-        }
-
-        // break the back-pointer first so we don't loop
-        image->parent = NULL; 
-
-        // drop my entry on my parent's array of children
-        psArrayRemoveDataNoFree (parent->children, image); 
-        
-        // drop my reference to my parent
-        psFree (parent);
-    }
-    
+        // sanity check : a child cannot also be a parent
+        if ((image->children != NULL) && (image->children->n > 0)) {
+            psAbort ("psImage cannot be both child and parent!");
+        }
+
+        // break the back-pointer first so we don't loop
+        image->parent = NULL;
+
+        // drop my entry on my parent's array of children
+        psArrayRemoveDataNoFree (parent->children, image);
+
+        // drop my reference to my parent
+        psFree (parent);
+    }
+
     // sanity check: this function should never be reached if an image still has live children;
     // they should each be holding a pointer to the image, forcing the number of references to
     // be > 1.
     if (image->children && (image->children->n > 0)) {
-        psAbort ("psImage memory management programming error : imageFree called on image with live children");
+        psAbort ("psImage memory management programming error : imageFree called on image with live children");
     }
 
@@ -100 +100 @@
     psMemSetDeallocator(image, (psFreeFunc) imageFree);
 
-    image->data.V = psAlloc(sizeof(psPtr ) * numRows);
-
-    image->p_rawDataBuffer = psAlloc(numBytes);
+    image->data.V = p_psAlloc(file, lineno, func, sizeof(psPtr ) * numRows);
+
+    image->p_rawDataBuffer = p_psAlloc(file, lineno, func, numBytes);
 
     // set the row pointers.