mirror of https://github.com/AlexeyAB/darknet.git
Merge pull request #1212 from tinohager/master
optimize performance - detect method
This commit is contained in:
commit
0ae1cd81d2
|
@ -96,11 +96,17 @@ public:
|
||||||
std::shared_ptr<image_t> mat_to_image_resize(cv::Mat mat) const
|
std::shared_ptr<image_t> mat_to_image_resize(cv::Mat mat) const
|
||||||
{
|
{
|
||||||
if (mat.data == NULL) return std::shared_ptr<image_t>(NULL);
|
if (mat.data == NULL) return std::shared_ptr<image_t>(NULL);
|
||||||
|
|
||||||
|
cv::Size s = mat.size();
|
||||||
|
if (get_net_width() != s.width || get_net_height() != s.height) {
|
||||||
cv::Mat det_mat;
|
cv::Mat det_mat;
|
||||||
cv::resize(mat, det_mat, cv::Size(get_net_width(), get_net_height()));
|
cv::resize(mat, det_mat, cv::Size(get_net_width(), get_net_height()));
|
||||||
return mat_to_image(det_mat);
|
return mat_to_image(det_mat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return mat_to_image(mat);
|
||||||
|
}
|
||||||
|
|
||||||
static std::shared_ptr<image_t> mat_to_image(cv::Mat img_src)
|
static std::shared_ptr<image_t> mat_to_image(cv::Mat img_src)
|
||||||
{
|
{
|
||||||
cv::Mat img;
|
cv::Mat img;
|
||||||
|
|
Loading…
Reference in New Issue