Search for matches between a color image patch and an input color image #1791

LaurentBerger · 2018-09-23T18:59:36Z

Merge with extra: opencv/opencv_extra#534

Sangwine, S. J., Ell, T. A. and Moxey C. E., Vector Phase Correlation, Electronics Letters, 37(25), 6 December 2001, 1513-5. http://dx.doi.org/10.1049/el:20011035

T. A. Ell and S. J. Sangwine. Decomposition of 2D hypercomplex Fourier transforms into pairs of complex Fourier transforms. In Moncef Gabbouj and Pauli Kuosmanen, editors, Proceedings of EUSIPCO 2000, Tenth European Signal Processing Conference, volume II, pages 1061–1064, Tampere, Finland, 5–8 September 2000. European Association for Signal Processing

Quaternion Toolbox for Matlab r . [Online]. Software library, written by Stephen Sangwine and Nicolas Le Bihan. Available: http://qtfm.sourceforge.net/.

LaurentBerger · 2018-09-23T19:58:07Z

PR Not Ready

alalek · 2018-10-12T17:16:41Z

@LaurentBerger Is this PR ready?

LaurentBerger · 2018-10-12T18:42:15Z

@alalek no I will try to write some test next week

LaurentBerger · 2018-10-21T08:20:44Z

@alalek ready for review. Patch size for open_extra is it problem?

alalek · 2018-10-21T14:15:45Z

Try to squash commits in opencv_extra (to drop intermediate history at least).

alalek

Well done!

Please take a look on comments below.

alalek · 2018-10-24T14:19:06Z

modules/ximgproc/include/opencv2/ximgproc/color_match.hpp

+
+#ifndef __OPENCV_COLOR_MATCH_HPP__
+#define __OPENCV_COLOR_MATCH_HPP__
+#ifdef __cplusplus


#ifdef __cplusplus is not needed in .hpp files.

alalek · 2018-10-24T14:21:32Z

modules/ximgproc/samples/color_match_template.cpp

