Changeset 6442 in ntrip for trunk/BNC/src/RTCM/RTCM2Decoder.cpp

Timestamp:

Dec 26, 2014, 12:03:26 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/RTCM/RTCM2Decoder.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM/RTCM2Decoder.cpp

@@ -291 +291 @@
       prn = sys + QString("%1").arg(corr->PRN - 200, 2, 10, QChar('0'));
     }
-
-    const t_ephPair* ePair = ephPair(prn); 
 
     double L1 = 0;
@@ -354 +352 @@
 
       // Select corresponding ephemerides
-      if (ePair) {
-        if      (ePair->last && ePair->last->IOD() == IODcorr) {
-          eph = ePair->last;
-        }
-        else if (ePair->prev && ePair->prev->IOD() == IODcorr) {
-          eph = ePair->prev;
-        }
+      if      (ephLast(prn) && ephLast(prn)->IOD() == IODcorr) {
+        eph = ephLast(prn);
+      }
+      else if (ephPrev(prn) && ephPrev(prn)->IOD() == IODcorr) {
+        eph = ephPrev(prn);
       }