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

Timestamp:

Jun 6, 2004, 5:49:20 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/image/psImageStats.c

@@ -20 +20 @@
 /// This routine must determine the various statistics for the image.
 /*****************************************************************************
-    GUS: verify that image/mask have the
- correct types
- sizes
+    GUS: verify that image/mask have the correct types, and sizes.
  *****************************************************************************/
 psStats *psImageStats(psStats *stats,
@@ -35 +33 @@
     int j = 0;
 
+    // GUS: Verify this action.
+    if ((stats == NULL) ||
+            (in == NULL)) {
+        return(NULL);
+    }
+    // GUS: Verify this action.
+    if (stats->options == 0) {
+        return(stats);
+    }
+
     junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);
     junkData->n = junkData->nalloc;
@@ -64 +72 @@
         stats = psVectorStats(stats, junkData, NULL, 0);
     }
-
     psVectorFree(junkData);
-
     return(stats);
 }
@@ -73 +79 @@
     NOTE: We assume that the psHistogram structure out has already been
     allocated and initialized.
- 
-    GUS: verify that image/mask have the
- correct types
- sizes
+    GUS: verify that image/mask have the, correct types and  sizes.
  *****************************************************************************/
 psHistogram *psImageHistogram(psHistogram *out,
@@ -88 +91 @@
     int i = 0;
     int j = 0;
+
+    // GUS: Verify this action.
+    if ((out == NULL) ||
+            (in == NULL)) {
+        return(NULL);
+    }
 
     junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);