Skip to content

(4.x) Merge 3.4 #3308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

(4.x) Merge 3.4 #3308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
377e856
Fix file ending
jspricke Jun 24, 2022
79122d6
Merge pull request #3292 from jspricke:jpg_png
alalek Jul 4, 2022
a96a930
suppress warning on GCC 7 and later
tomoaki0705 Jul 6, 2022
ca2f333
Merge pull request #3298 from tomoaki0705:fixWarnings
alalek Jul 8, 2022
f471266
ximgproc: fix mismatched new delete
huangqinjin Jul 23, 2022
07daac3
Merge pull request #3306 from huangqinjin:fix
alalek Jul 24, 2022
e5aa138
Workflow on Ubuntu 14.04 for 3.4 branch
asenyaev Jul 27, 2022
9ffa7ac
Merge pull request #3309 from asenyaev:asen/ubuntu14.04_workflow_contrib
asmorkalov Aug 2, 2022
839db44
Revert "suppress warning on GCC 7 and later"
alalek Aug 7, 2022
0da7255
Merge pull request #3319 from alalek:rework_psabi_warning
alalek Aug 13, 2022
2a6cc95
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Aug 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.

Expand Down
0 ...ls/aruco_board_detection/images/board.jpg → ...ls/aruco_board_detection/images/board.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion modules/aruco/tutorials/charuco_detection/charuco_detection.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.

Expand Down
0 ...charuco_detection/images/charucoboard.jpg → ...charuco_detection/images/charucoboard.png
View file
Open in desktop
File renamed without changes
0 ...ages/checkershadow_illusion4med_proof.jpg → ...ages/checkershadow_illusion4med_proof.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions modules/bioinspired/tutorials/retina_illusion/retina_illusion.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
4 changes: 2 additions & 2 deletions modules/ximgproc/src/edge_drawing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down