Skip to content
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

Update to opencv 4.10.0 #132

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Update to opencv 4.10.0 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9693c2
update to opencv 4.10.0
krupkat Jun 10, 2024
94e5b67
bump version number to 0.19.0
krupkat Jun 10, 2024
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 .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
env:
BUILD_TYPE: Release
SDL_VERSION: "release-2.30.3"
OPENCV_VERSION: "4.9.0"
OPENCV_VERSION: "4.10.0"
CATCH_VERSION: "v3.6.0"
SPDLOG_VERSION: "v1.14.1"
EXIV2_VERSION: "v0.28.2"
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-bullseye.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export BUILD_TYPE='Release'
export SDL_VERSION='release-2.30.3'
# export OPENCV_VERSION='4.9.0'
# export OPENCV_VERSION='4.10.0'
export CATCH_VERSION='v3.6.0'
export SPDLOG_VERSION='v1.14.1'
export EXIV2_VERSION='v0.28.2'
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export BUILD_TYPE='Release'
export SDL_VERSION='release-2.30.3'
export OPENCV_VERSION='4.9.0'
export OPENCV_VERSION='4.10.0'
export CATCH_VERSION='v3.6.0'
export SPDLOG_VERSION='v1.14.1'
export EXIV2_VERSION='v0.28.2'
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-ubuntu-20.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export BUILD_TYPE='Release'
export SDL_VERSION='release-2.30.3'
export OPENCV_VERSION='4.9.0'
export OPENCV_VERSION='4.10.0'
export CATCH_VERSION='v3.6.0'
export SPDLOG_VERSION='v1.14.1'
export EXIV2_VERSION='v0.28.2'
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-ubuntu-22.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export BUILD_TYPE='Release'
export SDL_VERSION='release-2.30.3'
export OPENCV_VERSION='4.9.0'
export OPENCV_VERSION='4.10.0'
export CATCH_VERSION='v3.6.0'
export SPDLOG_VERSION='v1.14.1'
export EXIV2_VERSION='v0.28.2'
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-universal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export BUILD_TYPE='Release'
export SDL_VERSION='release-2.30.3'
export OPENCV_VERSION='4.9.0'
export OPENCV_VERSION='4.10.0'
export CATCH_VERSION='v3.6.0'
export SPDLOG_VERSION='v1.14.1'
export EXIV2_VERSION='v0.28.2'
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-windows-latest.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$env:BUILD_TYPE = 'Release'
$env:SDL_VERSION = 'release-2.30.3'
$env:OPENCV_VERSION = '4.9.0'
$env:OPENCV_VERSION = '4.10.0'
$env:CATCH_VERSION = 'v3.6.0'
$env:SPDLOG_VERSION = 'v1.14.1'
$env:EXIV2_VERSION = 'v0.28.2'
Expand Down
4 changes: 2 additions & 2 deletions xpano/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
namespace xpano::version {

constexpr int kMajor = 0;
constexpr int kMinor = 18;
constexpr int kPatch = 1;
constexpr int kMinor = 19;
constexpr int kPatch = 0;

using Triplet = std::tuple<int, int, int>;

Expand Down