diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-04-29 18:44:52 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-04-29 18:49:38 +0200 |
| commit | 48e94f67beb57749999d16adcf43af93ee8976da (patch) | |
| tree | 16fc222417fc487afd8c0f49c9655d81e6ccd846 | |
| parent | 4a8aa4397aa578e19ce7e6a0b1fdd702bd4187d5 (diff) | |
tracker/{easy,pt,wii}: update `ensure_size'
| -rw-r--r-- | tracker-easy/preview.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/module/frame.cpp | 2 | ||||
| -rw-r--r-- | tracker-wii/wii_frame.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tracker-easy/preview.cpp b/tracker-easy/preview.cpp index 218fca43..198f838b 100644 --- a/tracker-easy/preview.cpp +++ b/tracker-easy/preview.cpp @@ -120,7 +120,7 @@ namespace EasyTracker void Preview::ensure_size(cv::Mat& frame, int w, int h, int type) { - if (frame.cols != w || frame.rows != h) + if (frame.cols != w || frame.rows != h || frame.type() != type) frame = cv::Mat(h, w, type); } diff --git a/tracker-pt/module/frame.cpp b/tracker-pt/module/frame.cpp index a045b783..ab110871 100644 --- a/tracker-pt/module/frame.cpp +++ b/tracker-pt/module/frame.cpp @@ -73,7 +73,7 @@ void Preview::draw_head_center(f x, f y) void Preview::ensure_size(cv::Mat& frame, int w, int h, int type) { - if (frame.cols != w || frame.rows != h) + if (frame.cols != w || frame.rows != h || frame.type() != type) frame = cv::Mat(h, w, type); } diff --git a/tracker-wii/wii_frame.cpp b/tracker-wii/wii_frame.cpp index d6628f00..8f18f4b8 100644 --- a/tracker-wii/wii_frame.cpp +++ b/tracker-wii/wii_frame.cpp @@ -97,6 +97,6 @@ void WIIPreview::draw_head_center(f x, f y) void WIIPreview::ensure_size(cv::Mat& frame, int w, int h, int type) { - if (frame.cols != w || frame.rows != h) + if (frame.cols != w || frame.rows != h || frame.type() != type) frame = cv::Mat(h, w, type); } |