Skip to content

Merge 3.4 #2759

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

Jump to bottom
Merged
merged 5 commits into from
Nov 20, 2020
Merged

Merge 3.4 #2759

merged 5 commits into from
Nov 20, 2020

Conversation

alalek
Copy link
Member

@alalek alalek commented Nov 20, 2020 •
edited
Loading

#2755 from alalek:fix_sfm_build_std_move
#2758 from CEvangelist:3.4

Main PR: opencv/opencv#18881
Previous "Merge 3.4": #2754

force_builders=Custom,Win64 OpenCL
buildworker:Custom=linux-4
build_image:Custom=ubuntu-cuda:18.04
buildworker:Win64 OpenCL=windows-2
build_image:Win64 OpenCL=msvs2019

alalek and others added 5 commits November 18, 2020 12:01
@alalek
sfm: fix build in non-C++11 mode
8df9e84
@alalek
Merge pull request opencv#2755 from alalek:fix_sfm_build_std_move
8f40a44
@ZhijuCen
VS compatibility with unicode strings
2bf6434 
The UTF-8 string u8"…" causes following errors when building under VS2019:
C2001  newline in constant
C2143 syntax error: missing ';' before '}'
C2146 syntax error: missing ';' before identifier 'str'
@alalek
Merge pull request opencv#2758 from CEvangelist:3.4
2ad7203
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
d3ade27
@alalek
Copy link
Member Author

alalek commented Nov 20, 2020

👍

@alalek alalek merged commit d3ade27 into opencv:master Nov 20, 2020
@alalek alalek mentioned this pull request Dec 9, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alalek alalek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alalek @ZhijuCen