mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

samples: fix build without threading support

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-19 09:28:12 +00:00
parent 0e86e292e4
commit 6d5fdfbf73
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/CMakeLists.txt
View File

@ -120,6 +120,7 @@ else()
find_package(Threads) find_package(Threads)
endif() endif()
if((TARGET Threads::Threads OR HAVE_THREADS) AND NOT OPENCV_EXAMPLES_DISABLE_THREADS) if((TARGET Threads::Threads OR HAVE_THREADS) AND NOT OPENCV_EXAMPLES_DISABLE_THREADS)
set(HAVE_THREADS 1)
add_definitions(-DHAVE_THREADS=1) add_definitions(-DHAVE_THREADS=1)
endif() endif()

13
samples/cpp/tutorial_code/videoio/orbbec_astra/orbbec_astra.cpp
View File

@ -4,6 +4,17 @@
#include <list> #include <list>
#include <iostream> #include <iostream>
#if !defined(HAVE_THREADS)
int main()
{
std::cout << "This sample is built without threading support. Sample code is disabled." << std::endl;
return 0;
}
#else
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
@ -200,3 +211,5 @@ int main()
return 0; return 0;
} }
#endif

16
samples/dnn/object_detection.cpp
View File

@ -5,7 +5,11 @@
#include <opencv2/imgproc.hpp> #include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp> #include <opencv2/highgui.hpp>
#ifdef CV_CXX11 #if defined(CV_CXX11) && defined(HAVE_THREADS)
#define USE_THREADS 1
#endif
#ifdef USE_THREADS
#include <mutex> #include <mutex>
#include <thread> #include <thread>
#include <queue> #include <queue>
@ -56,7 +60,7 @@ void drawPred(int classId, float conf, int left, int top, int right, int bottom,
void callback(int pos, void* userdata); void callback(int pos, void* userdata);
#ifdef CV_CXX11 #ifdef USE_THREADS
template <typename T> template <typename T>
class QueueFPS : public std::queue<T> class QueueFPS : public std::queue<T>
{ {
@ -106,7 +110,7 @@ private:
TickMeter tm; TickMeter tm;
std::mutex mutex; std::mutex mutex;
}; };
#endif // CV_CXX11 #endif // USE_THREADS
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
@ -171,7 +175,7 @@ int main(int argc, char** argv)
else else
cap.open(parser.get<int>("device")); cap.open(parser.get<int>("device"));
#ifdef CV_CXX11 #ifdef USE_THREADS
bool process = true; bool process = true;
// Frames capturing thread // Frames capturing thread
@ -271,7 +275,7 @@ int main(int argc, char** argv)
framesThread.join(); framesThread.join();
processingThread.join(); processingThread.join();
#else // CV_CXX11 #else // USE_THREADS
if (asyncNumReq) if (asyncNumReq)
CV_Error(Error::StsNotImplemented, "Asynchronous forward is supported only with Inference Engine backend."); CV_Error(Error::StsNotImplemented, "Asynchronous forward is supported only with Inference Engine backend.");
@ -302,7 +306,7 @@ int main(int argc, char** argv)
imshow(kWinName, frame); imshow(kWinName, frame);
} }
#endif // CV_CXX11 #endif // USE_THREADS
return 0; return 0;
} }