From 457f8baa215b62adc6b221606d26039bc188368c Mon Sep 17 00:00:00 2001 From: Alex Wilkinson Date: Fri, 18 Sep 2020 18:37:38 +0100 Subject: [PATCH] Updated to remove OpenCV1.0 C API references. Now compatible with OpenCV4 --- src/helper/bounding_box.h | 1 - src/helper/helper.h | 1 - src/loader/loader_alov.cpp | 1 - src/loader/loader_alov.h | 1 - src/loader/loader_vot.cpp | 1 - src/loader/video_loader.cpp | 1 - src/loader/video_loader.h | 1 - src/network/regressor.cpp | 16 ++++++++-------- src/test/save_videos_vot.cpp | 1 - src/test/test_tracker_alov.cpp | 1 - src/tracker/tracker.h | 1 - src/tracker/tracker_manager.cpp | 2 +- src/train/example_generator.h | 1 - src/train/tracker_trainer.h | 1 - src/visualizer/show_tracker_alov.cpp | 1 - src/visualizer/show_tracker_vot.cpp | 1 - 16 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/helper/bounding_box.h b/src/helper/bounding_box.h index 3db57ebe..fe2aaabe 100644 --- a/src/helper/bounding_box.h +++ b/src/helper/bounding_box.h @@ -3,7 +3,6 @@ #include -#include #include #include #include diff --git a/src/helper/helper.h b/src/helper/helper.h index 29163bf0..30747a7b 100644 --- a/src/helper/helper.h +++ b/src/helper/helper.h @@ -15,7 +15,6 @@ #include #include -#include #include #include diff --git a/src/loader/loader_alov.cpp b/src/loader/loader_alov.cpp index fe395721..985c9203 100644 --- a/src/loader/loader_alov.cpp +++ b/src/loader/loader_alov.cpp @@ -1,6 +1,5 @@ #include "loader_alov.h" -#include #include #include diff --git a/src/loader/loader_alov.h b/src/loader/loader_alov.h index 7a3189a7..49acddc5 100644 --- a/src/loader/loader_alov.h +++ b/src/loader/loader_alov.h @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/src/loader/loader_vot.cpp b/src/loader/loader_vot.cpp index 4eafa64e..e3ce46ca 100644 --- a/src/loader/loader_vot.cpp +++ b/src/loader/loader_vot.cpp @@ -1,6 +1,5 @@ #include "loader_vot.h" -#include #include #include diff --git a/src/loader/video_loader.cpp b/src/loader/video_loader.cpp index de5b54e7..a2c91f96 100644 --- a/src/loader/video_loader.cpp +++ b/src/loader/video_loader.cpp @@ -1,6 +1,5 @@ #include "video_loader.h" -#include #include #include diff --git a/src/loader/video_loader.h b/src/loader/video_loader.h index beb82bd3..74742712 100644 --- a/src/loader/video_loader.h +++ b/src/loader/video_loader.h @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/src/network/regressor.cpp b/src/network/regressor.cpp index 4654244b..50707436 100644 --- a/src/network/regressor.cpp +++ b/src/network/regressor.cpp @@ -286,13 +286,13 @@ void Regressor::Preprocess(const cv::Mat& img, // Convert the input image to the input image format of the network. cv::Mat sample; if (img.channels() == 3 && num_channels_ == 1) - cv::cvtColor(img, sample, CV_BGR2GRAY); + cv::cvtColor(img, sample, cv::COLOR_BGR2GRAY); else if (img.channels() == 4 && num_channels_ == 1) - cv::cvtColor(img, sample, CV_BGRA2GRAY); + cv::cvtColor(img, sample, cv::COLOR_BGRA2GRAY); else if (img.channels() == 4 && num_channels_ == 3) - cv::cvtColor(img, sample, CV_BGRA2BGR); + cv::cvtColor(img, sample, cv::COLOR_BGRA2BGR); else if (img.channels() == 1 && num_channels_ == 3) - cv::cvtColor(img, sample, CV_GRAY2BGR); + cv::cvtColor(img, sample, cv::COLOR_GRAY2BGR); else sample = img; @@ -332,13 +332,13 @@ void Regressor::Preprocess(const std::vector& images, // Convert the input image to the input image format of the network. cv::Mat sample; if (img.channels() == 3 && num_channels_ == 1) - cv::cvtColor(img, sample, CV_BGR2GRAY); + cv::cvtColor(img, sample, cv::COLOR_BGR2GRAY); else if (img.channels() == 4 && num_channels_ == 1) - cv::cvtColor(img, sample, CV_BGRA2GRAY); + cv::cvtColor(img, sample, cv::COLOR_BGRA2GRAY); else if (img.channels() == 4 && num_channels_ == 3) - cv::cvtColor(img, sample, CV_BGRA2BGR); + cv::cvtColor(img, sample, cv::COLOR_BGRA2BGR); else if (img.channels() == 1 && num_channels_ == 3) - cv::cvtColor(img, sample, CV_GRAY2BGR); + cv::cvtColor(img, sample, cv::COLOR_GRAY2BGR); else sample = img; diff --git a/src/test/save_videos_vot.cpp b/src/test/save_videos_vot.cpp index 5b86ef3e..76901075 100644 --- a/src/test/save_videos_vot.cpp +++ b/src/test/save_videos_vot.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/src/test/test_tracker_alov.cpp b/src/test/test_tracker_alov.cpp index ca7e8210..9041b42e 100644 --- a/src/test/test_tracker_alov.cpp +++ b/src/test/test_tracker_alov.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/src/tracker/tracker.h b/src/tracker/tracker.h index db5fce8b..92612626 100644 --- a/src/tracker/tracker.h +++ b/src/tracker/tracker.h @@ -1,7 +1,6 @@ #ifndef TRACKER_H #define TRACKER_H -#include #include #include diff --git a/src/tracker/tracker_manager.cpp b/src/tracker/tracker_manager.cpp index 6fbed7d0..068227a1 100644 --- a/src/tracker/tracker_manager.cpp +++ b/src/tracker/tracker_manager.cpp @@ -147,7 +147,7 @@ void TrackerTesterAlov::VideoInit(const Video& video, const size_t video_num) { // Open a video_writer object to save the tracking videos. const string video_out_name = video_out_folder + "/Video" + num2str(static_cast(video_num)) + ".avi"; - video_writer_.open(video_out_name, CV_FOURCC('M','J','P','G'), 50, image.size()); + video_writer_.open(video_out_name, cv::VideoWriter::fourcc('M','J','P','G'), 50, image.size()); } } diff --git a/src/train/example_generator.h b/src/train/example_generator.h index b34ab657..0da58976 100644 --- a/src/train/example_generator.h +++ b/src/train/example_generator.h @@ -1,7 +1,6 @@ #ifndef EXAMPLE_GENERATOR_H #define EXAMPLE_GENERATOR_H -#include #include #include diff --git a/src/train/tracker_trainer.h b/src/train/tracker_trainer.h index e9636d8a..265a250e 100644 --- a/src/train/tracker_trainer.h +++ b/src/train/tracker_trainer.h @@ -3,7 +3,6 @@ #include -#include #include "helper/bounding_box.h" #include "tracker/tracker.h" diff --git a/src/visualizer/show_tracker_alov.cpp b/src/visualizer/show_tracker_alov.cpp index dffae5c6..c92f0c6a 100644 --- a/src/visualizer/show_tracker_alov.cpp +++ b/src/visualizer/show_tracker_alov.cpp @@ -2,7 +2,6 @@ #include -#include #include #include diff --git a/src/visualizer/show_tracker_vot.cpp b/src/visualizer/show_tracker_vot.cpp index 5989951e..e6c44fe7 100644 --- a/src/visualizer/show_tracker_vot.cpp +++ b/src/visualizer/show_tracker_vot.cpp @@ -2,7 +2,6 @@ #include -#include #include #include