Changeset 3769

Timestamp:

Apr 26, 2005, 9:53:30 AM (21 years ago)

Author:

desonia

Message:

fixed small problems that made build using GCC 4.0 fail.

Location:

trunk/psLib

Files:

• configure.ac (modified) (3 diffs)
• pslib-config.in (modified) (2 diffs)
• pslib.kdevelop.pcs (modified) ( previous)
• pslib.kdevses (modified) (1 diff)
• src/collections/psHash.c (modified) (1 diff)
• src/collections/psMetadataIO.c (modified) (4 diffs)
• src/dataIO/psFits.c (modified) (2 diffs)
• src/dataManip/psFunctions.c (modified) (4 diffs)
• src/dataManip/psStats.c (modified) (2 diffs)
• src/fits/psFits.c (modified) (2 diffs)
• src/math/psPolynomial.c (modified) (4 diffs)
• src/math/psSpline.c (modified) (4 diffs)
• src/math/psStats.c (modified) (2 diffs)
• src/psTest.c (modified) (1 diff)
• src/types/psHash.c (modified) (1 diff)
• src/types/psMetadataConfig.c (modified) (4 diffs)
• src/xml/psXML.c (modified) (4 diffs)
• test/astronomy/tst_psAstrometry01.c (modified) (3 diffs)
• test/dataManip/verified/tst_psFunc00.stderr (modified) (8 diffs)
• test/image/verified/tst_psImageManip.stderr (modified) (2 diffs)
• test/psTest.c (modified) (1 diff)
• test/runTest (modified) (5 diffs)

trunk/psLib/configure.ac

@@ -1 @@
-AC_INIT([pslib],[0.6],[http://www.pan-starrs.org/bugzilla])
+AC_INIT([pslib],[0.6.0],[http://www.pan-starrs.org/bugzilla])
 AC_CANONICAL_TARGET
 AM_CONFIG_HEADER(src/config.h)
@@ -42 +42 @@
 fi
 
-AC_LANG_PUSH(Fortran 77)
-AC_PROG_F77
+AC_LANG_PUSH(Fortran)
+AC_PROG_F77(gfortran g95 g90 g77 f95 f90 f77)
 AC_F77_WRAPPERS
-AC_LANG_POP(Fortran 77)
+AC_LANG_POP(Fortran)
 
 AC_PROG_INSTALL
@@ -55 +55 @@
 dnl Setup the info for psLib for pkg-config
 PSLIB_CFLAGS="-I${includedir}"
+PSLIB_LIBS="${FLIBS=}"
 
 dnl ----------------- MYSQL options --------------------

trunk/psLib/pslib-config.in

@@ -57 +57 @@
 
     --cflags)
-        echo @PSLIB_CFLAGS@ 
+        echo @PSLIB_CFLAGS@
         ;;
 
@@ -63 +63 @@
         echo -L@libdir@ -lpslib @PSLIB_LIBS@
         ;;
-    
+
     --deps)
         echo @PSLIB_LIBS@

trunk/psLib/pslib.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="3" >
-  <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImageManip.h" >
-   <View0 line="22" Type="Source" />
+ <DocsAndViews NumberOfDocuments="5" >
+  <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/collections/psVector.h" >
+   <View0 line="145" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImageManip.c" >
-   <View0 line="1173" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/collections/Makefile.am" >
+   <View0 line="16" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImage.h" >
-   <View0 line="159" Type="Source" />
+  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/Makefile.am" >
+   <View0 line="19" Type="Source" />
   </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/collections/psMetadata.c" >
+   <View0 line="196" Type="Source" />
+  </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/configure.ac" >
+   <View0 line="25" Type="Source" />
+  </Doc4>
  </DocsAndViews>
  <pluginList>

trunk/psLib/src/collections/psHash.c

@@ -12 +12 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-26 19:53:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psMetadataIO.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-26 19:53:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -750 +750 @@
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-    psTagName = psStringCopy(tagName);
+    psTagName = psStringCopy((const char*)tagName);
 
     // Metadata containter for housing element attributes used by other SAX events
@@ -774 +774 @@
 
                 // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-                psAttName = psStringCopy(attName);
-                psAttValue = psStringCopy(attValue);
+                psAttName = psStringCopy((const char*)attName);
+                psAttValue = psStringCopy((const char*)attValue);
                 psHashAdd(htAtts, psAttName, psAttValue);
                 psFree(psAttName);
@@ -1082 +1082 @@
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-    psEndTagName = psStringCopy(tagName);
+    psEndTagName = psStringCopy((const char*)tagName);
 
     // Compare start and end tag names

trunk/psLib/src/dataIO/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1596 +1596 @@
                                    1, // firstelem
                                    table->n, // nelements
-                                   col->data.S8,
+                                   (char*)col->data.S8,
                                    &status);
                 break;

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 04:16:02 $
+ *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1959 +1959 @@
     PS_PTR_CHECK_NULL(x, -6);
     PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3);
