Skip to content

Commit 5295591

Browse files
committed
test の bdrVal エラー修正
/build/precommit-contrib_linux64/4.x/opencv_contrib/modules/ximgproc/test/test_sparse_table_morphology.cpp:60:102: error: cannot bind non-const lvalue reference of type 'cv::Scalar& {aka cv::Scalar_<double>&}' to an rvalue of type 'cv::Scalar {aka cv::Scalar_<double>}' BorderTypes bdrType = BorderTypes::BORDER_CONSTANT, Scalar& bdrVal = morphologyDefaultBorderValue())
1 parent e45bcd3 commit 5295591

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

modules/ximgproc/test/test_sparse_table_morphology.cpp

+10-5
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ Mat knRnd(int size, int density)
5757
*/
5858
void dilate_rgr(InputArray src, InputArray kernel, Point anchor = Point(-1, -1),
5959
int iterations = 1,
60-
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT, Scalar& bdrVal = Scalar::all(DBL_MAX))
60+
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT,
61+
const Scalar& bdrVal = morphologyDefaultBorderValue())
6162
{
6263
Mat expected, actual;
6364
dilate(src, expected, kernel, anchor, iterations, bdrType, bdrVal);
@@ -94,7 +95,8 @@ TEST(ximgproc_StMorph_dilate, regression_it2) { dilate_rgr(im(CV_8UC3), kn5(), P
9495
*/
9596
void dilate_ftr(InputArray src, InputArray kernel, Point anchor = Point(-1, -1),
9697
int iterations = 1,
97-
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT, Scalar& bdrVal = Scalar::all(DBL_MAX))
98+
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT,
99+
const Scalar& bdrVal = morphologyDefaultBorderValue())
98100
{
99101
Mat expected, actual;
100102
stMorph::dilate(src, actual, kernel, anchor, iterations, bdrType, bdrVal);
@@ -112,7 +114,8 @@ TEST(ximgproc_StMorph_dilate, feature_32SC3) { dilate_ftr(im(CV_32SC3), kn5());
112114
*/
113115
void erode_rgr(InputArray src, InputArray kernel, Point anchor = Point(-1, -1),
114116
int iterations = 1,
115-
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT, Scalar& bdrVal = Scalar::all(DBL_MAX))
117+
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT,
118+
const Scalar& bdrVal = morphologyDefaultBorderValue())
116119
{
117120
Mat expected, actual;
118121
erode(src, expected, kernel, anchor, iterations, bdrType, bdrVal);
@@ -149,7 +152,8 @@ TEST(ximgproc_StMorph_erode, regression_it2) { erode_rgr(im(CV_8UC3), kn5(), Poi
149152
*/
150153
void erode_ftr(InputArray src, InputArray kernel, Point anchor = Point(-1, -1),
151154
int iterations = 1,
152-
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT, Scalar& bdrVal = Scalar::all(DBL_MAX))
155+
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT,
156+
const Scalar& bdrVal = morphologyDefaultBorderValue())
153157
{
154158
Mat expected, actual;
155159
stMorph::erode(src, actual, kernel, anchor, iterations, bdrType, bdrVal);
@@ -167,7 +171,8 @@ TEST(ximgproc_StMorph_erode, feature_32SC3) { erode_ftr(im(CV_32SC3), kn5()); }
167171
*/
168172
void ex_rgr(InputArray src, MorphTypes op, InputArray kernel, Point anchor = Point(-1, -1),
169173
int iterations = 1,
170-
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT, Scalar& bdrVal = Scalar::all(DBL_MAX))
174+
BorderTypes bdrType = BorderTypes::BORDER_CONSTANT,
175+
const Scalar& bdrVal = morphologyDefaultBorderValue())
171176
{
172177
Mat expected, actual;
173178
morphologyEx(src, expected, op, kernel, anchor, iterations, bdrType, bdrVal);

0 commit comments

Comments
 (0)