diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/camera/veyeimx287m.cpp | 22 | ||||
| -rw-r--r-- | src/httpservice.cpp | 12 |
2 files changed, 8 insertions, 26 deletions
diff --git a/src/camera/veyeimx287m.cpp b/src/camera/veyeimx287m.cpp index 3f3a9e6..b8fdbb4 100644 --- a/src/camera/veyeimx287m.cpp +++ b/src/camera/veyeimx287m.cpp @@ -16,11 +16,7 @@ #include <QElapsedTimer> -<<<<<<< Updated upstream -// orpheus -======= #include "camera/veye_i2c.h" ->>>>>>> Stashed changes #include "constants.h" #include "httpservice.h" #include "imagealgos.h" @@ -654,7 +650,6 @@ bool VeyeIMX287m::initCam() return true; } -<<<<<<< Updated upstream bool VeyeIMX287m::initHttpServer() { m_httpServer = std::make_shared<HttpServer>(this); @@ -662,23 +657,6 @@ bool VeyeIMX287m::initHttpServer() return m_httpServer != nullptr; } -void VeyeIMX287m::dequeueFrameLoop(std::stop_token stopToken) -{ - // std::cout << "VeyeIMX287m: start stream" << std::endl; - - // while (!stopToken.stop_requested()) { - // size_t imageIndex{}; - - // if (!dequeueImageBuffer(imageIndex)) - // // break; - // continue; - // } - - // std::cout << "VeyeIMX287m: stream interruption requested" << std::endl; -} - -======= ->>>>>>> Stashed changes void VeyeIMX287m::calcFrameLoop(std::stop_token stopToken) { QElapsedTimer t; diff --git a/src/httpservice.cpp b/src/httpservice.cpp index 14cf60d..efcf17f 100644 --- a/src/httpservice.cpp +++ b/src/httpservice.cpp @@ -44,10 +44,14 @@ QHttpServerResponse HttpServer::GET_pixels() // std::shared_ptr<std::nullptr_t> logTime = std::make_shared<std::nullptr_t>(nullptr, [t]() { // qDebug() << "HttpServer::GET_pixels: elapsed" << t.nsecsElapsed() / 1000 << "(us)"; // }); - const std::shared_ptr<std::nullptr_t> logTime{nullptr, [t](auto unused_ptr) { - qDebug() << "HttpServer::GET_pixels: elapsed" - << t.nsecsElapsed() / 1000 << "(us)"; - }}; + static constexpr bool logTime{false}; + if constexpr (logTime) { + const std::shared_ptr<std::nullptr_t> + timeLogger{nullptr, [t](auto unused_ptr) { + qDebug() << "HttpServer::GET_pixels: elapsed" << t.nsecsElapsed() / 1000 + << "(us)"; + }}; + } Image img; { |