Changeset 42501

Timestamp:

Aug 16, 2023, 8:42:18 AM (3 years ago)

Author:

eugene

Message:

fix tests to deal with API change to psPlaneTransformAlloc and the warnings from newer gcc version (sprintf -> ps_snprintf_nowarn); tests build (though many fail)

Location:

branches/eam_branches/ipp-20230313/psModules/test

Files:

• astrom/tap_pmAstrometry.c (modified) (1 diff)
• astrom/tap_pmAstrometryWCS_DVO.c (modified) (1 diff)
• astrom/tap_pmAstrometryWCS_DVO2.c (modified) (1 diff)
• astrom/tap_pmAstrometryWCS_DVO3.c (modified) (1 diff)
• astrom/tap_pmAstrometryWCS_DVO4.c (modified) (2 diffs)
• camera/tap_pmAstrometry.c (modified) (1 diff)
• camera/tap_pmFPA.c (modified) (1 diff)
• camera/tap_pmFPACellSquish.c (modified) (1 diff)
• camera/tap_pmFPACopy.c (modified) (1 diff)
• camera/tap_pmFPAExtent.c (modified) (1 diff)
• camera/tap_pmFPAFlags.c (modified) (1 diff)
• camera/tap_pmFPAHeader.c (modified) (1 diff)
• camera/tap_pmFPAMaskW.c (modified) (1 diff)
• camera/tap_pmFPAReadWrite.c (modified) (1 diff)
• camera/tap_pmFPAUtils.c (modified) (1 diff)
• camera/tap_pmFPAView.c (modified) (1 diff)
• camera/tap_pmHDUUtils.c (modified) (1 diff)
• concepts/tap_pmConceptsAverage.c (modified) (1 diff)
• concepts/tap_pmConceptsUpdate.c (modified) (1 diff)
• config/tap_pmConfigCommand.c (modified) (1 diff)
• objects/tap_pmPSF_IO.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/psModules/test/astrom/tap_pmAstrometry.c

@@ -32 +32 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/astrom/tap_pmAstrometryWCS_DVO.c

@@ -470 +470 @@
     psMetadata *header = psMetadataAlloc();
 
-    sprintf (name, "RA--%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "RA--%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE1", PS_META_REPLACE, "", name);
-    sprintf (name, "DEC-%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "DEC-%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE2", PS_META_REPLACE, "", name);
 

branches/eam_branches/ipp-20230313/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c

@@ -572 +572 @@
     psMetadata *header = psMetadataAlloc();
 
-    sprintf (name, "RA--%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "RA--%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE1", PS_META_REPLACE, "", name);
-    sprintf (name, "DEC-%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "DEC-%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE2", PS_META_REPLACE, "", name);
 

branches/eam_branches/ipp-20230313/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c

@@ -597 +597 @@
     psMetadata *header = psMetadataAlloc();
 
-    sprintf (name, "RA--%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "RA--%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE1", PS_META_REPLACE, "", name);
-    sprintf (name, "DEC-%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "DEC-%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE2", PS_META_REPLACE, "", name);
 

branches/eam_branches/ipp-20230313/psModules/test/astrom/tap_pmAstrometryWCS_DVO4.c

@@ -23 +23 @@
 void test2x(); // small rotation with central offset
 void test3x(); // 2nd order term in WRP with central offset
+
+bool RegisterMosaic (Coords *in) {
+    return true;
+}
 
 int main (void)
@@ -898 +902 @@
     psMetadata *header = psMetadataAlloc();
 
-    sprintf (name, "RA--%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "RA--%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE1", PS_META_REPLACE, "", name);
-    sprintf (name, "DEC-%s", &coords[0].ctype[4]);
+    ps_snprintf_nowarn (name, 16, "DEC-%s", &coords[0].ctype[4]);
     psMetadataAddStr (header, PS_LIST_TAIL, "CTYPE2", PS_META_REPLACE, "", name);
 

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmAstrometry.c

@@ -60 +60 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPA.c

@@ -23 +23 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPACellSquish.c

@@ -35 +35 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPACopy.c

@@ -28 +28 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAExtent.c

@@ -33 +33 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAFlags.c

@@ -56 +56 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAHeader.c

@@ -30 +30 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAMaskW.c

@@ -39 +39 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAReadWrite.c

@@ -33 +33 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAUtils.c

@@ -29 +29 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmFPAView.c

@@ -29 +29 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/camera/tap_pmHDUUtils.c

@@ -29 +29 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/concepts/tap_pmConceptsAverage.c

@@ -35 +35 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/concepts/tap_pmConceptsUpdate.c

@@ -34 +34 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;

branches/eam_branches/ipp-20230313/psModules/test/config/tap_pmConfigCommand.c

@@ -140 +140 @@
             psMetadataItem *item;
             while ((item = psMetadataGetAndIncrement(iter))) {
-                assert(item->type == PS_TYPE_S32);
+                assert(item->type == PS_DATA_S32);
                 psStringAppend(&verifyCmd, " -trace %s %d", item->name, item->data.S32);
             }

branches/eam_branches/ipp-20230313/psModules/test/objects/tap_pmPSF_IO.c

@@ -32 +32 @@
 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM()
 {
-    psPlaneTransform *pt = psPlaneTransformAlloc(1, 1);
+  psPlaneTransform *pt = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     pt->x->coeff[1][0] = 1.0;
     pt->y->coeff[0][1] = 1.0;