From 2662cd51a32cf8292ccce555f64880f460108d2d Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 28 Mar 2017 10:57:27 +0000
Subject: [PATCH] Fixed sequence of freeing memory.
---
src/yolo_v2_class.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index c58ebda..ea13ea3 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -18,6 +18,7 @@
#include <vector>
#include <iostream>
+#include <algorithm>
#define FRAMES 3
@@ -78,9 +79,9 @@
for (int j = 0; j < FRAMES; ++j) free(detector_gpu.predictions[j]);
for (int j = 0; j < FRAMES; ++j) if(detector_gpu.images[j].data) free(detector_gpu.images[j].data);
+ for (int j = 0; j < l.w*l.h*l.n; ++j) free(detector_gpu.probs[j]);
free(detector_gpu.boxes);
free(detector_gpu.probs);
- for (int j = 0; j < l.w*l.h*l.n; ++j) free(detector_gpu.probs[j]);
int old_gpu_index;
cudaGetDevice(&old_gpu_index);
@@ -182,8 +183,8 @@
if (prob > thresh)
{
bbox_t bbox;
- bbox.x = (b.x - b.w / 2.)*im.w;
- bbox.y = (b.y - b.h / 2.)*im.h;
+ bbox.x = std::max((double)0, (b.x - b.w / 2.)*im.w);
+ bbox.y = std::max((double)0, (b.y - b.h / 2.)*im.h);
bbox.w = b.w*im.w;
bbox.h = b.h*im.h;
bbox.obj_id = obj_id;
--
Gitblit v1.10.0