Index: trunk/psModules/src/pmImageCombine.c
===================================================================
--- trunk/psModules/src/pmImageCombine.c	(revision 4028)
+++ trunk/psModules/src/pmImageCombine.c	(revision 4030)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 19:26:44 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:28:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49,5 +49,5 @@
                         )
 {
-    PS_PTR_CHECK_NULL(images, combine);
+    PS_ASSERT_PTR_NON_NULL(images, combine);
     psU32 numImages = images->n;
 
@@ -79,11 +79,11 @@
         psImage *tmpMaskImg = (psImage *) masks->data[i];
 
-        PS_IMAGE_CHECK_NULL(tmpDataImg, combine);
-        PS_IMAGE_CHECK_NULL(tmpErrorImg, combine);
-        PS_IMAGE_CHECK_NULL(tmpMaskImg, combine);
-
-        PS_IMAGE_CHECK_TYPE(tmpDataImg, PS_TYPE_F32, combine);
-        PS_IMAGE_CHECK_TYPE(tmpErrorImg, PS_TYPE_F32, combine);
-        PS_IMAGE_CHECK_TYPE(tmpMaskImg, PS_TYPE_U8, combine);
+        PS_ASSERT_IMAGE_NON_NULL(tmpDataImg, combine);
+        PS_ASSERT_IMAGE_NON_NULL(tmpErrorImg, combine);
+        PS_ASSERT_IMAGE_NON_NULL(tmpMaskImg, combine);
+
+        PS_ASSERT_IMAGE_TYPE(tmpDataImg, PS_TYPE_F32, combine);
+        PS_ASSERT_IMAGE_TYPE(tmpErrorImg, PS_TYPE_F32, combine);
+        PS_ASSERT_IMAGE_TYPE(tmpMaskImg, PS_TYPE_U8, combine);
 
         if ((tmpDataImg->numRows != numRows) || (tmpDataImg->numCols != numCols)) {
@@ -92,9 +92,9 @@
         }
 
-        PS_IMAGE_CHECK_SIZE_EQUAL(tmpDataImg, tmpErrorImg, NULL);
-        PS_IMAGE_CHECK_SIZE_EQUAL(tmpDataImg, tmpMaskImg, NULL);
-    }
-    PS_PTR_CHECK_NULL(pixels, combine);
-    PS_PTR_CHECK_NULL(stats, combine);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(tmpDataImg, tmpErrorImg, NULL);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(tmpDataImg, tmpMaskImg, NULL);
+    }
+    PS_ASSERT_PTR_NON_NULL(pixels, combine);
+    PS_ASSERT_PTR_NON_NULL(stats, combine);
 
     // Allocate and initialize the combined image, if necessary.
@@ -329,13 +329,13 @@
                        )
 {
-    PS_PTR_CHECK_NULL(images, NULL);
-    PS_PTR_CHECK_NULL(errors, NULL);
-    PS_PTR_CHECK_NULL(inToOut, NULL);
-    PS_PTR_CHECK_NULL(outToIn, NULL);
+    PS_ASSERT_PTR_NON_NULL(images, NULL);
+    PS_ASSERT_PTR_NON_NULL(errors, NULL);
+    PS_ASSERT_PTR_NON_NULL(inToOut, NULL);
+    PS_ASSERT_PTR_NON_NULL(outToIn, NULL);
     // Ensure that the psArray parameters have an element for each image.
     psS32 numImages = images->n;
-    PS_INT_CHECK_NON_EQUALS(numImages, errors->n, NULL);
-    PS_INT_CHECK_NON_EQUALS(numImages, inToOut->n, NULL);
-    PS_INT_CHECK_NON_EQUALS(numImages, outToIn->n, NULL);
+    PS_ASSERT_INT_EQUAL(numImages, errors->n, NULL);
+    PS_ASSERT_INT_EQUAL(numImages, inToOut->n, NULL);
+    PS_ASSERT_INT_EQUAL(numImages, outToIn->n, NULL);
     // XXX: Loop through all images, ensure their sizes are equal?