IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39523 for trunk


Ignore:
Timestamp:
Apr 9, 2016, 12:00:29 PM (10 years ago)
Author:
eugene
Message:

fix namespace collision with TimeRange

Location:
trunk/Ohana/src/libdvo
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libdvo/include/convert.h

    r39521 r39523  
    1010time_t        TimeRef               PROTO((double time, time_t TimeReference, int TimeFormat));
    1111double        TimeValue             PROTO((time_t time, time_t TimeReference, int TimeFormat));
    12 double        TimeRange             PROTO((time_t time, int TimeFormat));
     12double        GetTimeRange          PROTO((time_t time, int TimeFormat));
    1313
    1414int           hh_hms                PROTO((double hh, int *hr, int *mn, double *sc));

  • trunk/Ohana/src/libdvo/include/dvodb.h

    r39521 r39523  
    492492int           GetTimeFormat         PROTO((time_t *TimeReference, int *TimeFormat));
    493493double        TimeValue             PROTO((time_t time, time_t TimeReference, int TimeFormat));
    494 double        TimeRange             PROTO((time_t time, int TimeFormat));
     494double        GetTimeRange          PROTO((time_t time, int TimeFormat));
    495495
    496496void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, e_time tzero, double trange, int TimeSelect));

  • trunk/Ohana/src/libdvo/src/convert.c

    r39521 r39523  
    262262 
    263263/* convert UNIX time (sec) range to a time range in the given unit */
    264 double TimeRange (time_t dt, int TimeFormat) {
     264double GetTimeRange (time_t dt, int TimeFormat) {
    265265
    266266  double value;

  • trunk/Ohana/src/libdvo/src/dbExtractAverages.c

    r39521 r39523  
    165165      break;
    166166    case AVE_TRANGE:
    167       value.Flt = TimeRange (average[0].Trange, TimeFormat);
     167      value.Flt = GetTimeRange (average[0].Trange, TimeFormat);
    168168      break;
    169169

  • trunk/Ohana/src/libdvo/src/dbExtractMeasures.c

    r39521 r39523  
    411411      break;
    412412    case MEAS_TMEAN: /* OK */
    413       value.Flt = TimeRange (average[0].Trange, TimeFormat);
     413      value.Flt = GetTimeRange (average[0].Trange, TimeFormat);
    414414      break;
    415415    case MEAS_TRANGE: /* OK */
Note: See TracChangeset for help on using the changeset viewer.