From 3b063132434c34bece371deb31a9c6ce5ccee769 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 27 Apr 2019 20:17:17 -0700 Subject: [PATCH] Fix Gray to BGR conversion in CameraServer (#1665) --- 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 15f9b2d28e..b21ec873af 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 =