-    psS8* strType;
+    char* strType;
 
     switch (x->type.type) {
@@ -2069 +2069 @@
 
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
@@ -2163 +2163 @@
         }
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,

trunk/psLib/src/dataManip/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.125 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2184 +2184 @@
         // do nothing
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType, in->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1596 +1596 @@
                                    1, // firstelem
                                    table->n, // nelements
-                                   col->data.S8,
+                                   (char*)col->data.S8,
                                    &status);
                 break;

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 04:16:02 $
+ *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1959 +1959 @@
     PS_PTR_CHECK_NULL(x, -6);
     PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3);
-    psS8* strType;
+    char* strType;
 
     switch (x->type.type) {
@@ -2069 +2069 @@
 
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
@@ -2163 +2163 @@
         }
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 04:16:02 $
+ *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1959 +1959 @@
     PS_PTR_CHECK_NULL(x, -6);
     PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3);
-    psS8* strType;
+    char* strType;
 
     switch (x->type.type) {
@@ -2069 +2069 @@
 
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
@@ -2163 +2163 @@
         }
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.125 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-26 19:53:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2184 +2184 @@
         // do nothing
     } else {
-        psS8* strType;
+        char* strType;
         PS_TYPE_NAME(strType, in->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,

trunk/psLib/src/psTest.c

@@ -278 +278 @@
         fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
     }
-}
+    fflush(fp);
+}

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-26 19:53:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/types/psMetadataConfig.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-26 19:53:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -750 +750 @@
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-    psTagName = psStringCopy(tagName);
+    psTagName = psStringCopy((const char*)tagName);
 
     // Metadata containter for housing element attributes used by other SAX events
@@ -774 +774 @@
 
                 // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-                psAttName = psStringCopy(attName);
-                psAttValue = psStringCopy(attValue);
+                psAttName = psStringCopy((const char*)attName);
+                psAttValue = psStringCopy((const char*)attValue);
                 psHashAdd(htAtts, psAttName, psAttValue);
                 psFree(psAttName);
@@ -1082 +1082 @@
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-    psEndTagName = psStringCopy(tagName);
+    psEndTagName = psStringCopy((const char*)tagName);
 
     // Compare start and end tag names

trunk/psLib/src/xml/psXML.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-26 19:53:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -750 +750 @@
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-    psTagName = psStringCopy(tagName);
+    psTagName = psStringCopy((const char*)tagName);
 
     // Metadata containter for housing element attributes used by other SAX events
@@ -774 +774 @@
 
                 // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-                psAttName = psStringCopy(attName);
-                psAttValue = psStringCopy(attValue);
+                psAttName = psStringCopy((const char*)attName);
+                psAttValue = psStringCopy((const char*)attValue);
                 psHashAdd(htAtts, psAttName, psAttValue);
                 psFree(psAttName);
@@ -1082 +1082 @@
 
     // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
-    psEndTagName = psStringCopy(tagName);
+    psEndTagName = psStringCopy((const char*)tagName);
 
     // Compare start and end tag names

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-19 07:00:20 $
+*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-26 19:53:30 $
 *
 * XXX: Must test
@@ -809 +809 @@
         //
         // We set an arbitrary linear transformation.
-        // 
+        //
         transInit->x->coeff[0][0] = 1.0;
         transInit->x->coeff[0][1] = 3.0;
@@ -993 +993 @@
     psFree(myRegion);
 
+    fflush(stdout);
+
     return(!testStatus);
 }

trunk/psLib/test/dataManip/verified/tst_psFunc00.stderr

