mirror of
https://github.com/opencv/opencv.git
synced 2026-11-19 07:45:26 -06:00
features2d: fix BRISK on sub-matrix images - #30831 `BRISK_Impl::smoothedIntensity()` indexes the image with its width as the row stride in the direct-pixel paths. For an image that is a region of a larger one (`img(roi)`) the row step differs from the width, so those samples were read from the wrong rows. `detect()`/`compute()` on such an image returned wrong keypoint angles (the orientation uses these samples) and wrong descriptor bytes (maximum byte difference 255), and both depended on the pixels around the region. The function now uses `image.step`; the integral image is a fresh continuous matrix and is unchanged. Proposed to 4.x because BRISK is no longer in the main repository on 5.x (it moved to opencv_contrib). `Features2d_BRISK.descriptors_of_sub_matrix` computes keypoints, angles and descriptors on a continuous image and on a region of a larger image with unrelated pixels around it and requires identical output. On 4.x it fails (1 descriptor mismatch, 68 angle mismatches) and passes with the change. Continuous images are unchanged. Checks run on macOS arm64 (Release); the BRISK tests that read opencv_extra images were not run. The open PR #28194 also edits `brisk.cpp` (keypoint orientation in `compute()`) at different lines. Thank you for taking a look. ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
145 lines
5.0 KiB
C++
145 lines
5.0 KiB
C++
/*M///////////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
|
//
|
|
// By downloading, copying, installing or using the software you agree to this license.
|
|
// If you do not agree to this license, do not download, install,
|
|
// copy or use the software.
|
|
//
|
|
//
|
|
// License Agreement
|
|
// For Open Source Computer Vision Library
|
|
//
|
|
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
|
|
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
|
|
// Third party copyrights are property of their respective owners.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without modification,
|
|
// are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistribution's of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
//
|
|
// * Redistribution's in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
//
|
|
// * The name of the copyright holders may not be used to endorse or promote products
|
|
// derived from this software without specific prior written permission.
|
|
//
|
|
// This software is provided by the copyright holders and contributors "as is" and
|
|
// any express or implied warranties, including, but not limited to, the implied
|
|
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
|
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
|
// indirect, incidental, special, exemplary, or consequential damages
|
|
// (including, but not limited to, procurement of substitute goods or services;
|
|
// loss of use, data, or profits; or business interruption) however caused
|
|
// and on any theory of liability, whether in contract, strict liability,
|
|
// or tort (including negligence or otherwise) arising in any way out of
|
|
// the use of this software, even if advised of the possibility of such damage.
|
|
//
|
|
//M*/
|
|
|
|
#include "test_precomp.hpp"
|
|
|
|
namespace opencv_test { namespace {
|
|
|
|
class CV_BRISKTest : public cvtest::BaseTest
|
|
{
|
|
public:
|
|
CV_BRISKTest();
|
|
~CV_BRISKTest();
|
|
protected:
|
|
void run(int);
|
|
};
|
|
|
|
CV_BRISKTest::CV_BRISKTest() {}
|
|
CV_BRISKTest::~CV_BRISKTest() {}
|
|
|
|
void CV_BRISKTest::run( int )
|
|
{
|
|
Mat image1 = imread(string(ts->get_data_path()) + "inpaint/orig.png");
|
|
Mat image2 = imread(string(ts->get_data_path()) + "cameracalibration/chess9.png");
|
|
|
|
if (image1.empty() || image2.empty())
|
|
{
|
|
ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
|
|
return;
|
|
}
|
|
|
|
Mat gray1, gray2;
|
|
cvtColor(image1, gray1, COLOR_BGR2GRAY);
|
|
cvtColor(image2, gray2, COLOR_BGR2GRAY);
|
|
|
|
Ptr<FeatureDetector> detector = BRISK::create();
|
|
|
|
// Check parameter get/set functions.
|
|
BRISK* detectorTyped = dynamic_cast<BRISK*>(detector.get());
|
|
ASSERT_NE(nullptr, detectorTyped);
|
|
detectorTyped->setOctaves(3);
|
|
detectorTyped->setThreshold(30);
|
|
ASSERT_EQ(detectorTyped->getOctaves(), 3);
|
|
ASSERT_EQ(detectorTyped->getThreshold(), 30);
|
|
detectorTyped->setOctaves(4);
|
|
detectorTyped->setThreshold(29);
|
|
ASSERT_EQ(detectorTyped->getOctaves(), 4);
|
|
ASSERT_EQ(detectorTyped->getThreshold(), 29);
|
|
|
|
vector<KeyPoint> keypoints1;
|
|
vector<KeyPoint> keypoints2;
|
|
detector->detect(image1, keypoints1);
|
|
detector->detect(image2, keypoints2);
|
|
|
|
for(size_t i = 0; i < keypoints1.size(); ++i)
|
|
{
|
|
const KeyPoint& kp = keypoints1[i];
|
|
ASSERT_NE(kp.angle, -1);
|
|
}
|
|
|
|
for(size_t i = 0; i < keypoints2.size(); ++i)
|
|
{
|
|
const KeyPoint& kp = keypoints2[i];
|
|
ASSERT_NE(kp.angle, -1);
|
|
}
|
|
}
|
|
|
|
TEST(Features2d_BRISK, regression) { CV_BRISKTest test; test.safe_run(); }
|
|
|
|
TEST(Features2d_BRISK, invalidCreateParameters)
|
|
{
|
|
EXPECT_THROW(BRISK::create(30, 3, 0.0f), cv::Exception);
|
|
EXPECT_THROW(BRISK::create(30, 3, -1.0f), cv::Exception);
|
|
}
|
|
|
|
TEST(Features2d_BRISK, descriptors_of_sub_matrix)
|
|
{
|
|
// Row steps of a region of a larger image differ from its width.
|
|
RNG& rng = theRNG();
|
|
Mat img(150, 170, CV_8UC1);
|
|
rng.fill(img, RNG::UNIFORM, 0, 256);
|
|
GaussianBlur(img, img, Size(5, 5), 2);
|
|
|
|
Mat parent(img.rows + 7, img.cols + 9, CV_8UC1);
|
|
rng.fill(parent, RNG::UNIFORM, 0, 256);
|
|
Mat roi = parent(Rect(4, 3, img.cols, img.rows));
|
|
img.copyTo(roi);
|
|
|
|
Ptr<BRISK> brisk = BRISK::create(30);
|
|
std::vector<KeyPoint> keypoints;
|
|
brisk->detect(img, keypoints);
|
|
ASSERT_GT(keypoints.size(), 5u);
|
|
|
|
std::vector<KeyPoint> keypointsRoi = keypoints;
|
|
Mat descriptors, descriptorsRoi;
|
|
brisk->compute(img, keypoints, descriptors);
|
|
brisk->compute(roi, keypointsRoi, descriptorsRoi);
|
|
|
|
ASSERT_EQ(keypoints.size(), keypointsRoi.size());
|
|
ASSERT_EQ(descriptors.size(), descriptorsRoi.size());
|
|
EXPECT_EQ(0, cvtest::norm(descriptors, descriptorsRoi, NORM_INF));
|
|
for (size_t i = 0; i < keypoints.size(); i++)
|
|
EXPECT_EQ(keypoints[i].angle, keypointsRoi[i].angle) << "keypoint " << i;
|
|
}
|
|
|
|
}} // namespace
|