Changeset 1327 for trunk/psLib/src/dataManip/psStats.c

Timestamp:

Jul 28, 2004, 5:54:52 PM (22 years ago)

Author:

evanalst

Message:

Changed the data type Histogram member nums to be of type psU32 per SDR.

File:

• trunk/psLib/src/dataManip/psStats.c (modified) (3 diffs)

trunk/psLib/src/dataManip/psStats.c

@@ -1600 +1600 @@
 
     // Allocate the bins, and initialize them to zero.
-    newHist->nums =  psVectorAlloc(n, PS_TYPE_S32);
+    newHist->nums =  psVectorAlloc(n, PS_TYPE_U32);
     newHist->nums->n = newHist->nums->nalloc;
     for (i=0;i<newHist->nums->n;i++) {
-        newHist->nums->data.S32[i] = 0;
+        newHist->nums->data.U32[i] = 0;
     }
 
@@ -1656 +1656 @@
     // Allocate the bins, and initialize them to zero.  If there are N bounds,
     // then there are N-1 bins.
-    newHist->nums = psVectorAlloc((bounds->n)-1, PS_TYPE_S32);
+    newHist->nums = psVectorAlloc((bounds->n)-1, PS_TYPE_U32);
     newHist->nums->n = newHist->nums->nalloc;
     for (i=0;i<newHist->nums->n;i++) {
-        newHist->nums->data.S32[i] = 0;
+        newHist->nums->data.U32[i] = 0;
     }
 
@@ -1705 +1705 @@
     if (out == NULL) {
         return(NULL);
+    }
+
+    // Check the specified output histogram for type psF32
+    if (out->bounds->type.type != PS_TYPE_F32) {
+        psAbort(__func__,
+                "Only data type PS_TYPE_F32 for the output.bounds member.");
+    }
+
+    if (out->nums->type.type != PS_TYPE_U32) {
+        psAbort(__func__,
+                "Only data type PS_TYPE_U32 for output.nums member.");
     }