Changeset 6372 in ntrip for trunk/BNC/src/bnccore.cpp
- Timestamp:
- Dec 4, 2014, 3:01:32 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bnccore.cpp
r6175 r6372 84 84 _gpsEph[ii-PRN_GPS_START] = 0; 85 85 } 86 for (int ii = PRN_QZSS_START; ii <= PRN_QZSS_END; ii++) { 87 _qzssEph[ii-PRN_QZSS_START] = 0; 88 } 86 89 for (int ii = PRN_GLONASS_START; ii <= PRN_GLONASS_END; ii++) { 87 90 _glonassEph[ii-PRN_GLONASS_START] = 0; … … 143 146 for (int ii = PRN_GPS_START; ii <= PRN_GPS_END; ii++) { 144 147 delete _gpsEph[ii-PRN_GPS_START]; 148 } 149 for (int ii = PRN_QZSS_START; ii <= PRN_QZSS_END; ii++) { 150 delete _qzssEph[ii-PRN_QZSS_START]; 145 151 } 146 152 for (int ii = PRN_GLONASS_START; ii <= PRN_GLONASS_END; ii++) { … … 223 229 224 230 gpsephemeris** ee = &_gpsEph[gpseph->satellite-1]; 225 226 if ( *ee != 0 && 227 gpseph->GPSweek == (*ee)->GPSweek && gpseph->TOC == (*ee)->TOC ) { 231 if (PRN_GPS_START <= gpseph->satellite && gpseph->satellite <= PRN_GPS_END) { 232 ee = &_gpsEph[gpseph->satellite - PRN_GPS_START]; 233 } 234 else if (PRN_QZSS_START <= gpseph->satellite && gpseph->satellite <= PRN_QZSS_END) { 235 ee = &_qzssEph[gpseph->satellite - PRN_QZSS_START]; 236 } 237 238 if ( *ee != 0 && gpseph->GPSweek == (*ee)->GPSweek && gpseph->TOC == (*ee)->TOC ) { 228 239 checkEphemeris(*ee, gpseph); 229 240 } … … 379 390 delete _gpsEph[ii-PRN_GPS_START]; 380 391 _gpsEph[ii-PRN_GPS_START] = 0; 392 } 393 for (int ii = PRN_QZSS_START; ii <= PRN_QZSS_END; ii++) { 394 delete _qzssEph[ii-PRN_QZSS_START]; 395 _qzssEph[ii-PRN_QZSS_START] = 0; 381 396 } 382 397 for (int ii = PRN_GLONASS_START; ii <= PRN_GLONASS_END; ii++) {
Note:
See TracChangeset
for help on using the changeset viewer.