IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23487 for trunk/psModules


Ignore:
Timestamp:
Mar 23, 2009, 9:42:42 AM (17 years ago)
Author:
Paul Price
Message:

Functions declared as 'type function()' cause errors with the Intel compiler ('error #310: old-style parameter list (anachronism)'), which wants 'type function()'. These instances haven't caused problems yet, and I'm trying to avoid that.

Location:
trunk/psModules/src
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/pmAstrometryDistortion.c

    r21183 r23487  
    4040}
    4141
    42 pmAstromGradient *pmAstromGradientAlloc ()
     42pmAstromGradient *pmAstromGradientAlloc (void)
    4343{
    4444
    … …  
    126126            grad = pmAstromGradientAlloc ();
    127127
    128             // XXX psTraceSetLevel("psLib.math.psVectorClipFitPolynomial2D", 7);
     128            // XXX psTraceSetLevel("psLib.math.psVectorClipFitPolynomial2D", 7);
    129129
    130130            // fit the collection of positions and offsets with a local 1st order gradient
    … …  
    138138            grad->dTPdM.x = local->coeff[0][1];
    139139
    140             // XXX psTraceSetLevel("psLib.math.psVectorClipFitPolynomial2D", 0);
     140            // XXX psTraceSetLevel("psLib.math.psVectorClipFitPolynomial2D", 0);
    141141
    142142            // fit the collection of positions and offsets with a local 1st order gradient

  • trunk/psModules/src/astrom/pmAstrometryDistortion.h

    r12486 r23487  
    2727pmAstromGradient;
    2828
    29 pmAstromGradient *pmAstromGradientAlloc ();
     29pmAstromGradient *pmAstromGradientAlloc (void);
    3030
    3131/* The following function determines the position residual, in the tangent

  • trunk/psModules/src/astrom/pmAstrometryVisual.c

    r23242 r23487  
    4747/* Initialization Routines  */
    4848
    49 bool pmAstromVisualClose()
     49bool pmAstromVisualClose(void)
    5050{
    5151    if(kapa != -1)

  • trunk/psModules/src/astrom/pmAstrometryVisual.h

    r23242 r23487  
    2626/** Close plotting windows at the end of a run
    2727 * @return true for success */
    28 bool pmAstromVisualClose();
     28bool pmAstromVisualClose(void);
    2929
    3030

  • trunk/psModules/src/camera/pmFPAfile.c

    r23358 r23487  
    5858}
    5959
    60 pmFPAfile *pmFPAfileAlloc()
     60pmFPAfile *pmFPAfileAlloc(void)
    6161{
    6262    pmFPAfile *file = psAlloc(sizeof(pmFPAfile));

  • trunk/psModules/src/camera/pmFPAfile.h

    r23358 r23487  
    115115
    116116// allocate an empty pmFPAfile structure
    117 pmFPAfile *pmFPAfileAlloc ();
     117pmFPAfile *pmFPAfileAlloc(void);
    118118
    119119// select the readout from the named pmFPAfile; if the named file does not exist,

  • trunk/psModules/src/detrend/pmDetrendDB.h

    r23268 r23487  
    6363
    6464pmDetrendSelectOptions *pmDetrendSelectOptionsAlloc(const char *camera, psTime time, pmDetrendType type);
    65 pmDetrendSelectResults *pmDetrendSelectResultsAlloc();
     65pmDetrendSelectResults *pmDetrendSelectResultsAlloc(void);
    6666pmDetrendSelectResults *pmDetrendSelect (const pmDetrendSelectOptions *options, const pmConfig *config);
    6767char *pmDetrendFile (const char *detID, const char *classID, const pmConfig *config);

  • trunk/psModules/src/detrend/pmDetrendThreads.h

    r18893 r23487  
    1818
    1919/// get the requested number of scan rows per thread
    20 int pmDetrendGetScanRows ();
     20int pmDetrendGetScanRows(void);
    2121
    2222/// @}

  • trunk/psModules/src/detrend/pmShutterCorrection.c

    r23259 r23487  
    7171}
    7272
    73 pmShutterCorrection *pmShutterCorrectionAlloc()
     73pmShutterCorrection *pmShutterCorrectionAlloc(void)
    7474{
    7575    pmShutterCorrection *corr = (pmShutterCorrection*)psAlloc(sizeof(pmShutterCorrection));

  • trunk/psModules/src/detrend/pmShutterCorrection.h

    r21509 r23487  
    6969
    7070/// Allocator for shutter correction parameters
    71 pmShutterCorrection *pmShutterCorrectionAlloc();
     71pmShutterCorrection *pmShutterCorrectionAlloc(void);
    7272
    7373/// Guess a shutter correction, based on plot of counts vs exposure time

  • trunk/psModules/src/extras/pmKapaPlots.c

    r13896 r23487  
    4747}
    4848
    49 bool pmKapaClose ()
     49bool pmKapaClose (void)
    5050{
    5151

  • trunk/psModules/src/extras/pmKapaPlots.h

    r12696 r23487  
    11/* @file  pmKapaPlots.h
    2  * @brief functions to make plots with the external program 'kapa' 
     2 * @brief functions to make plots with the external program 'kapa'
    33 *
    44 * @author EAM, IfA
    … …  
    1717// move to psLib or psModules
    1818int pmKapaOpen (bool showWindow);
    19 bool pmKapaClose ();
     19bool pmKapaClose(void);
    2020bool pmKapaPlotVectorPair (psVector *xVec, psVector *yVec);
    2121

  • trunk/psModules/src/extras/psPipe.c

    r12888 r23487  
    3535}
    3636
    37 psPipe *psPipeAlloc ()
     37psPipe *psPipeAlloc (void)
    3838{
    3939    psPipe *pipe = (psPipe *)psAlloc(sizeof(psPipe));

  • trunk/psModules/src/extras/psPipe.h

    r11253 r23487  
    11/* @file  psPipe.h
    2  * @brief 3-stream pipe 
     2 * @brief 3-stream pipe
    33 *
    44 * @author EAM, IfA
    … …  
    2626
    2727// psPipe functions
    28 psPipe *psPipeAlloc ();
     28psPipe *psPipeAlloc (void);
    2929psPipe *psPipeOpen (char *command);
    3030int     psPipeClose (psPipe *pipe);

  • trunk/psModules/src/imcombine/pmSubtractionVisual.c

    r23242 r23487  
    4444
    4545/** destroy windows at the end of a run*/
    46 bool pmSubtractionVisualClose()
     46bool pmSubtractionVisualClose(void)
    4747{
    4848    if(kapa != -1)
    … …  
    256256
    257257#else
    258 bool pmSubtractionVisualClose() {return true;}
     258bool pmSubtractionVisualClose(void) {return true;}
    259259bool pmSubtractionVisualPlotConvKernels(psImage *convKernels) {return true;}
    260260bool pmSubtractionVisualPlotStamps(pmSubtractionStampList *stamps, pmReadout *ro) {return true;}

  • trunk/psModules/src/imcombine/pmSubtractionVisual.h

    r23242 r23487  
    22#define PM_SUBTRACTION_VISUAL_H
    33
    4 bool pmSubtractionVisualClose();
     4bool pmSubtractionVisualClose(void);
    55bool pmSubtractionVisualPlotConvKernels(psImage *convKernels);
    66bool pmSubtractionVisualPlotStamps(pmSubtractionStampList *stamps, pmReadout *ro);

  • trunk/psModules/src/objects/pmDetections.c

    r18828 r23487  
    3030
    3131// generate a pmDetections container with empty (allocated) footprints and peaks containers
    32 pmDetections *pmDetectionsAlloc() {
     32pmDetections *pmDetectionsAlloc(void) {
    3333
    3434    pmDetections *detections = (pmDetections *)psAlloc(sizeof(pmDetections));

  • trunk/psModules/src/objects/pmDetections.h

    r18828 r23487  
    2020 */
    2121typedef struct {
    22   psArray *footprints;        // collection of footprints in the image
    23   psArray *peaks;             // collection of all peaks contained by the footprints
    24   psArray *oldPeaks;          // collection of all peaks previously found
     22  psArray *footprints;        // collection of footprints in the image
     23  psArray *peaks;             // collection of all peaks contained by the footprints
     24  psArray *oldPeaks;          // collection of all peaks previously found
    2525  int last;
    2626} pmDetections;
    2727
    28 pmDetections *pmDetectionsAlloc ();
     28pmDetections *pmDetectionsAlloc (void);
    2929
    3030/// @}

  • trunk/psModules/src/objects/pmMoments.c

    r23187 r23487  
    2525to zero.
    2626*****************************************************************************/
    27 pmMoments *pmMomentsAlloc()
     27pmMoments *pmMomentsAlloc(void)
    2828{
    2929    psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__);

  • trunk/psModules/src/objects/pmMoments.h

    r19879 r23487  
    5353 *
    5454 */
    55 pmMoments *pmMomentsAlloc();
     55pmMoments *pmMomentsAlloc(void);
    5656
    5757/// @}

  • trunk/psModules/src/objects/pmPSF.c

    r20937 r23487  
    5454}
    5555
    56 pmPSFOptions *pmPSFOptionsAlloc () {
     56pmPSFOptions *pmPSFOptionsAlloc (void) {
    5757
    5858    pmPSFOptions *options = (pmPSFOptions *) psAlloc(sizeof(pmPSFOptions));

  • trunk/psModules/src/objects/pmPSF.h

    r21183 r23487  
    9696pmPSF *pmPSFAlloc (const pmPSFOptions *options);
    9797bool psMemCheckPSF(psPtr ptr);
    98 pmPSFOptions *pmPSFOptionsAlloc();
     98pmPSFOptions *pmPSFOptionsAlloc(void);
    9999bool psMemCheckPSFOptions(psPtr ptr);
    100100

  • trunk/psModules/src/objects/pmSource.h

    r23184 r23487  
    105105 *
    106106 */
    107 pmSource  *pmSourceAlloc();
     107pmSource  *pmSourceAlloc(void);
    108108
    109109/** pmSourceCopy()

  • trunk/psModules/src/objects/pmSourceExtendedPars.c

    r21363 r23487  
    4646}
    4747
    48 pmSourceExtendedPars *pmSourceExtendedParsAlloc () {
     48pmSourceExtendedPars *pmSourceExtendedParsAlloc (void) {
    4949    pmSourceExtendedPars *pars = (pmSourceExtendedPars *) psAlloc(sizeof(pmSourceExtendedPars));
    5050    psMemSetDeallocator(pars, (psFreeFunc) pmSourceExtendedParsFree);
    … …  
    7575}
    7676
    77 pmSourceRadialProfile *pmSourceRadialProfileAlloc () {
     77pmSourceRadialProfile *pmSourceRadialProfileAlloc (void) {
    7878
    7979    pmSourceRadialProfile *profile = (pmSourceRadialProfile *) psAlloc(sizeof(pmSourceRadialProfile));
    … …  
    9999}
    100100
    101 pmSourceIsophotalValues *pmSourceIsophotalValuesAlloc () {
     101pmSourceIsophotalValues *pmSourceIsophotalValuesAlloc (void) {
    102102
    103103    pmSourceIsophotalValues *isophot = (pmSourceIsophotalValues *) psAlloc(sizeof(pmSourceIsophotalValues));
    … …  
    125125}
    126126
    127 pmSourcePetrosianValues *pmSourcePetrosianValuesAlloc () {
     127pmSourcePetrosianValues *pmSourcePetrosianValuesAlloc (void) {
    128128
    129129    pmSourcePetrosianValues *petrosian = (pmSourcePetrosianValues *) psAlloc(sizeof(pmSourcePetrosianValues));
    … …  
    150150}
    151151
    152 pmSourceKronValues *pmSourceKronValuesAlloc () {
     152pmSourceKronValues *pmSourceKronValuesAlloc (void) {
    153153
    154154    pmSourceKronValues *kron = (pmSourceKronValues *) psAlloc(sizeof(pmSourceKronValues));
    … …  
    181181}
    182182
    183 pmSourceAnnuli *pmSourceAnnuliAlloc () {
     183pmSourceAnnuli *pmSourceAnnuliAlloc (void) {
    184184
    185185    pmSourceAnnuli *annuli = (pmSourceAnnuli *) psAlloc(sizeof(pmSourceAnnuli));

  • trunk/psModules/src/objects/pmSourceExtendedPars.h

    r21363 r23487  
    5555} pmSourceExtendedPars;
    5656
    57 pmSourceExtendedPars *pmSourceExtendedParsAlloc ();
     57pmSourceExtendedPars *pmSourceExtendedParsAlloc(void);
    5858bool psMemCheckSourceExtendedPars(psPtr ptr);
    59 pmSourceRadialProfile *pmSourceRadialProfileAlloc ();
     59pmSourceRadialProfile *pmSourceRadialProfileAlloc(void);
    6060bool psMemCheckSourceRadialProfile(psPtr ptr);
    61 pmSourceIsophotalValues *pmSourceIsophotalValuesAlloc ();
     61pmSourceIsophotalValues *pmSourceIsophotalValuesAlloc(void);
    6262bool psMemCheckSourceIsophotalValues(psPtr ptr);
    63 pmSourcePetrosianValues *pmSourcePetrosianValuesAlloc ();
     63pmSourcePetrosianValues *pmSourcePetrosianValuesAlloc(void);
    6464bool psMemCheckSourcePetrosianValues(psPtr ptr);
    65 pmSourceKronValues *pmSourceKronValuesAlloc ();
     65pmSourceKronValues *pmSourceKronValuesAlloc(void);
    6666bool psMemCheckSourceKronValues(psPtr ptr);
    67 pmSourceAnnuli *pmSourceAnnuliAlloc ();
     67pmSourceAnnuli *pmSourceAnnuliAlloc(void);
    6868bool psMemCheckSourceAnnuli(psPtr ptr);
    6969

  • trunk/psModules/src/objects/pmSourceFitSet.c

    r23187 r23487  
    6767}
    6868
    69 void pmSourceFitSetDone () {
     69void pmSourceFitSetDone (void) {
    7070    psFree (fitSets);
    7171}
    … …  
    150150}
    151151
    152 pmSourceFitSetData *pmSourceFitSetDataGet () {
     152pmSourceFitSetData *pmSourceFitSetDataGet (void) {
    153153
    154154    psAssert (fitSets, "pmSourceFitSetInit not called");
    … …  
    172172}
    173173
    174 void pmSourceFitSetDataClear () {
     174void pmSourceFitSetDataClear (void) {
    175175
    176176    int i;

  • trunk/psModules/src/objects/pmSourceFitSet.h

    r21183 r23487  
    2424// use this function to init the fit sets based on the number of threads
    2525bool pmSourceFitSetInit (int nThreads);
    26 void pmSourceFitSetDone ();
     26void pmSourceFitSetDone (void);
    2727
    2828// initialize data for a group of object models
    … …  
    3232// functions for selecting the FitSet corresponding to the current thread
    3333pmSourceFitSetData *pmSourceFitSetDataSet (psArray *modelSet);
    34 pmSourceFitSetData *pmSourceFitSetDataGet ();
    35 void pmSourceFitSetDataClear ();
     34pmSourceFitSetData *pmSourceFitSetDataGet (void);
     35void pmSourceFitSetDataClear (void);
    3636
    3737// function used to set limits for a group of models
    … …  
    5454 */
    5555bool pmSourceFitSet(
    56     pmSource *source,                   ///< The input pmSource
    57     psArray *modelSet,                  ///< model to be fitted
    58     pmSourceFitMode mode,               ///< define parameters to be fitted
    59     psImageMaskType maskVal             ///< Vale to mask
     56    pmSource *source,                   ///< The input pmSource
     57    psArray *modelSet,                  ///< model to be fitted
     58    pmSourceFitMode mode,               ///< define parameters to be fitted
     59    psImageMaskType maskVal             ///< Vale to mask
    6060
    6161);

  • trunk/psModules/src/objects/pmSourcePlots.c

    r19849 r23487  
    139139}
    140140
    141 pmSourcePlotLayout *pmSourcePlotLayoutAlloc()
     141pmSourcePlotLayout *pmSourcePlotLayoutAlloc(void)
    142142{
    143143    pmSourcePlotLayout *layout = (pmSourcePlotLayout *)psAlloc(sizeof(pmSourcePlotLayout));

  • trunk/psModules/src/objects/pmSourcePlots.h

    r15562 r23487  
    2929// typedef bool (*pmSourcePlotFunction)(pmConfig *config, pmFPAview *view, pmSourcePlotLayout *layout);
    3030
    31 pmSourcePlotLayout *pmSourcePlotLayoutAlloc();
     31pmSourcePlotLayout *pmSourcePlotLayoutAlloc(void);
    3232bool psMemCheckSourcePlotLayout(psPtr ptr);
    3333
Note: See TracChangeset for help on using the changeset viewer.