Index: /branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c =================================================================== --- /branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c (revision 34051) @@ -693,5 +693,5 @@ static bool addjobMode(pxConfig *config) { - bool stampJob = false; + bool stampJob = false; PS_ASSERT_PTR_NON_NULL(config, false); @@ -739,4 +739,6 @@ return false; } + if (stampJob) { /* do something?? */ } + if (!pstampJobInsert(config->dbh, 0, // job_id @@ -1044,4 +1046,6 @@ // it's an allowed arg because add_poll_args adds it PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + if (limit) { /* do something?? */ + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); @@ -1448,4 +1452,5 @@ // it's an allowed arg because add_poll_args adds it PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + if (limit) { /* do something?? */ } if (!psListLength(where->list)) { Index: /branches/eam_branches/ipp-20120601/ppNorm/src/ppNormCalc.c =================================================================== --- /branches/eam_branches/ipp-20120601/ppNorm/src/ppNormCalc.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/ppNorm/src/ppNormCalc.c (revision 34051) @@ -86,5 +86,5 @@ psMetadataItem *compsItem; // Item from iteration while ((compsItem = psMetadataGetAndIncrement(compsIter))) { - if (compsItem->type != PS_TYPE_F32) { + if (compsItem->type != PS_DATA_F32) { psLogMsg("ppNormCalc", PS_LOG_WARN, "Component %s within exposure %s is not of type F32 --- ignored.\n", Index: /branches/eam_branches/ipp-20120601/ppStack/src/ppStackMatch.c =================================================================== --- /branches/eam_branches/ipp-20120601/ppStack/src/ppStackMatch.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/ppStack/src/ppStackMatch.c (revision 34051) @@ -460,5 +460,5 @@ psMetadataItem *item = NULL;// Item from iteration while ((item = psMetadataGetAndIncrement(iter))) { - assert(item->type == PS_TYPE_F32); + assert(item->type == PS_DATA_F32); float norm = item->data.F32; // Normalisation sum += norm; Index: /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadata.c =================================================================== --- /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadata.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadata.c (revision 34051) @@ -1504,5 +1504,4 @@ fprintf(fd, "\n"); break; - case PS_DATA_UNKNOWN: default: fprintf(fd, "\n"); Index: /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataConfig.c =================================================================== --- /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataConfig.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataConfig.c (revision 34051) @@ -1573,5 +1573,4 @@ } break; - case PS_DATA_UNKNOWN: default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, Index: /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataItemCompare.c =================================================================== --- /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataItemCompare.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataItemCompare.c (revision 34051) @@ -278,5 +278,5 @@ return false; } - double compareValue = compare->type == PS_TYPE_F32 ? compare->data.F32 : compare->data.F64; + double compareValue = compare->type == PS_DATA_F32 ? compare->data.F32 : compare->data.F64; COMPARE_VALUES(templateValue, compareValue, true); } Index: /branches/eam_branches/ipp-20120601/psModules/src/extras/psPipe.c =================================================================== --- /branches/eam_branches/ipp-20120601/psModules/src/extras/psPipe.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psModules/src/extras/psPipe.c (revision 34051) @@ -105,7 +105,6 @@ status = execvp (argv[0], argv); - - // this statement exits the child, not the parent, process - exit (1); + psWarning ("error running exec for child process"); + exit (1); // this statement exits the child, not the parent, process } psFree (cmd); Index: /branches/eam_branches/ipp-20120601/psphot/src/Makefile.am =================================================================== --- /branches/eam_branches/ipp-20120601/psphot/src/Makefile.am (revision 34050) +++ /branches/eam_branches/ipp-20120601/psphot/src/Makefile.am (revision 34051) @@ -183,5 +183,4 @@ psphotSourcePlots.c \ psphotRadialPlot.c \ - psphotKronMasked.c \ psphotKronIterate.c \ psphotRadialProfileWings.c \ @@ -209,8 +208,9 @@ psphotSetNFrames.c -# re-instate these +# not currently used # psphotIsophotal.c \ # psphotAnnuli.c \ # psphotKron.c \ +# psphotKronMasked.c \ # Index: /branches/eam_branches/ipp-20120601/psphot/src/psphotCleanup.c =================================================================== --- /branches/eam_branches/ipp-20120601/psphot/src/psphotCleanup.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psphot/src/psphotCleanup.c (revision 34051) @@ -29,5 +29,13 @@ psExit psphotGetExitStatus (void) { - psErrorCode err = psErrorCodeLast (); + // 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 err = psErrorCodeLast (); + int err = psErrorCodeLast (); switch (err) { case PS_ERR_NONE: Index: /branches/eam_branches/ipp-20120601/psphot/src/psphotMakeResiduals.c =================================================================== --- /branches/eam_branches/ipp-20120601/psphot/src/psphotMakeResiduals.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psphot/src/psphotMakeResiduals.c (revision 34051) @@ -177,8 +177,6 @@ mflux = 0; - bool offImage = false; if (psImageInterpolate (&flux, &dflux, &mflux, ix, iy, interp) == PS_INTERPOLATE_STATUS_OFF) { // This pixel is off the image - offImage = true; fmasks->data.PS_TYPE_VECTOR_MASK_DATA[i] = badMask; } else { Index: /branches/eam_branches/ipp-20120601/psphot/src/psphotPetrosianStats.c =================================================================== --- /branches/eam_branches/ipp-20120601/psphot/src/psphotPetrosianStats.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psphot/src/psphotPetrosianStats.c (revision 34051) @@ -46,5 +46,5 @@ bool anyPetro = false; - bool manyPetro = false; + // bool manyPetro = false; XXX not used bool above = true; float Asum = 0.0; @@ -122,5 +122,5 @@ } above = false; - if (anyPetro) manyPetro = true; + // if (anyPetro) manyPetro = true; anyPetro = true; } @@ -212,5 +212,5 @@ source->extpars->petrosianR50 = R50; source->extpars->petrosianR90 = R90; - source->extpars->petrosianFill = petApix / petArea; + source->extpars->petrosianFill = petApix / petArea; // XXX add the errors Index: /branches/eam_branches/ipp-20120601/psphot/src/psphotReadoutCleanup.c =================================================================== --- /branches/eam_branches/ipp-20120601/psphot/src/psphotReadoutCleanup.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psphot/src/psphotReadoutCleanup.c (revision 34051) @@ -7,5 +7,5 @@ // remove internal pmFPAfiles, if created - if (psErrorCodeLast() == PSPHOT_ERR_DATA) { + if (psErrorCodeLast() == (psErrorCode) PSPHOT_ERR_DATA) { psErrorStackPrint(stderr, "Error in the psphot readout analysis"); psErrorClear(); Index: /branches/eam_branches/ipp-20120601/psphot/src/psphotSignificanceImage.c =================================================================== --- /branches/eam_branches/ipp-20120601/psphot/src/psphotSignificanceImage.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/psphot/src/psphotSignificanceImage.c (revision 34051) @@ -8,5 +8,4 @@ float SIGMA_SMTH, NSIGMA_SMTH; bool status = false; - bool guess = false; // smooth the image and variance map @@ -35,5 +34,4 @@ SIGMA_SMTH = 0.5*(fwhmMajor + fwhmMinor) / (2.0*sqrt(2.0*log(2.0))); NSIGMA_SMTH = psMetadataLookupF32 (&status, recipe, "PEAKS_SMOOTH_NSIGMA"); - guess = false; } else { // if we do not know the FWHM, use the guess smoothing kernel supplied. @@ -43,5 +41,4 @@ NSIGMA_SMTH = psMetadataLookupF32 (&status, recipe, "PEAKS_SMOOTH_NSIGMA"); PS_ASSERT (status, NULL); - guess = true; } // record the actual smoothing sigma Index: /branches/eam_branches/ipp-20120601/pstamp/src/pstamprequest.c =================================================================== --- /branches/eam_branches/ipp-20120601/pstamp/src/pstamprequest.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/pstamp/src/pstamprequest.c (revision 34051) @@ -191,5 +191,5 @@ bool gotRange = false; bool needROI = false; - bool makeStamps= false; + // bool makeStamps= false; XXX unused unsigned optionMask = PSTAMP_SELECT_IMAGE; @@ -212,5 +212,5 @@ psMetadataAddStr (md, PS_LIST_TAIL, "JOB_TYPE", PS_META_REPLACE, "", "stamp"); needROI = true; - makeStamps = true; + // XXX unused makeStamps = true; } Index: /branches/eam_branches/ipp-20120601/pswarp/src/pswarpArguments.c =================================================================== --- /branches/eam_branches/ipp-20120601/pswarp/src/pswarpArguments.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/pswarp/src/pswarpArguments.c (revision 34051) @@ -28,5 +28,4 @@ pmConfig *pswarpArguments (int argc, char **argv) { - bool status; int N; @@ -101,5 +100,5 @@ 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); Index: /branches/eam_branches/ipp-20120601/pswarp/src/pswarpExit.c =================================================================== --- /branches/eam_branches/ipp-20120601/pswarp/src/pswarpExit.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/pswarp/src/pswarpExit.c (revision 34051) @@ -20,5 +20,15 @@ } - 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); Index: /branches/eam_branches/ipp-20120601/pswarp/src/pswarpTransformReadout.c =================================================================== --- /branches/eam_branches/ipp-20120601/pswarp/src/pswarpTransformReadout.c (revision 34050) +++ /branches/eam_branches/ipp-20120601/pswarp/src/pswarpTransformReadout.c (revision 34051) @@ -51,8 +51,8 @@ } - 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"