potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #20836 from alexgiving:atrutnev/rename_Adapter_to_IAdapter

Browse Source 
* Rename RMat::Adapter to RMat::IAdapter

* Add comments
This commit is contained in:
Trutnev Aleksei
2021-11-01 15:43:27 +03:00
committed by GitHub
parent 7b57df02a7
commit 17234f82d0
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/test/rmat/rmat_test_common.hpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include <opencv2/gapi/rmat.hpp>
namespace opencv_test {
class RMatAdapterRef : public RMat::Adapter {
class RMatAdapterRef : public RMat::IAdapter {
cv::Mat& m_mat;
bool& m_callbackCalled;
public:
@@ -36,7 +36,7 @@ public:
virtual cv::GMatDesc desc() const override { return cv::descr_of(m_mat); }
};
class RMatAdapterCopy : public RMat::Adapter {
class RMatAdapterCopy : public RMat::IAdapter {
cv::Mat& m_deviceMat;
cv::Mat m_hostMat;
bool& m_callbackCalled;
modules/gapi/test/rmat/rmat_tests.cpp
+2 -2
View File
@@ -94,7 +94,7 @@ TYPED_TEST(RMatTypedTest, CorrectAdapterCast) {
EXPECT_NE(nullptr, this->rmat().template get<T>());
}
class DummyAdapter : public RMat::Adapter {
class DummyAdapter : public RMat::IAdapter {
virtual RMat::View access(RMat::Access) override { return {}; }
virtual cv::GMatDesc desc() const override { return {}; }
};
@@ -103,7 +103,7 @@ TYPED_TEST(RMatTypedTest, IncorrectAdapterCast) {
EXPECT_EQ(nullptr, this->rmat().template get<DummyAdapter>());
}
class RMatAdapterForBackend : public RMat::Adapter {
class RMatAdapterForBackend : public RMat::IAdapter {
int m_i;
public:
RMatAdapterForBackend(int i) : m_i(i) {}
modules/gapi/test/s11n/gapi_s11n_tests.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ template<> struct CompileArgTag<MyCustomTypeNoS11N> {
} // namespace cv
namespace {
class MyRMatAdapter : public cv::RMat::Adapter {
class MyRMatAdapter : public cv::RMat::IAdapter {
cv::Mat m_mat;
int m_value;
std::string m_str;