Changeset 879 in ntrip for trunk/BNC/RTCM3/RTCM3coDecoder.cpp

Timestamp:

May 6, 2008, 5:07:41 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/RTCM3/RTCM3coDecoder.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -65 +65 @@
 
   while (true) {
+    int bytesused = 0;
     memset(&_co, 0, sizeof(_co));
-    int irc = GetClockOrbitBias(&_co, &_bias, 
-                                _buffer.data(), _buffer.size());
-    if      (irc == -2) {  // not enough data
+    GCOB_RETURN irc = GetClockOrbitBias(&_co, &_bias, _buffer.data(), 
+                                        _buffer.size(), &bytesused);
+
+    if      (irc == GCOBR_SHORTBUFFER ||
+             irc == GCOBR_MESSAGEEXCEEDSBUFFER) {  // not enough data
       return failure;
     }
-    else if (irc == -3) {  // not synchronized
-      _buffer = _buffer.substr(1);
-    }
-    else if (irc == 0) {
+    
+    else if (irc == GCOBR_OK && bytesused > 0) {
       for(int ii = 0; ii < _co.NumberOfGPSSat; ++ii) {
         QString line;
@@ -84 +85 @@
         _out->flush();
       }
-      char obuffer[CLOCKORBIT_BUFFERSIZE];
-      int len = MakeClockOrbit(&_co, COTYPE_AUTO, 0, obuffer, sizeof(obuffer));
-      if (len > 0) {
-        _buffer = _buffer.substr(len);
-      }
-      else {
-        _buffer = _buffer.substr(1);
-      }
+      _buffer = _buffer.substr(bytesused);
       return success;
     }
+
     else {
-      return failure;
+      _buffer = _buffer.substr(1);
     }
   }