Changeset 4219

Timestamp:

Jun 13, 2005, 9:40:52 AM (21 years ago)

Author:

gusciora

Message:

...

Location:

trunk

Files:

• psLib/src/dataManip/psFunctions.c (modified) (3 diffs)
• psLib/src/math/psPolynomial.c (modified) (3 diffs)
• psLib/src/math/psSpline.c (modified) (3 diffs)
• psModules/test/Makefile.am (modified) (2 diffs)
• psModules/test/tst_pmObjects01.c (modified) (2 diffs)
• psModules/test/verified/tst_pmImageCombine.stderr (added)
• psModules/test/verified/tst_pmImageCombine.stdout (added)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  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 +175 @@
 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 +1634 @@
 {
     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
-
     if (myPoly->type == PS_POLYNOMIAL_ORD) {
         return(dOrdPolynomial2DEval(x, y, myPoly));

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  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 +175 @@
 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 +1634 @@
 {
     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
-
     if (myPoly->type == PS_POLYNOMIAL_ORD) {
         return(dOrdPolynomial2DEval(x, y, myPoly));

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  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 +175 @@
 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 +1634 @@
 {
     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
-
     if (myPoly->type == PS_POLYNOMIAL_ORD) {
         return(dOrdPolynomial2DEval(x, y, myPoly));

trunk/psModules/test/Makefile.am

@@ -11 +11 @@
         tst_pmSubtractSky \
         tst_pmImageSubtract \
+        tst_pmImageCombine \
         tst_pmObjects01
 
@@ -30 +31 @@
 tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
 tst_pmImageSubtract_SOURCES = tst_pmImageSubtract.c
+tst_pmImageCombine_SOURCES = tst_pmImageCombine.c
 tst_pmObjects01_SOURCES = tst_pmObjects01.c
 

trunk/psModules/test/tst_pmObjects01.c

@@ -19 +19 @@
  * 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 +1662 @@
     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;