Changeset 34052 for branches/eam_branches/ipp-20120601/ppStack/src

Timestamp:

Jun 22, 2012, 6:52:56 AM (14 years ago)

Author:

eugene

Message:

changes to satisfy more pedantic gcc

Location:

branches/eam_branches/ipp-20120601/ppStack/src

Files:

• ppStackConvolve.c (modified) (2 diffs)
• ppStackFinish.c (modified) (1 diff)
• ppStackTarget.c (modified) (1 diff)

branches/eam_branches/ipp-20120601/ppStack/src/ppStackConvolve.c

@@ -7 +7 @@
         psMetadataItem *item = psMetadataLookup(SOURCE->concepts, NAME); \
         psAssert(item, "Concept should be present");                    \
-        psAssert(item->type == PS_TYPE_F32, "Concept should be F32");   \
+        psAssert(item->type == PS_DATA_F32, "Concept should be F32");   \
         item->data.F32 = VALUE;                                         \
     }
@@ -101 +101 @@
         if (!ppStackMatch(readout, target, options, i, config)) {
             // XXX many things can cause a failure of ppStackMatch -- should some be handled differently?
-            psErrorCode error = psErrorCodeLast(); // Error code
+
+            // gcc -Wswitch complains here if err is declared as type psErrorCode
+            // the collection of ps*ErrorCode values are enums defined separately for 
+            // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
+            // not include the possible psphot values
+
+            // for now, to get around this, we just use an int for the switch
+
+            // psErrorCode error = psErrorCodeLast(); // Error code
+            int error = psErrorCodeLast(); // Error code
             switch (error) {
                 // Fatal errors

branches/eam_branches/ipp-20120601/ppStack/src/ppStackFinish.c

@@ -45 +45 @@
     }
 
-    psErrorCode errorCode = psErrorCodeLast(); // Error code
+    // gcc -Wswitch complains here if err is declared as type psErrorCode
+    // the collection of ps*ErrorCode values are enums defined separately for 
+    // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
+    // not include the possible psphot values
+
+    // for now, to get around this, we just use an int for the switch
+
+    // psErrorCode errorCode = psErrorCodeLast(); // Error code
+    int errorCode = psErrorCodeLast(); // Error code
     if (errorCode == PS_ERR_NONE) {
         return exitValue;

branches/eam_branches/ipp-20120601/ppStack/src/ppStackTarget.c

@@ -191 +191 @@
 
         float norm = powf(10.0, -0.4 * options->norm->data.F32[i]); // Normalisation from stars
-        float meanVariance = bg->robustMedian * PS_SQR(norm);       // Mean variance in normalised image
+        float meanVariance = mean * PS_SQR(norm);       // Mean variance in normalised image
 
         if (meanVariance < minVariance) {