1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-14 10:38:45 +08:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2022-08-14 15:38:35 +00:00
7 changed files with 6 additions and 6 deletions

View File

@@ -156,7 +156,7 @@ In this case the margin is 10.
The output image will be something like this:
![](images/board.jpg)
![](images/board.png)
A full working example of board creation is included in the `create_board.cpp` inside the `modules/aruco/samples/`.

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -88,7 +88,7 @@ In this case the margin is 10.
The output image will be something like this:
![](images/charucoboard.jpg)
![](images/charucoboard.png)
A full working example is included in the `create_board_charuco.cpp` inside the `modules/aruco/samples/`.

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@@ -30,7 +30,7 @@ values of the two squares with the picker tool.
In this image I've cropped a little piece of the A and B squares and I've put them side-by-side.
It should be quite evident they have the same luminance.
![Adelson checkerboard proof](images/checkershadow_illusion4med_proof.jpg)
![Adelson checkerboard proof](images/checkershadow_illusion4med_proof.png)
It's worth to know that this illusion works because the checkerboard image, as you may see it
on your laptop, casts on your retina with dimensions that cause the retina local adaptation to take
@@ -184,4 +184,4 @@ opportunity of writing this tutorial, and for reviewing it.
**Edward Adelson** - for allowing me to freely use his checkerboard image.
**Antonio Cuni** - for reviewing this tutorial and for writing the Python code.
**Antonio Cuni** - for reviewing this tutorial and for writing the Python code.

View File

@@ -5613,8 +5613,8 @@ int EdgeDrawingImpl::inverse(double** TB, double** InvB, int N)
void EdgeDrawingImpl::DeallocateMatrix(double** m, int noRows)
{
for (int i = 0; i < noRows; i++)
delete m[i];
delete m;
delete[] m[i];
delete[] m;
}
void EdgeDrawingImpl::AperB_T(double** A_, double** B_, double** _res, int _righA, int _colA, int _righB, int _colB)