diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-04-17 11:45:44 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-04-17 11:45:44 -0700 |
| commit | 50306ffe82b4d2bf432806fdfbff0b84f2a20a36 (patch) | |
| tree | f9da3fd6b629feebc186a03c7047a00d72f68ac7 | |
| parent | b0a7ab2c53856a040eebcce25d8c5a5e28c2c577 (diff) | |
| download | vcpkg-50306ffe82b4d2bf432806fdfbff0b84f2a20a36.tar.gz vcpkg-50306ffe82b4d2bf432806fdfbff0b84f2a20a36.zip | |
More fixes
| -rw-r--r-- | ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch | 25 | ||||
| -rw-r--r-- | ports/wpilib/portfile.cmake | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch b/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch new file mode 100644 index 000000000..d6e98cd24 --- /dev/null +++ b/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch @@ -0,0 +1,25 @@ +From 087e27acc634e06860f8e32274d7eb01d90f6873 Mon Sep 17 00:00:00 2001 +From: Thad House <thadhouse1@gmail.com> +Date: Tue, 16 Apr 2019 13:31:15 -0700 +Subject: [PATCH] Fix Gray to BGR conversion in CameraServer + +--- + cscore/src/main/native/cpp/Frame.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cscore/src/main/native/cpp/Frame.cpp b/cscore/src/main/native/cpp/Frame.cpp +index 15f9b2d28..b21ec873a 100644 +--- a/cscore/src/main/native/cpp/Frame.cpp ++++ b/cscore/src/main/native/cpp/Frame.cpp +@@ -361,7 +361,7 @@ Image* Frame::ConvertBGRToGray(Image* image) { + } + + Image* Frame::ConvertGrayToBGR(Image* image) { +- if (!image || image->pixelFormat != VideoMode::kBGR) return nullptr; ++ if (!image || image->pixelFormat != VideoMode::kGray) return nullptr; + + // Allocate a BGR image + auto newImage = +-- +2.18.0.windows.1 + diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 79853f6a0..3289333fa 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF vcpkgrelease
PATCHES
0001-Update-cmake-find-to-support-vcpkg-libuv.patch
+ 0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch
)
set(WITHOUT_JAVA ON)
|