Index: trunk/psModules/src/pmObjects.c
===================================================================
--- trunk/psModules/src/pmObjects.c	(revision 4028)
+++ trunk/psModules/src/pmObjects.c	(revision 4030)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 19:26:44 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:28:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -156,7 +156,7 @@
                             psF32 threshold)
 {
-    PS_VECTOR_CHECK_NULL(vector, NULL);
-    PS_VECTOR_CHECK_EMPTY(vector, NULL);
-    PS_VECTOR_CHECK_TYPE(vector, PS_TYPE_F32, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(vector, NULL);
+    PS_ASSERT_VECTOR_NON_EMPTY(vector, NULL);
+    PS_ASSERT_VECTOR_TYPE(vector, PS_TYPE_F32, NULL);
     int count = 0;
     int n = vector->n;
@@ -250,6 +250,6 @@
                                     psU32 row)
 {
-    PS_IMAGE_CHECK_NULL(image, NULL);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
 
     psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32);
@@ -302,6 +302,6 @@
                           psF32 threshold)
 {
-    PS_IMAGE_CHECK_NULL(image, NULL);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
     if ((image->numRows == 1) || (image->numCols == 1)) {
         psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns.");
@@ -514,6 +514,6 @@
                     const psRegion *valid)
 {
-    PS_PTR_CHECK_NULL(peaks, NULL);
-    //    PS_PTR_CHECK_NULL(valid, NULL);
+    PS_ASSERT_PTR_NON_NULL(peaks, NULL);
+    //    PS_ASSERT_PTR_NON_NULL(valid, NULL);
 
     psListElem *tmpListElem = (psListElem *) peaks->head;
@@ -540,5 +540,5 @@
 psArray *pmPeaksSubset(psArray *peaks, psF32 maxValue, const psRegion *valid)
 {
-    PS_PTR_CHECK_NULL(peaks, NULL);
+    PS_ASSERT_PTR_NON_NULL(peaks, NULL);
 
     psArray *output = psArrayAlloc (200);
@@ -603,7 +603,7 @@
                            psF32 outerRadius)
 {
-    PS_IMAGE_CHECK_NULL(image, NULL);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
-    PS_PTR_CHECK_NULL(peak, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
+    PS_ASSERT_PTR_NON_NULL(peak, NULL);
     PS_FLOAT_COMPARE(0.0, innerRadius, NULL);
     PS_FLOAT_COMPARE(innerRadius, outerRadius, NULL);
@@ -786,7 +786,7 @@
                           psF32 radius)
 {
-    PS_PTR_CHECK_NULL(source, NULL);
-    PS_PTR_CHECK_NULL(source->peak, NULL);
-    PS_PTR_CHECK_NULL(source->pixels, NULL);
+    PS_ASSERT_PTR_NON_NULL(source, NULL);
+    PS_ASSERT_PTR_NON_NULL(source->peak, NULL);
+    PS_ASSERT_PTR_NON_NULL(source->pixels, NULL);
     PS_FLOAT_COMPARE(0.0, radius, NULL);
 
@@ -961,6 +961,6 @@
 bool pmSourceRoughClass(psArray *sources, psMetadata *metadata)
 {
-    PS_PTR_CHECK_NULL(sources, false);
-    PS_PTR_CHECK_NULL(metadata, false);
+    PS_ASSERT_PTR_NON_NULL(sources, false);
+    PS_ASSERT_PTR_NON_NULL(metadata, false);
     psBool rc = true;
     psArray *peaks  = NULL;
@@ -983,6 +983,6 @@
         {
             psSource *tmpSrc = (psSource *) sources->data[i];
-            PS_PTR_CHECK_NULL(tmpSrc, false); // just skip this one?
-            PS_PTR_CHECK_NULL(tmpSrc->moments, false); // just skip this one?
+            PS_ASSERT_PTR_NON_NULL(tmpSrc, false); // just skip this one?
+            PS_ASSERT_PTR_NON_NULL(tmpSrc->moments, false); // just skip this one?
 
             // Sx,Sy are limited at 0.  a peak at 0,0 is artificial
@@ -1191,9 +1191,9 @@
                             psF32 radius)
 {
-    PS_IMAGE_CHECK_NULL(image, false);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
-    PS_PTR_CHECK_NULL(source, false);
-    PS_PTR_CHECK_NULL(source->moments, false);
-    // PS_PTR_CHECK_NULL(source->peak, false);
+    PS_ASSERT_IMAGE_NON_NULL(image, false);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_PTR_NON_NULL(source->moments, false);
+    // PS_ASSERT_PTR_NON_NULL(source->peak, false);
     PS_FLOAT_COMPARE(0.0, radius, false);
 
@@ -1301,9 +1301,9 @@
                         psModelType model)
 {
-    PS_PTR_CHECK_NULL(source, false);
-    PS_PTR_CHECK_NULL(source->moments, false);
-    PS_PTR_CHECK_NULL(source->peak, false);
-    PS_IMAGE_CHECK_NULL(image, false);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_PTR_NON_NULL(source->moments, false);
+    PS_ASSERT_PTR_NON_NULL(source->peak, false);
+    PS_ASSERT_IMAGE_NON_NULL(image, false);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
     if (source->models != NULL) {
         psLogMsg(__func__, PS_LOG_WARN, "WARNING: source->models was non-NULL; calling psFree(source->models).\n");
@@ -1423,7 +1423,7 @@
                        psU32 col)
 {
-    PS_PTR_CHECK_NULL(src, false);
-    PS_PTR_CHECK_NULL(src->models, false);
-    PS_PTR_CHECK_NULL(src->models->params, false);
+    PS_ASSERT_PTR_NON_NULL(src, false);
+    PS_ASSERT_PTR_NON_NULL(src->models, false);
+    PS_ASSERT_PTR_NON_NULL(src->models->params, false);
 
     // XXX: The following step will not be necessary if the models->params
@@ -1560,10 +1560,10 @@
                          pmContourType mode)
 {
-    PS_PTR_CHECK_NULL(source, false);
-    PS_PTR_CHECK_NULL(image, false);
-    PS_PTR_CHECK_NULL(source->moments, false);
-    PS_PTR_CHECK_NULL(source->peak, false);
-    PS_PTR_CHECK_NULL(source->pixels, false);
-    PS_PTR_CHECK_NULL(source->models, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_PTR_NON_NULL(image, false);
+    PS_ASSERT_PTR_NON_NULL(source->moments, false);
+    PS_ASSERT_PTR_NON_NULL(source->peak, false);
+    PS_ASSERT_PTR_NON_NULL(source->pixels, false);
+    PS_ASSERT_PTR_NON_NULL(source->models, false);
 
     //
@@ -1669,11 +1669,11 @@
                       const psImage *image)
 {
-    PS_PTR_CHECK_NULL(source, false);
-    PS_PTR_CHECK_NULL(source->moments, false);
-    PS_PTR_CHECK_NULL(source->peak, false);
-    PS_PTR_CHECK_NULL(source->pixels, false);
-    PS_PTR_CHECK_NULL(source->models, false);
-    PS_IMAGE_CHECK_NULL(image, false);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_PTR_NON_NULL(source->moments, false);
+    PS_ASSERT_PTR_NON_NULL(source->peak, false);
+    PS_ASSERT_PTR_NON_NULL(source->pixels, false);
+    PS_ASSERT_PTR_NON_NULL(source->models, false);
+    PS_ASSERT_IMAGE_NON_NULL(image, false);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
     psBool rc;
 
@@ -1758,11 +1758,11 @@
                              psS32 flag)
 {
-    PS_PTR_CHECK_NULL(src, false);
-    PS_PTR_CHECK_NULL(src->moments, false);
-    PS_PTR_CHECK_NULL(src->peak, false);
-    PS_PTR_CHECK_NULL(src->pixels, false);
-    PS_PTR_CHECK_NULL(src->models, false);
-    PS_IMAGE_CHECK_NULL(image, false);
-    PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
+    PS_ASSERT_PTR_NON_NULL(src, false);
+    PS_ASSERT_PTR_NON_NULL(src->moments, false);
+    PS_ASSERT_PTR_NON_NULL(src->peak, false);
+    PS_ASSERT_PTR_NON_NULL(src->pixels, false);
+    PS_ASSERT_PTR_NON_NULL(src->models, false);
+    PS_ASSERT_IMAGE_NON_NULL(image, false);
+    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
 
     psVector *x = psVectorAlloc(2, PS_TYPE_F32);