From 83b2ae66e13ef2b83153699361127c73936a8763 Mon Sep 17 00:00:00 2001
From: vinjn <vinjn.z@gmail.com>
Date: Sun, 10 Jun 2018 01:45:39 +0000
Subject: [PATCH] Expose YOLODLL_API layer* get_network_layer(network* net, int i);
---
src/image.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/image.c b/src/image.c
index 3ffd552..9084e7e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1011,7 +1011,7 @@
return im;
}
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture)
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture, int dont_close)
{
c = c ? c : 3;
IplImage* src;
@@ -1029,8 +1029,22 @@
}
else src = cvQueryFrame(cap);
- if (!src) return make_empty_image(0, 0, 0);
- if (src->width < 1 || src->height < 1 || src->nChannels < 1) return make_empty_image(0, 0, 0);
+ if (!src) {
+ if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c);
+ else return make_empty_image(0, 0, 0);
+ }
+ if (src->width < 1 || src->height < 1 || src->nChannels < 1) {
+ if (cpp_video_capture) {
+ cvReleaseImage(&src);
+ int z = 0;
+ for (z = 0; z < 10; ++z) {
+ get_webcam_frame(cap);
+ cvReleaseImage(&src);
+ }
+ }
+ if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c);
+ else return make_empty_image(0, 0, 0);
+ }
IplImage* new_img = cvCreateImage(cvSize(w, h), IPL_DEPTH_8U, c);
*in_img = cvCreateImage(cvSize(src->width, src->height), IPL_DEPTH_8U, c);
cvResize(src, *in_img, CV_INTER_LINEAR);
--
Gitblit v1.10.0