Changeset 3309 for trunk/psLib/src/image/psImageStats.c

Timestamp:

Feb 23, 2005, 11:32:40 AM (21 years ago)

Author:

desonia

Message:

added support in psImageStats for subset images.

File:

• trunk/psLib/src/image/psImageStats.c (modified) (2 diffs)

trunk/psLib/src/image/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-22 20:06:24 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-23 21:32:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -130 +130 @@
     psVector* junkMask = NULL;
 
-    junkData = psAlloc(sizeof(psVector));
-    junkData->type = in->type;
-    junkData->nalloc = in->numRows * in->numCols;
-    junkData->n = junkData->nalloc;
-    junkData->data.V = in->data.V[0];  // since psImage data is contiguous...
+    if (in->parent == NULL) {
+        // stuff the image data into a psVector struct.
+        junkData = (psVector *) psAlloc(sizeof(psVector));
+        junkData->type = in->type;
+        junkData->nalloc = in->numRows * in->numCols;
+        junkData->n = junkData->nalloc;
+        junkData->data.V = in->data.V[0];      // since psImage data is contiguous...
+    } else {
+        // image not necessarily contiguous
+        int numRows = in->numRows;
+        int numCols = in->numCols;
+        int rowSize = numCols * (PSELEMTYPE_SIZEOF(in->type.type));
+
+        junkData = psVectorAlloc(numRows*numCols, in->type.type);
+        junkData->n = junkData->nalloc;
+
+        psU8* data = junkData->data.V;
+        for (int row = 0; row < numRows; row++) {
+            memcpy(data, in->data.V[row], rowSize);
+            data += rowSize;
+        }
+    }
 
     if (mask != NULL) {
-        // stuff the mask data into a psVector struct.
-        junkMask = psAlloc(sizeof(psVector));
-        junkMask->type = mask->type;
-        junkMask->nalloc = mask->numRows * mask->numCols;
-        junkMask->n = junkMask->nalloc;
-        junkMask->data.V = mask->data.V[0];
+        if (mask->parent == NULL) {
+            // stuff the mask data into a psVector struct.
+            junkMask = psAlloc(sizeof(psVector));
+            junkMask->type = mask->type;
+            junkMask->nalloc = mask->numRows * mask->numCols;
+            junkMask->n = junkMask->nalloc;
+            junkMask->data.V = mask->data.V[0];
+        } else {
+            // image not necessarily contiguous
+            int numRows = mask->numRows;
+            int numCols = mask->numCols;
+            int rowSize = numCols * (PSELEMTYPE_SIZEOF(mask->type.type));
+
+            junkMask = psVectorAlloc(numRows*numCols, mask->type.type);
+            junkMask->n = junkMask->nalloc;
+
+            psU8* data = junkMask->data.V;
+            for (int row = 0; row < numRows; row++) {
+                memcpy(data, mask->data.V[row], rowSize);
+                data += rowSize;
+            }
+        }
     }