Merge pull request #24942 from asmorkalov:as/android_warning_fix

Build warning fix for Charuco tests
10 months ago · e48b96b926
parent 372b36c1d3 ba8915c88c
commit e48b96b926
1 changed files with 1 additions and 1 deletions
--- a/modules/objdetect/test/test_charucodetection.cpp
+++ b/modules/objdetect/test/test_charucodetection.cpp
@ -814,7 +814,7 @@ TEST(CharucoBoardGenerate, issue_24806)
        Point2f chessCorner(pixInSquare*(p.x/squareLength),
                            pixInSquare*(p.y/squareLength));
        Mat winCorner = chessboardZoneImg(Rect(Point(cvRound(chessCorner.x) - 1, cvRound(chessCorner.y) - 1), Size(2, 2)));
-        bool eq = (cv::countNonZero(goldCorner1 != winCorner) == 0) | (cv::countNonZero(goldCorner2 != winCorner) == 0);
+        bool eq = (cv::countNonZero(goldCorner1 != winCorner) == 0) || (cv::countNonZero(goldCorner2 != winCorner) == 0);
        ASSERT_TRUE(eq);
    }
    // TODO: fix aruco generateImage and add test aruco corners for generated image