Differential D6912 Diff 17541 files/caffe2-video-opencv-4.patch

Changeset View

Standalone View

				From 16d00e3e701b18124166d8a26c592e1d24e33737 Mon Sep 17 00:00:00 2001
				From: Leo Mao <leomaoyw@gmail.com>
				Date: Sat, 10 Aug 2019 13:11:12 +0800
				Subject: [PATCH] opencv 4 compatibility fix for caffe2/video

				---
				caffe2/video/video_input_op.h \| 6 +++---
				1 file changed, 3 insertions(+), 3 deletions(-)

				diff --git a/caffe2/video/video_input_op.h b/caffe2/video/video_input_op.h
				index b047eb68326a..850462761156 100644
				--- a/caffe2/video/video_input_op.h
				+++ b/caffe2/video/video_input_op.h
				@@ -573,7 +573,7 @@ bool VideoInputOp<Context>::GetImageAndLabelsFromDBValue(
				&encoded_size,
				CV_8UC1,
				const_cast<char*>(encoded_image_str.data())),
				- CV_LOAD_IMAGE_COLOR);
				+ cv::IMREAD_COLOR);
				if (src.rows == 0 or src.cols == 0) {
				throw std::runtime_error("Both rows and cols are 0 for image");
				}
				@@ -606,13 +606,13 @@ bool VideoInputOp<Context>::GetImageAndLabelsFromDBValue(
				img = scaled_img;
				} else {
				cv::cvtColor(
				- scaled_img, img, (channels_rgb_ == 1) ? CV_BGR2GRAY : CV_GRAY2BGR);
				+ scaled_img, img, (channels_rgb_ == 1) ? cv::COLOR_BGR2GRAY : cv::COLOR_GRAY2BGR);
				}

				cv::Mat rgb_img;

				if (channels_rgb_ == 1) {
				- cv::cvtColor(img, rgb_img, CV_BGR2RGB);
				+ cv::cvtColor(img, rgb_img, cv::COLOR_BGR2RGB);
				} else {
				rgb_img = img;
				}