Changeset 15974 for trunk/psModules/src/camera/pmReadoutStack.c

Timestamp:

Jan 2, 2008, 10:34:24 AM (18 years ago)

Author:

gusciora

Message:

Added some PS_ASSERTS and a few cosmetic changes.

File:

• trunk/psModules/src/camera/pmReadoutStack.c (modified) (3 diffs)

trunk/psModules/src/camera/pmReadoutStack.c

@@ -8 +8 @@
 
 
-bool pmReadoutUpdateSize(pmReadout *readout, int minCols, int minRows, int numCols, int numRows, bool mask)
+bool pmReadoutUpdateSize(pmReadout *readout, int minCols, int minRows,
+                         int numCols, int numRows, bool mask)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -20 +21 @@
     }
 
-    // (re-)Allocate the images
+    // (reAllocate the images
     if (!readout->image) {
         readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -50 +51 @@
 
 bool pmReadoutStackValidate(int *minInputColsPtr, int *maxInputColsPtr, int *minInputRowsPtr,
-                            int *maxInputRowsPtr, int *numColsPtr, int *numRowsPtr, const psArray *inputs)
+                            int *maxInputRowsPtr, int *numColsPtr, int *numRowsPtr, 
+                            const psArray *inputs)
 {
     PS_ASSERT_ARRAY_NON_NULL(inputs, false);
+    PS_ASSERT_PTR_NON_NULL(minInputColsPtr, false);
+    PS_ASSERT_PTR_NON_NULL(maxInputColsPtr, false);
+    PS_ASSERT_PTR_NON_NULL(minInputRowsPtr, false);
+    PS_ASSERT_PTR_NON_NULL(maxInputRowsPtr, false);
+    PS_ASSERT_PTR_NON_NULL(numColsPtr, false);
+    PS_ASSERT_PTR_NON_NULL(numRowsPtr, false);
 
     // Step through each readout in the input image list to determine how big of an output image is needed to