Changeset 34089 for trunk/pswarp

Timestamp:

Jun 26, 2012, 11:47:13 AM (14 years ago)

Author:

eugene

Message:

changes to support pedantic gcc warnings; add configure option for debug-build and no-as-needed

Location:

trunk/pswarp

Files:

• configure.ac (modified) (2 diffs)
• src/pswarpArguments.c (modified) (2 diffs)
• src/pswarpExit.c (modified) (1 diff)
• src/pswarpTransformReadout.c (modified) (1 diff)

trunk/pswarp/configure.ac

@@ -9 +9 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -33 +33 @@
 dnl Set CFLAGS for build
 IPP_STDOPTS
-CFLAGS="${CFLAGS} -Wall -Werror"
+IPP_STDCFLAGS
+
 echo "PSWARP_CFLAGS: $PSWARP_CFLAGS"
 echo "PSWARP_LIBS: $PSWARP_LIBS"

trunk/pswarp/src/pswarpArguments.c

@@ -28 +28 @@
 pmConfig *pswarpArguments (int argc, char **argv) {
 
-    bool status;
     int N;
 
@@ -101 +100 @@
     array = psArrayAlloc(1);
     array->data[0] = psStringCopy(argv[2]);
-    status = psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
+    psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
     psFree(array);
 

trunk/pswarp/src/pswarpExit.c

@@ -20 +20 @@
     }
 
-    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) {
         pmFPAfileFreeSetStrict(false);

trunk/pswarp/src/pswarpTransformReadout.c

@@ -51 +51 @@
     }
 
-    int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); // Number of threads
-    if (!mdok) {
-        nThreads = 0;
-    }
+    // XXX unused int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); // Number of threads
+    // XXX unused if (!mdok) {
+    // XXX unused     nThreads = 0;
+    // XXX unused }
     float poorFrac = psMetadataLookupF32(NULL, config->arguments, "POOR.FRAC"); ///< Flux fraction for "poor"