diff options
| author | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
| commit | 8999734b401bb8bac9fa20ce831b2ad2a9a67add (patch) | |
| tree | 3f5cf1d5abbbc4295b556ea6e27882950bdd81f3 /ports/zxing-cpp | |
| parent | a7ac12c90afed0a13e3b24d509927d2fca506115 (diff) | |
| parent | 9ffac4d56eed774419fbb628ea89417a6399db58 (diff) | |
| download | vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.tar.gz vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'ports/zxing-cpp')
| -rw-r--r-- | ports/zxing-cpp/0001-opencv4-compat.patch | 30 | ||||
| -rw-r--r-- | ports/zxing-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zxing-cpp/portfile.cmake | 2 |
3 files changed, 33 insertions, 1 deletions
diff --git a/ports/zxing-cpp/0001-opencv4-compat.patch b/ports/zxing-cpp/0001-opencv4-compat.patch new file mode 100644 index 000000000..51cec5387 --- /dev/null +++ b/ports/zxing-cpp/0001-opencv4-compat.patch @@ -0,0 +1,30 @@ +diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp +index 63b6fd3..430dda6 100755 +--- 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 { + diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL index 52dfd95b2..fec8e63e5 100644 --- a/ports/zxing-cpp/CONTROL +++ b/ports/zxing-cpp/CONTROL @@ -1,4 +1,4 @@ Source: zxing-cpp -Version: 3.3.3-2 +Version: 3.3.3-3 Build-Depends: opencv[core] Description: Barcode detection and decoding library. diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake index 405210d9c..06a2e6b49 100644 --- a/ports/zxing-cpp/portfile.cmake +++ b/ports/zxing-cpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF 5aad4744a3763d814df98a18886979893e638274 SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02 HEAD_REF master + PATCHES + 0001-opencv4-compat.patch ) vcpkg_configure_cmake( |