From f72cdf63204ea8eda2c4a1043e441779725494d5 Mon Sep 17 00:00:00 2001
From: kallaballa <amir@viel-zu.com>
Date: Fri, 15 Sep 2023 05:43:54 +0200
Subject: [PATCH] use functions for context access instead of member access

---
 modules/v4d/src/detail/clvacontext.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/v4d/src/detail/clvacontext.cpp b/modules/v4d/src/detail/clvacontext.cpp
index 439daba32..d552b2077 100644
--- a/modules/v4d/src/detail/clvacontext.cpp
+++ b/modules/v4d/src/detail/clvacontext.cpp
@@ -16,27 +16,33 @@ CLVAContext::CLVAContext(FrameBufferContext& mainFbContext) : mainFbContext_(mai
 bool CLVAContext::capture(std::function<void(cv::UMat&)> fn, cv::UMat& output) {
     cv::Size fbSize = mainFbContext_.size();
 #ifndef __EMSCRIPTEN__
-    if (!context_.empty()) {
-        CLExecScope_t scope(context_);
+    if (hasContext()) {
+        CLExecScope_t scope(getCLExecContext());
 #endif
         fn(readFrame_);
+        if (readFrame_.empty())
+            return false;
+        resizePreserveAspectRatio(readFrame_, readRGBBuffer_, mainFbContext_.size());
+        cv::cvtColor(readRGBBuffer_, output, cv::COLOR_RGB2BGRA);
 #ifndef __EMSCRIPTEN__
     } else {
+        CLExecScope_t scope(mainFbContext_.getCLExecContext());
+        readFrame_ = cv::UMat();
         fn(readFrame_);
+        if (readFrame_.empty())
+            return false;
+        resizePreserveAspectRatio(readFrame_, readRGBBuffer_, mainFbContext_.size());
+        cv::cvtColor(readRGBBuffer_, output, cv::COLOR_RGB2BGRA);
     }
 #endif
-    if (readFrame_.empty())
-        return false;
-    resizePreserveAspectRatio(readFrame_, readRGBBuffer_, mainFbContext_.size());
-    cv::cvtColor(readRGBBuffer_, output, cv::COLOR_RGB2BGRA);
 
     return true;
 }
 
 void CLVAContext::write(std::function<void(const cv::UMat&)> fn, cv::UMat& input) {
 #ifndef __EMSCRIPTEN__
-    if (!context_.empty()) {
-        CLExecScope_t scope(context_);
+    if (hasContext()) {
+        CLExecScope_t scope(getCLExecContext());
 #endif
         cv::cvtColor(input, writeRGBBuffer_, cv::COLOR_BGRA2RGB);
         fn(writeRGBBuffer_);