Index: trunk/psModules/test/tst_pmObjects01.c
===================================================================
--- trunk/psModules/test/tst_pmObjects01.c	(revision 4221)
+++ trunk/psModules/test/tst_pmObjects01.c	(revision 4579)
@@ -19,6 +19,6 @@
  * abd never deallocate, no error is generated.
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 19:59:21 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-19 01:44:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -128,5 +128,5 @@
     } else {
         if ((tmpModel->params->n != 7) || (tmpModel->dparams->n != 7)) {
-            printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) allocated an incorrect number of params (%d, %d)\n",
+            printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) allocated an incorrect number of params (%ld, %ld)\n",
                    tmpModel->params->n, tmpModel->dparams->n);
             testStatus = false;
@@ -150,5 +150,5 @@
     } else {
         if ((tmpModel->params->n != 7) || (tmpModel->dparams->n != 7)) {
-            printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) allocated an incorrect number of params (%d, %d)\n",
+            printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) allocated an incorrect number of params (%ld, %ld)\n",
                    tmpModel->params->n, tmpModel->dparams->n);
             testStatus = false;
@@ -172,5 +172,5 @@
     } else {
         if ((tmpModel->params->n != 11) || (tmpModel->dparams->n != 11)) {
-            printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) allocated an incorrect number of params (%d, %d)\n",
+            printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) allocated an incorrect number of params (%ld, %ld)\n",
                    tmpModel->params->n, tmpModel->dparams->n);
             testStatus = false;
@@ -194,5 +194,5 @@
     } else {
         if ((tmpModel->params->n != 9) || (tmpModel->dparams->n != 9)) {
-            printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) allocated an incorrect number of params (%d, %d)\n",
+            printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) allocated an incorrect number of params (%ld, %ld)\n",
                    tmpModel->params->n, tmpModel->dparams->n);
             testStatus = false;
@@ -216,5 +216,5 @@
     } else {
         if ((tmpModel->params->n != 8) || (tmpModel->dparams->n != 8)) {
-            printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) allocated an incorrect number of params (%d, %d)\n",
+            printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) allocated an incorrect number of params (%ld, %ld)\n",
                    tmpModel->params->n, tmpModel->dparams->n);
             testStatus = false;
@@ -238,5 +238,5 @@
     } else {
         if ((tmpModel->params->n != 12) || (tmpModel->dparams->n != 12)) {
-            printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) allocated an incorrect number of params (%d, %d)\n",
+            printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) allocated an incorrect number of params (%ld, %ld)\n",
                    tmpModel->params->n, tmpModel->dparams->n);
             testStatus = false;
@@ -290,5 +290,5 @@
     } else {
         if (outData->n != 1) {
-            printf("TEST ERROR: outData->n is %d\n", outData->n);
+            printf("TEST ERROR: outData->n is %ld\n", outData->n);
             testStatus = false;
         }
@@ -316,5 +316,5 @@
 
         if (outData->n != 0) {
-            printf("TEST ERROR: outData->n is %d\n", outData->n);
+            printf("TEST ERROR: outData->n is %ld\n", outData->n);
             testStatus = false;
         }
@@ -344,5 +344,5 @@
 
         if (outData->n != 1) {
-            printf("TEST ERROR: outData->n is %d\n", outData->n);
+            printf("TEST ERROR: outData->n is %ld\n", outData->n);
             testStatus = false;
         }
@@ -370,5 +370,5 @@
 
         if (outData->n != 0) {
-            printf("TEST ERROR: outData->n is %d\n", outData->n);
+            printf("TEST ERROR: outData->n is %ld\n", outData->n);
             testStatus = false;
         }
@@ -398,5 +398,5 @@
 
         if (outData->n != n/2) {
-            printf("TEST ERROR: outData->n is %d\n", outData->n);
+            printf("TEST ERROR: outData->n is %ld\n", outData->n);
             testStatus = false;
         }
@@ -423,5 +423,5 @@
 
         if (outData->n != 0) {
-            printf("TEST ERROR: outData->n is %d\n", outData->n);
+            printf("TEST ERROR: outData->n is %ld\n", outData->n);
             testStatus = false;
         }
@@ -477,5 +477,5 @@
 
 /******************************************************************************
-test02(): 
+test02():
 // XXX: Must test flat peaks.
 // XXX: test 1-by-n and n-by-1 images.
@@ -539,5 +539,5 @@
         }
         if (outData->n != expectedNumPeaks) {
-            printf("TEST ERROR: pmFindImagePeaks found %d peaks (should be %d)\n", outData->n, expectedNumPeaks);
+            printf("TEST ERROR: pmFindImagePeaks found %ld peaks (should be %d)\n", outData->n, expectedNumPeaks);
             testStatus = false;
         }
@@ -681,5 +681,5 @@
     /* XXX: Modify for new pmCullPeaks
         outData = pmCullPeaks(outData, PS_MAX_F32, NULL);
-     
+
         if (outData == NULL) {
             printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n");
@@ -702,8 +702,8 @@
     printf("Calling pmCullPeaks with tiny maxValue and NULL psRegion.\n");
     outData = pmFindImagePeaks(imgData, 0.0);
-    printf("pmFindImagePeaks found %d peaks\n", outData->n);
+    printf("pmFindImagePeaks found %ld peaks\n", outData->n);
     /* XXX: Modify for new pmCullPeaks
         outData = pmCullPeaks(outData, 0.0, NULL);
-     
+
         if (outData == NULL) {
             printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n");
@@ -726,10 +726,10 @@
     printf("Calling pmCullPeaks with large maxValue and disjoint psRegion.\n");
     outData = pmFindImagePeaks(imgData, 0.0);
-    printf("pmFindImagePeaks found %d peaks\n", outData->n);
+    printf("pmFindImagePeaks found %ld peaks\n", outData->n);
     psRegion tmpRegion = psRegionSet(10000.0, 20000.0, 10000.0, 20000.0);
 
     /* XXX: Modify for new pmCullPeaks
         outData = pmCullPeaks(outData, PS_MAX_F32, tmpRegion);
-     
+
         if (outData == NULL) {
             printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n");
@@ -752,9 +752,9 @@
     printf("Calling pmCullPeaks with large maxValue and non-disjoint psRegion.\n");
     outData = pmFindImagePeaks(imgData, 0.0);
-    printf("pmFindImagePeaks found %d peaks\n", outData->n);
+    printf("pmFindImagePeaks found %ld peaks\n", outData->n);
     tmpRegion = psRegionSet(-PS_MAX_F32, PS_MAX_F32, -PS_MAX_F32, PS_MAX_F32);
     /* XXX: Modify for new pmCullPeaks
         outData = pmCullPeaks(outData, PS_MAX_F32, tmpRegion);
-     
+
         if (outData == NULL) {
             printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n");
@@ -1145,5 +1145,5 @@
             testStatus = false;
         }
-     
+
         printf("----------------------------------------------------------------------------------\n");
         printf("Calling pmSourceSetPixelsCircle with subImage endCol > numCols.  Should generate error and return NULL.\n");
@@ -1156,5 +1156,5 @@
             testStatus = false;
         }
-     
+
         printf("----------------------------------------------------------------------------------\n");
         printf("Calling pmSourceSetPixelsCircle with subImage startRow < 0.  Should generate error and return NULL.\n");
@@ -1167,5 +1167,5 @@
             testStatus = false;
         }
-     
+
         printf("----------------------------------------------------------------------------------\n");
         printf("Calling pmSourceSetPixelsCircle with subImage endRow > numRows.  Should generate error and return NULL.\n");