mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 02:47:59 +08:00
4fb51523e9
* [OpenCV] update to v4 * [OpenCV] update to v4.1 * [OpenCV] merge #6901 and #6812 * [OpenCV] port patches to v4.1 * [OpenCV] fix naming * [OpenCV] fix regression with static linkage * [OpenCV] fix linking to optional feature dependencies in static mode * fix ffmpeg on some architectures * trigger rebuild of regressions on macOS * [zxing-cpp] fix opencv 4.1 compat * [ogre] improve patching for static builds * [OpenCV] fixes for extra features * [OpenCV] drastically reduce patchset * [OpenCV] fix regression on linux * [OpenCV] fix regression on Windows * [qt5] depends on qt5-activeqt only on windows * update to v4.1.1 * [OpenCV] additional fixes for 4.1.1 * [OpenCV] fix Eigen3 feature integration * [opencv] Fix compilation in UWP * [opencv] Fix merge conflicts * [ffmpeg] fix cmake module for osx * [OpenCV] add pre-caching of optflow cuda package * [gdcm] properly fix #6863 instead of wrong #6901 * [OpenCV] fix OpenMP feature * [opencv] Add missing GetModuleHandle() call guard for UWP * [freeimage] Do not depend on libwebp[all] on UWP * [opencv] Set app container bit for UWP * [zxing-cpp] Fail with explicit message in UWP * [pthreads4w] fix target creation, missing dlls * [pthreads4w] bump CONTROL * [opencv,zxing-cpp] Fix OpenCV Video IO module * [zxing-cpp] Revert unnecessary changes * [opencv] Feature halide * Fix regression in UWP * [ffmpeg] remove unnecessary patch pointing to old OpenCV version * [opencv] remove versioning from windows dll filenames * [opencv] Move port to opencv4 * [opencv,opencv4] Make meta-package install OpenCV 4.1 * [opencv3] Rename old port opencv->opencv3 * Add failure messages when another OpenCV is already installed
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ccb2ba9..5ade734 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,7 +1,7 @@
|
|
cmake_minimum_required(VERSION 3.0)
|
|
|
|
project(zxing)
|
|
-
|
|
+set(CMAKE_CXX_STANDARD 11)
|
|
option(BUILD_TESTING "Enable generation of test targets" OFF)
|
|
|
|
set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
|
|
diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp
|
|
index 63b6fd3..5900c4f 100644
|
|
--- a/opencv-cli/src/main.cpp
|
|
+++ b/opencv-cli/src/main.cpp
|
|
@@ -135,14 +135,14 @@ int main(int argc, char** argv) {
|
|
|
|
}
|
|
|
|
- if (!videoCapture.set(CV_CAP_PROP_FRAME_WIDTH, captureWidth)) {
|
|
+ if (!videoCapture.set(cv::CAP_PROP_FRAME_WIDTH, captureWidth)) {
|
|
|
|
// Log
|
|
cerr << "Failed to set frame width: " << captureWidth << " (ignoring)" << endl;
|
|
|
|
}
|
|
|
|
- if (!videoCapture.set(CV_CAP_PROP_FRAME_HEIGHT, captureHeight)) {
|
|
+ if (!videoCapture.set(cv::CAP_PROP_FRAME_HEIGHT, captureHeight)) {
|
|
|
|
// Log
|
|
cerr << "Failed to set frame height: " << captureHeight << " (ignoring)" << endl;
|
|
@@ -166,7 +166,7 @@ int main(int argc, char** argv) {
|
|
if (result) {
|
|
|
|
// Convert to grayscale
|
|
- cvtColor(image, grey, CV_BGR2GRAY);
|
|
+ cvtColor(image, grey, cv::COLOR_BGR2GRAY);
|
|
|
|
try {
|
|
|