IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34051


Ignore:
Timestamp:
Jun 21, 2012, 6:51:32 AM (14 years ago)
Author:
eugene
Message:

changes needed for pedantic gcc

Location:
branches/eam_branches/ipp-20120601
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c

    r33337 r34051  
    693693static bool addjobMode(pxConfig *config)
    694694{
    695     bool    stampJob = false;
     695    bool stampJob = false;
    696696
    697697    PS_ASSERT_PTR_NON_NULL(config, false);
    … …  
    739739        return false;
    740740    }
     741    if (stampJob) { /* do something?? */ }
     742
    741743    if (!pstampJobInsert(config->dbh,
    742744            0,          // job_id
    … …  
    10441046    // it's an allowed arg because add_poll_args adds it
    10451047    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     1048    if (limit) { /* do something?? */
     1049
    10461050    PXOPT_LOOKUP_S16(fault, config->args, "-fault",  false, false);
    10471051
    … …  
    14481452    // it's an allowed arg because add_poll_args adds it
    14491453    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     1454    if (limit) { /* do something?? */ }
    14501455
    14511456    if (!psListLength(where->list)) {

  • branches/eam_branches/ipp-20120601/ppNorm/src/ppNormCalc.c

    r18071 r34051  
    8686        psMetadataItem *compsItem;      // Item from iteration
    8787        while ((compsItem = psMetadataGetAndIncrement(compsIter))) {
    88             if (compsItem->type != PS_TYPE_F32) {
     88            if (compsItem->type != PS_DATA_F32) {
    8989                psLogMsg("ppNormCalc", PS_LOG_WARN,
    9090                         "Component %s within exposure %s is not of type F32 --- ignored.\n",

  • branches/eam_branches/ipp-20120601/ppStack/src/ppStackMatch.c

    r33426 r34051  
    460460            psMetadataItem *item = NULL;// Item from iteration
    461461            while ((item = psMetadataGetAndIncrement(iter))) {
    462                 assert(item->type == PS_TYPE_F32);
     462                assert(item->type == PS_DATA_F32);
    463463                float norm = item->data.F32; // Normalisation
    464464                sum += norm;

  • branches/eam_branches/ipp-20120601/psLib/src/types/psMetadata.c

    r30024 r34051  
    15041504              fprintf(fd, "\n");
    15051505              break;
    1506             case PS_DATA_UNKNOWN:
    15071506            default:
    15081507              fprintf(fd, "<Unsupported type>\n");

  • branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataConfig.c

    r31902 r34051  
    15731573            }
    15741574            break;
    1575         case PS_DATA_UNKNOWN:
    15761575        default:
    15771576            psError(PS_ERR_BAD_PARAMETER_VALUE, true,

  • branches/eam_branches/ipp-20120601/psLib/src/types/psMetadataItemCompare.c

    r33998 r34051  
    278278                    return false;
    279279                }
    280                 double compareValue = compare->type == PS_TYPE_F32 ? compare->data.F32 : compare->data.F64;
     280                double compareValue = compare->type == PS_DATA_F32 ? compare->data.F32 : compare->data.F64;
    281281                COMPARE_VALUES(templateValue, compareValue, true);
    282282            }

  • branches/eam_branches/ipp-20120601/psModules/src/extras/psPipe.c

    r23487 r34051  
    105105
    106106        status = execvp (argv[0], argv);
    107 
    108         // this statement exits the child, not the parent, process
    109         exit (1);
     107        psWarning ("error running exec for child process");
     108        exit (1); // this statement exits the child, not the parent, process
    110109    }
    111110    psFree (cmd);

  • branches/eam_branches/ipp-20120601/psphot/src/Makefile.am

    r33690 r34051  
    183183        psphotSourcePlots.c            \
    184184        psphotRadialPlot.c             \
    185         psphotKronMasked.c             \
    186185        psphotKronIterate.c            \
    187186        psphotRadialProfileWings.c     \
    … …  
    209208        psphotSetNFrames.c
    210209
    211 # re-instate these
     210# not currently used
    212211#       psphotIsophotal.c              \
    213212#       psphotAnnuli.c                 \
    214213#       psphotKron.c                   \
     214#       psphotKronMasked.c             \
    215215#
    216216

  • branches/eam_branches/ipp-20120601/psphot/src/psphotCleanup.c

    r29548 r34051  
    2929psExit psphotGetExitStatus (void) {
    3030
    31     psErrorCode err = psErrorCodeLast ();
     31    // gcc -Wswitch complains here if err is declared as type psErrorCode
     32    // the collection of ps*ErrorCode values are enums defined separately for
     33    // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
     34    // not include the possible psphot values
     35
     36    // for now, to get around this, we just use an int for the switch
     37
     38    // psErrorCode err = psErrorCodeLast ();
     39    int err = psErrorCodeLast ();
    3240    switch (err) {
    3341      case PS_ERR_NONE:

  • branches/eam_branches/ipp-20120601/psphot/src/psphotMakeResiduals.c

    r30624 r34051  
    177177
    178178                mflux = 0;
    179                 bool offImage = false;
    180179                if (psImageInterpolate (&flux, &dflux, &mflux, ix, iy, interp) == PS_INTERPOLATE_STATUS_OFF) {
    181180                    // This pixel is off the image
    182                     offImage = true;
    183181                    fmasks->data.PS_TYPE_VECTOR_MASK_DATA[i] = badMask;
    184182                } else {

  • branches/eam_branches/ipp-20120601/psphot/src/psphotPetrosianStats.c

    r32348 r34051  
    4646
    4747    bool anyPetro = false;
    48     bool manyPetro = false;
     48    // bool manyPetro = false;  XXX not used
    4949    bool above = true;
    5050    float Asum = 0.0;
    … …  
    122122            }
    123123            above = false;
    124             if (anyPetro) manyPetro = true;
     124            // if (anyPetro) manyPetro = true;
    125125            anyPetro = true;
    126126        }
    … …  
    212212    source->extpars->petrosianR50    = R50;
    213213    source->extpars->petrosianR90    = R90;
    214     source->extpars->petrosianFill      = petApix / petArea;
     214    source->extpars->petrosianFill   = petApix / petArea;
    215215   
    216216    // XXX add the errors

  • branches/eam_branches/ipp-20120601/psphot/src/psphotReadoutCleanup.c

    r29936 r34051  
    77
    88    // remove internal pmFPAfiles, if created
    9     if (psErrorCodeLast() == PSPHOT_ERR_DATA) {
     9    if (psErrorCodeLast() == (psErrorCode) PSPHOT_ERR_DATA) {
    1010        psErrorStackPrint(stderr, "Error in the psphot readout analysis");
    1111        psErrorClear();

  • branches/eam_branches/ipp-20120601/psphot/src/psphotSignificanceImage.c

    r31154 r34051  
    88    float SIGMA_SMTH, NSIGMA_SMTH;
    99    bool status = false;
    10     bool guess = false;
    1110
    1211    // smooth the image and variance map
    … …  
    3534        SIGMA_SMTH  = 0.5*(fwhmMajor + fwhmMinor) / (2.0*sqrt(2.0*log(2.0)));
    3635        NSIGMA_SMTH = psMetadataLookupF32 (&status, recipe, "PEAKS_SMOOTH_NSIGMA");
    37         guess = false;
    3836    } else {
    3937        // if we do not know the FWHM, use the guess smoothing kernel supplied.
    … …  
    4341        NSIGMA_SMTH = psMetadataLookupF32 (&status, recipe, "PEAKS_SMOOTH_NSIGMA");
    4442        PS_ASSERT (status, NULL);
    45         guess = true;
    4643    }
    4744    // record the actual smoothing sigma

  • branches/eam_branches/ipp-20120601/pstamp/src/pstamprequest.c

    r26289 r34051  
    191191    bool        gotRange  = false;
    192192    bool        needROI   = false;
    193     bool        makeStamps= false;
     193    // bool        makeStamps= false; XXX unused
    194194    unsigned    optionMask = PSTAMP_SELECT_IMAGE;
    195195
    … …  
    212212        psMetadataAddStr (md, PS_LIST_TAIL, "JOB_TYPE", PS_META_REPLACE, "", "stamp");
    213213        needROI = true;
    214         makeStamps = true;
     214        // XXX unused makeStamps = true;
    215215    }
    216216

  • branches/eam_branches/ipp-20120601/pswarp/src/pswarpArguments.c

    r31159 r34051  
    2828pmConfig *pswarpArguments (int argc, char **argv) {
    2929
    30     bool status;
    3130    int N;
    3231
    … …  
    101100    array = psArrayAlloc(1);
    102101    array->data[0] = psStringCopy(argv[2]);
    103     status = psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
     102    psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
    104103    psFree(array);
    105104

  • branches/eam_branches/ipp-20120601/pswarp/src/pswarpExit.c

    r27563 r34051  
    2020    }
    2121
    22     psErrorCode errorCode = psErrorCodeLast(); // Error code
     22
     23    // gcc -Wswitch complains here if err is declared as type psErrorCode
     24    // the collection of ps*ErrorCode values are enums defined separately for
     25    // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
     26    // not include the possible psphot values
     27
     28    // for now, to get around this, we just use an int for the switch
     29
     30    // psErrorCode errorCode = psErrorCodeLast(); // Error code
     31    int errorCode = psErrorCodeLast(); // Error code
     32
    2333    if (errorCode != PS_ERR_NONE) {
    2434        pmFPAfileFreeSetStrict(false);

  • branches/eam_branches/ipp-20120601/pswarp/src/pswarpTransformReadout.c

    r33090 r34051  
    5151    }
    5252
    53     int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); // Number of threads
    54     if (!mdok) {
    55         nThreads = 0;
    56     }
     53    // XXX unused int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); // Number of threads
     54    // XXX unused if (!mdok) {
     55    // XXX unused     nThreads = 0;
     56    // XXX unused }
    5757    float poorFrac = psMetadataLookupF32(NULL, config->arguments, "POOR.FRAC"); ///< Flux fraction for "poor"
    5858
Note: See TracChangeset for help on using the changeset viewer.