Changeset 1606 for trunk/psLib/src/image/psImage.c

Timestamp:

Aug 23, 2004, 12:36:04 PM (22 years ago)

Author:

desonia

Message:

changed psImageSubset to subset an image without making a deep copy.

File:

• trunk/psLib/src/image/psImage.c (modified) (5 diffs)

trunk/psLib/src/image/psImage.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:58 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-23 22:36:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 {
     int area = 0;
-    int elementSize = PSELEMTYPE_SIZEOF(type);  // element
-
-    // size in
-    // bytes
-    int rowSize = numCols * elementSize;        // row
-
-    // size
-
-    // in bytes.
+    int elementSize = PSELEMTYPE_SIZEOF(type);  // element size in bytes
+    int rowSize = numCols * elementSize;        // row size in bytes.
 
     area = numCols * numRows;
@@ -71 +64 @@
     image->data.V = psAlloc(sizeof(void *) * numRows);
     if (image->data.V == NULL) {
+        psFree(image);
         psAbort(__func__, " : Line %d - Failed to allocate memory", __LINE__);
     }
 
-    image->data.V[0] = psAlloc(area * elementSize);
-    if (image->data.V[0] == NULL) {
+    image->rawDataBuffer = psAlloc(area * elementSize);
+    if (image->rawDataBuffer == NULL) {
+        psFree(image);
+        psFree(image->data.V);
         psAbort(__func__, " : Line %d - Failed to allocate memory", __LINE__);
     }
 
+    // set the row pointers.
+    image->data.V[0] = image->rawDataBuffer;
     for (int i = 1; i < numRows; i++) {
         image->data.V[i] = (void *)((int8_t *) image->data.V[i - 1] + rowSize);
@@ -119 +117 @@
     psImageFreeChildren(image);
 
-    psFree(image->data.V[0]);
+    psFree(image->rawDataBuffer);
     psFree(image->data.V);
     image->data.V = NULL;
@@ -167 +165 @@
     }
     // Resize the image buffer
-    old->data.V[0] = psRealloc(old->data.V[0], numCols * numRows * elementSize);
+    old->rawDataBuffer = psRealloc(old->data.V[0], numCols * numRows * elementSize);
     old->data.V = (void **)psRealloc(old->data.V, numRows * sizeof(void *));
 
     // recreate the row pointers
+    old->data.V[0] = old->rawDataBuffer;
     for (int i = 1; i < numRows; i++) {
         old->data.V[i] = (void *)((int8_t *) old->data.V[i - 1] + rowSize);