From bc810016a1f2eadf33a1ac800b64962a42f3d402 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 02 Aug 2017 22:36:22 +0000
Subject: [PATCH] cuDNN 6.0 supported. Also speed of console example improved.
---
src/yolo_v2_class.hpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp
index 34e220a..8330dfc 100644
--- a/src/yolo_v2_class.hpp
+++ b/src/yolo_v2_class.hpp
@@ -51,20 +51,20 @@
{
if(mat.data == NULL)
throw std::runtime_error("file not found");
- std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { free_image(*img); delete img; });
- *image_ptr = mat_to_image(mat);
+ auto image_ptr = mat_to_image(mat);
return detect(*image_ptr, thresh);
}
-private:
- static image_t mat_to_image(cv::Mat img)
+ static std::shared_ptr<image_t> mat_to_image(cv::Mat img)
{
+ std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { free_image(*img); delete img; });
std::shared_ptr<IplImage> ipl_small = std::make_shared<IplImage>(img);
- image_t im_small = ipl_to_image(ipl_small.get());
- rgbgr_image(im_small);
- return im_small;
+ *image_ptr = ipl_to_image(ipl_small.get());
+ rgbgr_image(*image_ptr);
+ return image_ptr;
}
+private:
static image_t ipl_to_image(IplImage* src)
{
unsigned char *data = (unsigned char *)src->imageData;
--
Gitblit v1.10.0