@@ -8 +8 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial1DAlloc (FILE:LINENO)
-    Error: n is less than 0.
+    Error: n is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial1DAlloc} | tst_psFunc00.c)
@@ -21 +21 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial2DAlloc (FILE:LINENO)
-    Error: nX is less than 0.
+    Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial2DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial2DAlloc (FILE:LINENO)
-    Error: nY is less than 0.
+    Error: nY is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial2DAlloc} | tst_psFunc00.c)
@@ -38 +38 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial3DAlloc (FILE:LINENO)
-    Error: nX is less than 0.
+    Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial3DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial3DAlloc (FILE:LINENO)
-    Error: nY is less than 0.
+    Error: nY is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial3DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial3DAlloc (FILE:LINENO)
-    Error: nZ is less than 0.
+    Error: nZ is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial3DAlloc} | tst_psFunc00.c)
@@ -59 +59 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
-    Error: nW is less than 0.
+    Error: nW is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
-    Error: nX is less than 0.
+    Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
-    Error: nY is less than 0.
+    Error: nY is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
-    Error: nZ is less than 0.
+    Error: nZ is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial4DAlloc} | tst_psFunc00.c)
@@ -84 +84 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial1DAlloc (FILE:LINENO)
-    Error: n is less than 0.
+    Error: n is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial1DAlloc} | tst_psFunc00.c)
@@ -97 +97 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial2DAlloc (FILE:LINENO)
-    Error: nX is less than 0.
+    Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial2DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial2DAlloc (FILE:LINENO)
-    Error: nY is less than 0.
+    Error: nY is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial2DAlloc} | tst_psFunc00.c)
@@ -114 +114 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial3DAlloc (FILE:LINENO)
-    Error: nX is less than 0.
+    Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial3DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial3DAlloc (FILE:LINENO)
-    Error: nY is less than 0.
+    Error: nY is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial3DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial3DAlloc (FILE:LINENO)
-    Error: nZ is less than 0.
+    Error: nZ is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial3DAlloc} | tst_psFunc00.c)
@@ -135 +135 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
-    Error: nW is less than 0.
+    Error: nW is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
-    Error: nX is less than 0.
+    Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
-    Error: nY is less than 0.
+    Error: nY is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
-    Error: nZ is less than 0.
+    Error: nZ is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial4DAlloc} | tst_psFunc00.c)

trunk/psLib/test/image/verified/tst_psImageManip.stderr

@@ -86 +86 @@
     Following should be an error:
 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
-    Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+    Specified vmin value, 0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
@@ -102 +102 @@
     Following should be an error:
 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
-    Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+    Specified vmax value, 0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:

trunk/psLib/test/psTest.c

@@ -134 +134 @@
     }
 
+    fflush(stdout);
+    fflush(stderr);
     return success;
 }

trunk/psLib/test/runTest

@@ -26 +26 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-04-09 00:04:57 $
+#  $Date: 2005-04-26 19:53:30 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -39 +39 @@
 # Assign variables based on the presence of command line options to the script
 GetOptions(
-    "reset!"       => \$reset,
-    "resetStderr!" => \$resetStderr,
-    "resetStdout!" => \$resetStdout,
-    "verified=s"   => \$verifiedDir,
-    "help!"        => \$help,
-    "quiet!"       => \$quiet,
-    "printpassfail!"     => \$verbose
+    "reset!"         => \$reset,
+    "resetStderr!"   => \$resetStderr,
+    "resetStdout!"   => \$resetStdout,
+    "verified=s"     => \$verifiedDir,
+    "help!"          => \$help,
+    "quiet!"         => \$quiet,
+    "printpassfail!" => \$verbose,
+    "printdiff!"     => \$printdiff
 );
 
@@ -255 +256 @@
     exit(0);
 }
+
 exit($exitValue);
 
@@ -364 +366 @@
                 # Display message of the failure of difference to user
                 print STDERR "\tFailed - STDOUT differences\n";
-
+                print STDERR $diffstdout if $printdiff;
                 # Exit value to indicate STDOUT did not compare
                 $returnVal |= 8;
@@ -372 +374 @@
                 # Display message of the failure of difference to user
                 print STDERR "\tFailed - STDERR differences\n";
+                print STDERR $diffstdout if $printdiff;
 
                 # Exit value to indicate STDERR did not compare