Changeset 6912

Timestamp:

Apr 19, 2006, 3:13:11 PM (20 years ago)

Author:

drobbin

Message:

edited files to reflect changes & patches applied by IFA. Currently fixing testing procedures.

Location:

trunk/psLib

Files:

• src/mathtypes/psImage.c (modified) (2 diffs)
• test/db/tst_psDB.c (modified) (2 diffs)
• test/fits/tst_psFits.c (modified) (11 diffs)
• test/imageops/tst_psImageGeomManip.c (modified) (2 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 22:00:03 $
+ *  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-20 01:13:11 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -733 +733 @@
                                        psImageInterpolateMode mode)
 {
-
     PS_ASSERT_IMAGE_NON_NULL(input, unexposedValue);
-    /*    if ( x < input->col0 || x >= (input->col0 + input->numCols) ) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "x-input in psImagePixelInterpolate is outside of image region.\n");
-            return unexposedValue;
-        }
-        if ( y < input->row0 || y >= (input->row0 + input->numRows) ) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "y-input in psImagePixelInterpolate is outside of image region.\n");
-            return unexposedValue;
-        }
-        x -= input->col0;
-        y -= input->row0;
-    */
 
     #define PSIMAGE_PIXEL_INTERPOLATE_CASE(TYPE)                             \

trunk/psLib/test/db/tst_psDB.c

@@ -9 +9 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-06 22:34:25 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-20 01:13:11 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -2153 +2153 @@
     chgRows = psDBDeleteRows(dbh,table,NULL,10);
     if(chgRows != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Deleted rows %ld not as expected %ld",
+        psError(PS_ERR_UNKNOWN,true,"Deleted rows %ld not as expected %d",
                 chgRows, 0);
         psDBDropTable(dbh,table);

trunk/psLib/test/fits/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-04 19:52:47 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-20 01:13:11 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -391 +391 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -424 +425 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -526 +528 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
-
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
         if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
             psError(PS_ERR_UNKNOWN, true,
@@ -548 +550 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -580 +583 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -610 +614 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -1448 +1453 @@
         fits = psFitsOpen(filename,"r"); \
         psRegion reg = {readM0, readM, readN0, readN}; \
-        img = psFitsReadImage(img, fits, reg, 0); \
-        img3 = psFitsReadImage(img3, fits, reg, 1); \
+        img = psFitsReadImage(fits, reg, 0); \
+        img3 = psFitsReadImage(fits, reg, 1); \
         if (img3 == NULL) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to read test image %s",filename); \
@@ -1477 +1482 @@
         img3 = NULL; \
         psFitsMoveExtNum(fits,1, false); \
-        img3 = psFitsReadImage(img3, fits, reg, 0); \
-        img = psFitsReadImage(img, fits, reg, 1); \
+        img3 = psFitsReadImage(fits, reg, 0); \
+        img = psFitsReadImage(fits, reg, 1); \
         if (img == NULL) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to read test image %s",filename); \
@@ -1530 +1535 @@
                           0,0,0,0
                       };
-    if(psFitsReadImage(NULL,NULL,region,0) != NULL) {
+    if(psFitsReadImage(NULL,region,0) != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL psFits");
         return 100;
@@ -1596 +1601 @@
     psRegion region = {0,0,0,0};
     fits = psFitsOpen("tmpImages/writeTest.fits","r");
-    img = psFitsReadImage(NULL, fits, region, 0);
+    img = NULL;
+    img = psFitsReadImage(fits, region, 0);
     if (img == NULL) {
         psError(PS_ERR_UNKNOWN, true,"Could not read in writeTest.fits.");

trunk/psLib/test/imageops/tst_psImageGeomManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-06 04:12:27 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-20 01:13:11 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -610 +610 @@
         psFitsMoveExtNum(fBiTruthFile, index, false);
         psFitsMoveExtNum(sBiTruthFile, index, false);
-        fTruth = psFitsReadImage(fTruth, fTruthFile, regionAll, 0);
-        sTruth = psFitsReadImage(sTruth, sTruthFile, regionAll, 0);
-        fBiTruth = psFitsReadImage(fBiTruth, fBiTruthFile, regionAll, 0);
-        sBiTruth = psFitsReadImage(sBiTruth, sBiTruthFile, regionAll, 0);
+        psFree(fTruth);
+        psFree(sTruth);
+        psFree(fBiTruth);
+        psFree(sBiTruth);
+        fTruth = NULL;
+        sTruth = NULL;
+        fBiTruth = NULL;
+        sBiTruth = NULL;
+        fTruth = psFitsReadImage(fTruthFile, regionAll, 0);
+        sTruth = psFitsReadImage(sTruthFile, regionAll, 0);
+        fBiTruth = psFitsReadImage(fBiTruthFile, regionAll, 0);
+        sBiTruth = psFitsReadImage(sBiTruthFile, regionAll, 0);
         if (fTruth == NULL) {
             psError(PS_ERR_UNKNOWN, true,"verified psF32 image failed to be read (%d deg. rotation)",