diff --git a/source/mrserver.cpp b/source/mrserver.cpp index fb98ba940ffdb7126e5e715f5ae4226c2c622e53..337c76f2fdac22998da2e09a57885fb4185f202d 100644 --- a/source/mrserver.cpp +++ b/source/mrserver.cpp @@ -158,7 +158,7 @@ void MRServer::loadVoc(QString path, int poolSize) fDebug << "Place ORBvoc.txt in the executable's directory."; fDebug << "ORBvoc.txt can be found in /externals/ORB_SLAM2/Vocabulary/ORBvoc.txt.tar.gz"; } else { - fDebug << "Vocabulary object added loaded to the pool."; + fDebug << "Vocabulary object added to the pool."; } } } diff --git a/source/networkconnection.h b/source/networkconnection.h index 933760669bd9d5e1e8fcc9c8a835235b66443348..9ec63e175a175b1d0eb1ba09ca81387207ef3c6f 100644 --- a/source/networkconnection.h +++ b/source/networkconnection.h @@ -46,6 +46,13 @@ public: File(const File &rhs) : id(rhs.id), type(rhs.type), data(rhs.data), metadata(rhs.metadata) {} + File& operator=(const File &rhs) { + data = rhs.data; + type = rhs.type; + id = rhs.id; + metadata = rhs.metadata; + return *this; + } quint32 id; qint16 type; QByteArrayPtr data; diff --git a/source/videoreceiver.cpp b/source/videoreceiver.cpp index 40f5d58800518c2238d13e53686887bb72b426a0..58609e4c8993582eaa799f8e5aac0d75147ac061 100644 --- a/source/videoreceiver.cpp +++ b/source/videoreceiver.cpp @@ -181,7 +181,7 @@ GstFlowReturn frame_received_callback(GstAppSink *appsink, gpointer data) gst_buffer_map(buffer, &map, GST_MAP_READ); // Convert gstreamer data to OpenCV Mat auto currFrame = cvMatPtr(new cv::Mat(cv::Size(width, height), CV_8UC3)); - memcpy(currFrame->data, map.data, width * height * 3); + memcpy(currFrame->data, map.data, static_cast<size_t>(width * height * 3)); gst_buffer_unmap(buffer, &map); gst_sample_unref(sample); @@ -513,7 +513,7 @@ void GStreamerReceiver::stop() fDebug << "Stopping GStreamerReceiver"; mCtx->running = false; if (mCtx->mainLoop != nullptr) { - g_main_quit(mCtx->mainLoop); + g_main_loop_quit(mCtx->mainLoop); } mCtx->mainLoop = nullptr; }