From 67a0356a84c1cae50a4bea3ee09bfaa636146345 Mon Sep 17 00:00:00 2001 From: Kalman Date: Tue, 7 Aug 2018 16:58:19 +0800 Subject: [PATCH] Replace CV_BGRA2RGBA with CV_BGR2RGB --- samples/device/camera.cc | 4 ++-- src/api/synthetic.cc | 2 +- tools/dataset/dataset.cc | 2 +- tools/dataset/record.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/device/camera.cc b/samples/device/camera.cc index 2132ae4..16a99bf 100644 --- a/samples/device/camera.cc +++ b/samples/device/camera.cc @@ -142,8 +142,8 @@ int main(int argc, char *argv[]) { cv::Mat right_img( right_data.frame->height(), right_data.frame->width(), CV_8UC3, right_data.frame->data()); - cv::cvtColor(left_img, left_img, CV_BGRA2RGBA); - cv::cvtColor(right_img, right_img, CV_BGRA2RGBA); + cv::cvtColor(left_img, left_img, CV_BGR2RGB); + cv::cvtColor(right_img, right_img, CV_BGR2RGB); cv::hconcat(left_img, right_img, img); } else { return -1; diff --git a/src/api/synthetic.cc b/src/api/synthetic.cc index 4b6aff4..ac6075e 100644 --- a/src/api/synthetic.cc +++ b/src/api/synthetic.cc @@ -47,7 +47,7 @@ cv::Mat frame2mat(const std::shared_ptr &frame) { return img; } else if (frame->format() == Format::BGR888) { cv::Mat img(frame->height(), frame->width(), CV_8UC3, frame->data()); - cv::cvtColor(img, img, CV_BGRA2RGBA); + cv::cvtColor(img, img, CV_BGR2RGB); return img; } else { return cv::Mat(frame->height(), frame->width(), CV_8UC1, frame->data()); diff --git a/tools/dataset/dataset.cc b/tools/dataset/dataset.cc index 5a98f68..2e09b14 100644 --- a/tools/dataset/dataset.cc +++ b/tools/dataset/dataset.cc @@ -79,7 +79,7 @@ void Dataset::SaveStreamData( cv::Mat img( data.frame->height(), data.frame->width(), CV_8UC3, data.frame->data()); - cv::cvtColor(img, img, CV_BGRA2RGBA); + cv::cvtColor(img, img, CV_BGR2RGB); cv::imwrite(ss.str(), img); } else { cv::Mat img( diff --git a/tools/dataset/record.cc b/tools/dataset/record.cc index 96307aa..1c7d397 100644 --- a/tools/dataset/record.cc +++ b/tools/dataset/record.cc @@ -106,11 +106,11 @@ int main(int argc, char *argv[]) { cv::Mat left_img( left_frame->height(), left_frame->width(), CV_8UC3, left_frame->data()); - cv::cvtColor(left_img, left_img, CV_BGRA2RGBA); + cv::cvtColor(left_img, left_img, CV_BGR2RGB); cv::Mat right_img( right_frame->height(), right_frame->width(), CV_8UC3, right_frame->data()); - cv::cvtColor(right_img, right_img, CV_BGRA2RGBA); + cv::cvtColor(right_img, right_img, CV_BGR2RGB); cv::hconcat(left_img, right_img, img); } else { return -1;