tidl-viewer: Remove executor.h inclusion in utils.cpp

One of the files in the tidl-viewer build, utils.cpp, was updated to include
executor.h.  This header in turn includes a file from OpenCL, custom.h.

The yocto build of tidl-viewer is a native recipe and hence cannot
include opencl recipes as a dependency to obtain custom.h.

This commit updates utils.cpp to remove the include of executor.h and
custom.h.
(MCT-1100)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 7057b5980c4a2fa26911e134de81907564c3e135..d396f987f67f173c4c86f2a2b5f09c9471f37b97 100644 (file)
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -2,7 +2,7 @@
 Changelog
 #########
 
-1.2.0 [Processor Linux SDK 5.2]
+1.2.1 [Processor Linux SDK 5.2]
 ===============================
 **Added**
 

diff --git a/tidl_api/make.buildid b/tidl_api/make.buildid
index 474309c010884744426ea74321c1d807fcf83743..f753e47987a074714d251cdd212c888b51948f90 100644 (file)
--- a/tidl_api/make.buildid
+++ b/tidl_api/make.buildid
@@ -26,7 +26,7 @@
 
 MAJOR_VER=1
 MINOR_VER=2
-PATCH_VER=0
+PATCH_VER=1
 
 ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0)
 BUILD_SHA?=$(shell git rev-parse --short HEAD)

diff --git a/tidl_api/src/util.cpp b/tidl_api/src/util.cpp
index 8fac9d0bfec036e232a0e22a1df9c9463b625f17..308840bf533a0dfe26bda1150008afc0b4ab050f 100644 (file)
--- a/tidl_api/src/util.cpp
+++ b/tidl_api/src/util.cpp
@@ -34,7 +34,10 @@
 #include <mutex>
 #include <cstring>
 #include <memory>
-#include "executor.h"
+
+namespace tidl {
+bool EnableTimeStamps(const std::string& file, size_t num_frames);
+}
 
 using namespace tidl;