Index: /trunk/psLib/src/dataManip/psFunctions.c
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.c	(revision 4218)
+++ /trunk/psLib/src/dataManip/psFunctions.c	(revision 4219)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-13 19:39:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -175,6 +175,4 @@
 static void dPolynomial2DFree(psDPolynomial2D* myPoly)
 {
-    //printf("dPolynomial2DFree(): HMMM: myPoly->nX is %d\n", myPoly->nX);
-    //printf("dPolynomial2DFree(): HMMM: myPoly->nY is %d\n", myPoly->nY);
     for (psS32 x = 0; x < myPoly->nX; x++) {
         psFree(myPoly->coeff[x]);
@@ -1636,5 +1634,4 @@
 {
     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
-
     if (myPoly->type == PS_POLYNOMIAL_ORD) {
         return(dOrdPolynomial2DEval(x, y, myPoly));
Index: /trunk/psLib/src/math/psPolynomial.c
===================================================================
--- /trunk/psLib/src/math/psPolynomial.c	(revision 4218)
+++ /trunk/psLib/src/math/psPolynomial.c	(revision 4219)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-13 19:39:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -175,6 +175,4 @@
 static void dPolynomial2DFree(psDPolynomial2D* myPoly)
 {
-    //printf("dPolynomial2DFree(): HMMM: myPoly->nX is %d\n", myPoly->nX);
-    //printf("dPolynomial2DFree(): HMMM: myPoly->nY is %d\n", myPoly->nY);
     for (psS32 x = 0; x < myPoly->nX; x++) {
         psFree(myPoly->coeff[x]);
@@ -1636,5 +1634,4 @@
 {
     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
-
     if (myPoly->type == PS_POLYNOMIAL_ORD) {
         return(dOrdPolynomial2DEval(x, y, myPoly));
Index: /trunk/psLib/src/math/psSpline.c
===================================================================
--- /trunk/psLib/src/math/psSpline.c	(revision 4218)
+++ /trunk/psLib/src/math/psSpline.c	(revision 4219)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-13 19:39:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -175,6 +175,4 @@
 static void dPolynomial2DFree(psDPolynomial2D* myPoly)
 {
-    //printf("dPolynomial2DFree(): HMMM: myPoly->nX is %d\n", myPoly->nX);
-    //printf("dPolynomial2DFree(): HMMM: myPoly->nY is %d\n", myPoly->nY);
     for (psS32 x = 0; x < myPoly->nX; x++) {
         psFree(myPoly->coeff[x]);
@@ -1636,5 +1634,4 @@
 {
     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
-
     if (myPoly->type == PS_POLYNOMIAL_ORD) {
         return(dOrdPolynomial2DEval(x, y, myPoly));
Index: /trunk/psModules/test/Makefile.am
===================================================================
--- /trunk/psModules/test/Makefile.am	(revision 4218)
+++ /trunk/psModules/test/Makefile.am	(revision 4219)
@@ -11,4 +11,5 @@
 	tst_pmSubtractSky \
 	tst_pmImageSubtract \
+	tst_pmImageCombine \
 	tst_pmObjects01
 
@@ -30,4 +31,5 @@
 tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
 tst_pmImageSubtract_SOURCES = tst_pmImageSubtract.c
+tst_pmImageCombine_SOURCES = tst_pmImageCombine.c
 tst_pmObjects01_SOURCES = tst_pmObjects01.c
 
Index: /trunk/psModules/test/tst_pmObjects01.c
===================================================================
--- /trunk/psModules/test/tst_pmObjects01.c	(revision 4218)
+++ /trunk/psModules/test/tst_pmObjects01.c	(revision 4219)
@@ -19,6 +19,6 @@
  * abd never deallocate, no error is generated.
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-09 23:56:39 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-13 19:37:27 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1662,5 +1662,5 @@
     mySrc->models->params->data.F32[6] = 2.0;
     rc = pmSourceContour(mySrc, imgData, LEVEL, PS_CONTOUR_CRUDE);
-    if (rc != NULL) {
+    if (rc == NULL) {
         printf("TEST ERROR: pmSourceContour() returned NULL.\n");
         testStatus = false;
Index: /trunk/psModules/test/verified/tst_pmImageCombine.stderr
===================================================================
--- /trunk/psModules/test/verified/tst_pmImageCombine.stderr	(revision 4219)
+++ /trunk/psModules/test/verified/tst_pmImageCombine.stderr	(revision 4219)
@@ -0,0 +1,34 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_pmImageCombine.c                                       *
+*            TestPoint: Test Point Driver{pmCombineImages()}                       *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    Unallowable operation: images is NULL.
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    images and errors args must have same length (6 != 5)
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    Unallowable operation: psImage tmpDataImg has incorrect type.
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    images and errors args must have same length (5 != 6)
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    Unallowable operation: psImage tmpErrorImg has incorrect type.
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    images and masks args must have same length (5 != 6)
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    Unallowable operation: psImage tmpMaskImg has incorrect type.
+<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+    Unallowable operation: stats is NULL.
+
+---> TESTPOINT PASSED (Test Point Driver{pmCombineImages()} | tst_pmImageCombine.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_pmImageCombine.c                                       *
+*            TestPoint: Test Point Driver{pmRejectPixels()}                        *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (Test Point Driver{pmRejectPixels()} | tst_pmImageCombine.c)
+
Index: /trunk/psModules/test/verified/tst_pmImageCombine.stdout
===================================================================
--- /trunk/psModules/test/verified/tst_pmImageCombine.stdout	(revision 4219)
+++ /trunk/psModules/test/verified/tst_pmImageCombine.stdout	(revision 4219)
@@ -0,0 +1,21 @@
+Testing pmCombineImages(10, 10, 5)
+Calling with a NULL images.  Should generate error, return NULL.
+Calling with a long images.  Should generate error, return NULL.
+Calling with a bad type images.  Should generate error, return NULL.
+Calling with a long errors.  Should generate error, return NULL.
+Calling with a bad type errors.  Should generate error, return NULL.
+Calling with a long masks.  Should generate error, return NULL.
+Calling with a bad type masks.  Should generate error, return NULL.
+Calling with a NULL stats.  Should generate error, return NULL.
+Calling with acceptable data.  Should generate a psImage.
+Image 1, questionable pixel 0 is (0 8)
+Image 1, questionable pixel 1 is (1 2)
+Image 1, questionable pixel 2 is (3 9)
+Image 1, questionable pixel 3 is (4 5)
+Image 1, questionable pixel 4 is (3 8)
+Image 2, questionable pixel 0 is (9 9)
+Image 2, questionable pixel 1 is (0 5)
+Image 2, questionable pixel 2 is (6 2)
+Image 2, questionable pixel 3 is (3 7)
+Image 3, questionable pixel 0 is (7 5)
+Testing pmRejectPixels(10, 10, 5, 1.000000, 1.000000)