From 132251d72325e1005ef6c47f83d6a4e9b9355d12 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 03 Jun 2018 21:37:08 +0000
Subject: [PATCH] You can do: fuse_conv_batchnorm(network net) from DLL/SO-library
---
src/image.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/image.c b/src/image.c
index 3ffd552..35e8551 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,15 @@
}
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);
+ 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