Skip to content

Upgrade OpenCV 3.4.0 to 3.4.1 #504

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

Open
Cookt2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade OpenCV 3.4.0 to 3.4.1 #504

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
90cea02
update opencv source
Cookt2 Feb 22, 2019
dcf7308
update release-notes
Cookt2 Feb 25, 2019
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
10 changes: 5 additions & 5 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ list(APPEND fletch_external_sources Qt)
# OpenCV
# Support 2.4.13 and 3.4 optionally
if (fletch_ENABLE_OpenCV OR fletch_ENABLE_ALL_PACKAGES OR AUTO_ENABLE_CAFFE_DEPENDENCY)
set(OpenCV_SELECT_VERSION 3.4.0 CACHE STRING "Select the version of OpenCV to build.")
set_property(CACHE OpenCV_SELECT_VERSION PROPERTY STRINGS "2.4.13" "3.4.0")
set(OpenCV_SELECT_VERSION 3.4.1 CACHE STRING "Select the version of OpenCV to build.")
set_property(CACHE OpenCV_SELECT_VERSION PROPERTY STRINGS "2.4.13" "3.4.1")

set(OpenCV_version ${OpenCV_SELECT_VERSION})
set(OpenCV_url "http://github.com/Itseez/opencv/archive/${OpenCV_version}.zip")
Expand All @@ -306,9 +306,9 @@ if (fletch_ENABLE_OpenCV OR fletch_ENABLE_ALL_PACKAGES OR AUTO_ENABLE_CAFFE_DEPE
endif()

# Paired contrib repo information
if (OpenCV_version VERSION_EQUAL 3.4.0)
set(OpenCV_md5 "ed60f8bbe7a448f325d0a0f58fcf2063")
set(OpenCV_contrib_md5 "92c09ce6c837329f05802a8d17136148")
if (OpenCV_version VERSION_EQUAL 3.4.1)
set(OpenCV_md5 "8464ce888f4c283895626950bada1e44")
set(OpenCV_contrib_md5 "a255639242d58dd7e329556d43f2c316")
elseif (OpenCV_version VERSION_EQUAL 2.4.13)
set(OpenCV_md5 "886b0c511209b2f3129649928135967c")
else()
Expand Down
2 changes: 2 additions & 0 deletions Doc/release-notes/master.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ New Packages

Package Upgrades

- OpenCV has been upgraded from 3.4.0 to 3.4.1. The new version contains fixes for
multiple bugs.

Fixes since v1.2.0
------------------
Expand Down