mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-05 22:19:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18182 from OrestChura:oc/operators_to_cv

Browse Source 
[G-API]: Relocation of operators' overloads

* Relocates overloaded operators for `cv::GMat` and `cv::GScalar` to `cv::` namespace
 - adds test to check usage of operators compilation

* Add tests for all the operators

* Address comments
This commit is contained in:
Orest Chura 2020-09-02 22:28:10 +03:00 committed by GitHub
parent 0428dce27d
commit 7a796b20ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gapi/include/opencv2/gapi/operators.hpp
View File

@ -11,6 +11,8 @@
#include <opencv2/gapi/gmat.hpp>
#include <opencv2/gapi/gscalar.hpp>
namespace cv
{
GAPI_EXPORTS cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs);
GAPI_EXPORTS cv::GMat operator+(const cv::GMat& lhs, const cv::GScalar& rhs);
@ -63,7 +65,6 @@ GAPI_EXPORTS cv::GMat operator<(const cv::GScalar& lhs, const cv::GMat& rhs);
GAPI_EXPORTS cv::GMat operator<=(const cv::GScalar& lhs, const cv::GMat& rhs);
GAPI_EXPORTS cv::GMat operator==(const cv::GScalar& lhs, const cv::GMat& rhs);
GAPI_EXPORTS cv::GMat operator!=(const cv::GScalar& lhs, const cv::GMat& rhs);
} // cv
#endif // OPENCV_GAPI_OPERATORS_HPP

3
modules/gapi/src/api/operators.cpp
View File

@ -12,6 +12,8 @@
#include <opencv2/gapi/gscalar.hpp>
#include <opencv2/gapi/operators.hpp>
namespace cv
{
cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs)
{
return cv::gapi::add(lhs, rhs);
@ -211,3 +213,4 @@ cv::GMat operator!=(const cv::GScalar& lhs, const cv::GMat& rhs)
{
return cv::gapi::cmpNE(rhs, lhs);
}
} // cv

75
modules/gapi/test/common/gapi_operators_tests_inl.hpp
View File

@ -77,6 +77,81 @@ TEST_P(NotOperatorTest, OperatorAccuracyTest)
EXPECT_EQ(0, cvtest::norm(out_mat_ocv, out_mat_gapi, NORM_INF));
}
}
namespace for_test
{
class Foo {};
inline int operator&(Foo, int) { return 1; }
inline int operator|(Foo, int) { return 1; }
inline int operator^(Foo, int) { return 1; }
inline int operator~(Foo) { return 1; }
inline int operator+(Foo, int) { return 1; }
inline int operator-(Foo, int) { return 1; }
inline int operator*(Foo, int) { return 1; }
inline int operator/(Foo, int) { return 1; }
inline int operator> (Foo, int) { return 1; }
inline int operator>=(Foo, int) { return 1; }
inline int operator< (Foo, int) { return 1; }
inline int operator<=(Foo, int) { return 1; }
inline int operator==(Foo, int) { return 1; }
inline int operator!=(Foo, int) { return 1; }
TEST(CVNamespaceOperatorsTest, OperatorCompilationTest)
{
cv::GScalar sc;
cv::GMat mat_in1, mat_in2;
cv::GMat op_not = ~ mat_in1;
cv::GMat op_mat_mat1 = mat_in1 & mat_in2;
cv::GMat op_mat_mat2 = mat_in1 | mat_in2;
cv::GMat op_mat_mat3 = mat_in1 ^ mat_in2;
cv::GMat op_mat_mat4 = mat_in1 + mat_in2;
cv::GMat op_mat_mat5 = mat_in1 - mat_in2;
cv::GMat op_mat_mat6 = mat_in1 / mat_in2;
cv::GMat op_mat_mat7 = mat_in1 > mat_in2;
cv::GMat op_mat_mat8 = mat_in1 >= mat_in2;
cv::GMat op_mat_mat9 = mat_in1 < mat_in2;
cv::GMat op_mat_mat10 = mat_in1 <= mat_in2;
cv::GMat op_mat_mat11 = mat_in1 == mat_in2;
cv::GMat op_mat_mat12 = mat_in1 != mat_in2;
cv::GMat op_mat_sc1 = mat_in1 & sc;
cv::GMat op_mat_sc2 = mat_in1 | sc;
cv::GMat op_mat_sc3 = mat_in1 ^ sc;
cv::GMat op_mat_sc4 = mat_in1 + sc;
cv::GMat op_mat_sc5 = mat_in1 - sc;
cv::GMat op_mat_sc6 = mat_in1 * sc;
cv::GMat op_mat_sc7 = mat_in1 / sc;
cv::GMat op_mat_sc8 = mat_in1 > sc;
cv::GMat op_mat_sc9 = mat_in1 >= sc;
cv::GMat op_mat_sc10 = mat_in1 < sc;
cv::GMat op_mat_sc11 = mat_in1 <= sc;
cv::GMat op_mat_sc12 = mat_in1 == sc;
cv::GMat op_mat_sc13 = mat_in1 != sc;
cv::GMat op_sc_mat1 = sc & mat_in2;
cv::GMat op_sc_mat2 = sc | mat_in2;
cv::GMat op_sc_mat3 = sc ^ mat_in2;
cv::GMat op_sc_mat4 = sc + mat_in2;
cv::GMat op_sc_mat5 = sc - mat_in2;
cv::GMat op_sc_mat6 = sc * mat_in2;
cv::GMat op_sc_mat7 = sc / mat_in2;
cv::GMat op_sc_mat8 = sc > mat_in2;
cv::GMat op_sc_mat9 = sc >= mat_in2;
cv::GMat op_sc_mat10 = sc < mat_in2;
cv::GMat op_sc_mat11 = sc <= mat_in2;
cv::GMat op_sc_mat12 = sc == mat_in2;
cv::GMat op_sc_mat13 = sc != mat_in2;
cv::GMat mul_mat_float1 = mat_in1 * 1.0f;
cv::GMat mul_mat_float2 = 1.0f * mat_in2;
// No compilation errors expected
}
} // for_test
} // opencv_test
#endif // OPENCV_GAPI_OPERATOR_TESTS_INL_COMMON_HPP