From 4cf4a89f05c671041c217a724fc9b4b026eb9de9 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 01 Jun 2018 21:33:17 +0000
Subject: [PATCH] Minor fix
---
src/demo.c | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 3452706..72f9c03 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -51,7 +51,7 @@
void draw_detections_cv(IplImage* show_img, int num, float thresh, box *boxes, float **probs, char **names, image **alphabet, int classes);
void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes, int ext_output);
void show_image_cv_ipl(IplImage *disp, const char *name);
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, 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);
IplImage* in_img;
IplImage* det_img;
IplImage* show_img;
@@ -61,7 +61,7 @@
void *fetch_in_thread(void *ptr)
{
//in = get_image_from_stream(cap);
- in_s = get_image_from_stream_resize(cap, net.w, net.h, &in_img, cpp_video_capture);
+ in_s = get_image_from_stream_resize(cap, net.w, net.h, net.c, &in_img, cpp_video_capture);
if(!in_s.data){
//error("Stream closed.");
printf("Stream closed.\n");
@@ -312,6 +312,33 @@
cvReleaseVideoWriter(&output_video_writer);
printf("output_video_writer closed. \n");
}
+
+ // free memory
+ cvReleaseImage(&show_img);
+ cvReleaseImage(&in_img);
+ free_image(in_s);
+
+ free(avg);
+ for (j = 0; j < FRAMES; ++j) free(predictions[j]);
+ for (j = 0; j < FRAMES; ++j) free_image(images[j]);
+
+ for (j = 0; j < l.w*l.h*l.n; ++j) free(probs[j]);
+ free(boxes);
+ free(probs);
+
+ free_ptrs(names, net.layers[net.n - 1].classes);
+
+ int i;
+ const int nsize = 8;
+ for (j = 0; j < nsize; ++j) {
+ for (i = 32; i < 127; ++i) {
+ free_image(alphabet[j][i]);
+ }
+ free(alphabet[j]);
+ }
+ free(alphabet);
+
+ free_network(net);
}
#else
void demo(char *cfgfile, char *weightfile, float thresh, float hier_thresh, int cam_index, const char *filename, char **names, int classes,
--
Gitblit v1.10.0