+int main(int , char *[])
+{
+    Mat imgLogo = imread("g:/lib/opencv/samples/data/opencv-logo.png", IMREAD_COLOR);
+    Mat imgColor = imread("g:/lib/opencv/samples/data/lena.jpg", IMREAD_COLOR);


Please avoid using of absolute paths. samples/data/... should be enough (or just file names).

alalek · 2018-10-24T14:23:00Z

modules/ximgproc/src/quaternion.cpp

@@ -0,0 +1,206 @@
+#include "precomp.hpp"


Please add license header (modules sources / headers / tests, but not samples):

// This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory // of this distribution and at http://opencv.org/license.html.

alalek · 2018-10-24T14:23:31Z

modules/ximgproc/src/quaternion.cpp

@@ -0,0 +1,206 @@
+#include "precomp.hpp"
+using namespace std;
+using namespace cv;


using namespace cv; is not needed. All code is placed into cv namespace.

alalek · 2018-10-24T14:24:23Z

modules/ximgproc/src/quaternion.cpp

+void createQuaternionImage(InputArray _img, OutputArray _qimg)
+{
+    int type = _img.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
+    CV_Assert((depth == CV_8U || depth == CV_32F || depth == CV_64F) && _img.dims() == 2 && cn == 3);


It is better to use CV_Check*() macros for parameters checks.

alalek · 2018-10-24T14:26:13Z

modules/ximgproc/src/quaternion.cpp

+    qplane[0] = plane[0].clone();
+    qplane[1] = -plane[1].clone();
+    qplane[2] = -plane[2].clone();
+    qplane[3] = -plane[3].clone();


Perhaps .clone() is not necessary here.

alalek · 2018-10-24T14:30:25Z

modules/ximgproc/test/test_matchcolortemplate.cpp

+    double maxVal;
+    Point pIdx;
+    minMaxLoc(dd, NULL, &maxVal, NULL, &pIdx);
+    ASSERT_LE(maxVal, 1e-5);


5 lines -> EXPECT_LE(cv::norm(corr, corrRef, NORM_INF), 1e-5);

alalek · 2018-10-24T14:45:06Z

modules/ximgproc/src/quaternion.cpp

+    for (int i = 0; i < nb; i++, ptr0++, ptr1++, ptr2++, ptr3++)
+    {
+        double d = *ptr0 * *ptr0 + *ptr1 * *ptr1 + *ptr2 * *ptr2 + *ptr3 * *ptr3;
+        d = 1 / sqrt(d);


Try parallel .forEach():

_img.copyTo(_qimg); Mat qimg = _qimg.getMat(); qimg.forEach<Vec4d>([](Vec4d &p, const int * /*position*/) -> void { double d = p[0] * p[0] + p[1] * p[1] + p[2] * p[2] + p[3] * p[3]; d = 1 / sqrt(d); p *= d; });

alalek · 2018-10-24T14:47:59Z

modules/ximgproc/src/quaternion.cpp

+
+void qdft(InputArray _img, OutputArray _qimg, int  	flags, bool sideLeft)
+{
+    //    CV_INSTRUMENT_REGION()


It is OK to add this (into all exported "large enough" functions).
With ';' in the end.

LaurentBerger · 2018-10-27T18:04:00Z

@alalek can you help me for http://pullrequest.opencv.org/buildbot/builders/precommit-contrib_docs/builds/12103

alalek · 2018-11-10T10:41:57Z

modules/ximgproc/include/opencv2/ximgproc/color_match.hpp

+    * @param   img         Source 8-bit, 32-bit or 64-bit image, with 3-channel image.
+    * @param   qimg        result CV_64FC4 a quaternion image( 4 chanels zero channel and B,G,R).
+    */
+    CV_EXPORTS_W void createQuaternionImage(InputArray img, OutputArray qimg);


Please avoid extra indentation in namespaces

alalek · 2018-11-10T10:43:49Z

modules/ximgproc/src/quaternion.cpp

+    });
+    /*
+    qplane[0] = plane[0].clone();
+    qplane[1] = plane[1].clone();


I believe we can remove commented out code.

alalek · 2018-11-10T10:44:34Z

modules/ximgproc/src/quaternion.cpp

+    int type = _img.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
+    CV_Assert((depth == CV_64F) && _img.dims() == 2 && cn == 4);
+    vector<Mat> qplane(4), plane;
+    split(_img, plane);


qplane and plane are not needed anymore

alalek

Thank you!

Merge pull request opencv#516 from savuor:cvtcolor_bgr2gray_8u_15bits * fixed perf data for PyrLK after bgr2gray 8u change * fixed perf data for new bgr2gray coeffs fixed issue #1754@contrib for ximgproc Merge pull request opencv#528 from xoox:calib-release-object Add new test data for extended camera calibration method (opencv#528) * Reorder object points and image points Now the feature points are in the order as the same set of the object points, which makes the test data usable for testing calibration with CALIB_RELEASE_OBJECT flag. * Add one line to store calibration flags opencv/modules/calib3d/test/test_cameracalibration.cpp must be sync with this test data file. * Add new test data for camera calibration The new added calib2.dat is used for regression test of camera calibration with CALIB_RELEASE_OBJECT flag. * Add a line of data for the index of fixed point The new proposed calibration flag CALIB_RELEASE_OBJECT is removed. And the method selection is based on the range of the index of fixed point. For minus values, standard calibration method will be chosen. Values in a rational range will make the object-releasing calibration method selected. fixed "false alarm" test failures in opencv_test_objdetect (i.e. removed some errorneously detected "non-faces" from the regression data) added sanity data for opencv_contrib/optflow module (since TVL1 optflow is now there and it does sanity check in perf tests) Test data for opencv/opencv_contrib#1791 fixed perf data for mRGBA

LaurentBerger force-pushed the ColorMatchTemplate branch 2 times, most recently from 8da8de9 to 849eb70 Compare September 23, 2018 19:57

LaurentBerger added a commit to LaurentBerger/opencv_extra that referenced this pull request Oct 20, 2018

Test data for opencv/opencv_contrib#1791

1e834c3

LaurentBerger added a commit to LaurentBerger/opencv_extra that referenced this pull request Oct 21, 2018

Test data for opencv/opencv_contrib#1791

96a321a

LaurentBerger force-pushed the ColorMatchTemplate branch from a5b7fba to 6a36066 Compare October 21, 2018 17:05

alalek reviewed Oct 24, 2018

View reviewed changes

LaurentBerger added a commit to LaurentBerger/opencv_extra that referenced this pull request Oct 28, 2018

Test data for opencv/opencv_contrib#1791

513e572

LaurentBerger force-pushed the ColorMatchTemplate branch from 900abeb to efa3f57 Compare November 1, 2018 09:30

LaurentBerger added a commit to LaurentBerger/opencv_extra that referenced this pull request Nov 9, 2018

Test data for opencv/opencv_contrib#1791

05684eb

LaurentBerger force-pushed the ColorMatchTemplate branch from 04f81fc to 54413eb Compare November 9, 2018 16:55

alalek reviewed Nov 10, 2018

View reviewed changes

First commit

d3e983d

LaurentBerger force-pushed the ColorMatchTemplate branch from e3580ce to d3e983d Compare November 10, 2018 11:25

indentation

9fa42ea

alalek approved these changes Nov 10, 2018

View reviewed changes

alalek merged commit 67e1549 into opencv:master Nov 10, 2018

LaurentBerger deleted the ColorMatchTemplate branch November 11, 2018 09:37

LaurentBerger mentioned this pull request Jul 20, 2019

License LaurentBerger/ColorMatchTemplate#1

Closed

rayonnant14 pushed a commit to rayonnant14/opencv_extra that referenced this pull request Oct 25, 2019

Test data for opencv/opencv_contrib#1791

d2a99d0

sl-sergei pushed a commit to sl-sergei/opencv_extra that referenced this pull request Aug 29, 2020

Test data for opencv/opencv_contrib#1791

75611e3

Search for matches between a color image patch and an input color image #1791

Search for matches between a color image patch and an input color image #1791

Uh oh!

Conversation

LaurentBerger commented Sep 23, 2018 • edited by alalek Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LaurentBerger commented Sep 23, 2018

Uh oh!

alalek commented Oct 12, 2018

Uh oh!

LaurentBerger commented Oct 12, 2018

Uh oh!

LaurentBerger commented Oct 21, 2018

Uh oh!

alalek commented Oct 21, 2018

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LaurentBerger commented Oct 27, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

LaurentBerger commented Sep 23, 2018 •

edited by alalek

Loading