Changeset 14904

Timestamp:

Sep 20, 2007, 9:14:51 AM (19 years ago)

Author:

magnier

Message:

fix memory management of parents and children -- inc ref counter on pointer from child to parent

File:

• branches/eam_branch_20070830/psLib/src/imageops/psImageStructManip.c (modified) (7 diffs)

branches/eam_branch_20070830/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-16 02:51:09 $
+ *  @version $Revision: 1.17.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-20 19:14:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 
 #include "psMemory.h"
+#include "psError.h"
+#include "psAbort.h"
+
 #include "psImageStructManip.h"
-#include "psError.h"
-
 
 // col0,row0 are the starting pixel in the input image coordinate frame
@@ -98 +99 @@
     if (out != NULL) {
         // if a child, need to orphan (disassociate from parent) first
-        if (out->parent != NULL) {
-            psArrayRemoveData(out->parent->children,psMemIncrRefCounter(out));
-            // remove from parent's knowledge without triggering a free
-            out->parent = NULL; // break link to parent
+        psImage *parent = (psImage *) out->parent;
+        if (parent != NULL) {
+            // break the back-pointer first so we don't loop
+            out->parent = NULL;
+
+            // drop my entry on my parent's array of children
+            psArrayRemoveDataNoFree (out->parent->children, out);
+
+            // drop my reference to my old parent
+            psFree (parent);
         }
 
+        // we recycle out->data.V
         psFree(out->p_rawDataBuffer); // free the previous data reference
     } else {
@@ -117 +125 @@
     P_PSIMAGE_SET_ROW0(out, row0);
 
-    out->parent = image;
+    out->parent = psMemIncrRefCounter(image); // track references to parents
     out->children = NULL;
     out->p_rawDataBuffer = rawData;
@@ -133 +141 @@
 
     // add output image as a child of the input image.
-    image->children = psArrayAdd(image->children,16,out);
-    psMemDecrRefCounter(out); // don't count the reference held by parent as a true reference
+    image->children = psArrayAdd (image->children, 16, out);
+    psFree (out); // the image->children array is an array of views only
 
     return (out);
@@ -307 +315 @@
                 _("Can not operate on a NULL psImage."));
         return NULL;
+    }
+
+    if ((image->children != NULL) && (image->children->n > 0)) {
+        psAbort ("cannot trim an image with outstanding children");
     }
 
@@ -345 +357 @@
     }
 
-    psImageFreeChildren(image);
-
     psU32 elementSize = PSELEMTYPE_SIZEOF(image->type.type);
     psU32 numCols = col1-col0;