From fe4f01b1d8cce9762e47aaf42b6e17a3427a144b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 20 Mar 2018 19:10:46 +0000
Subject: [PATCH] Fixed uses of WebCam for OpenCV 3.x
---
src/data.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/data.c b/src/data.c
index 71781aa..379756a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -269,7 +269,7 @@
h = boxes[i].h;
id = boxes[i].id;
- if (w < .01 || h < .01) continue;
+ if (w < .001 || h < .001) continue;
int col = (int)(x*num_boxes);
int row = (int)(y*num_boxes);
@@ -304,9 +304,10 @@
find_replace(labelpath, ".JPG", ".txt", labelpath);
find_replace(labelpath, ".JPEG", ".txt", labelpath);
int count = 0;
+ int i;
box_label *boxes = read_boxes(labelpath, &count);
if (small_object == 1) {
- for (int i = 0; i < count; ++i) {
+ for (i = 0; i < count; ++i) {
if (boxes[i].w < 0.01) boxes[i].w = 0.01;
if (boxes[i].h < 0.01) boxes[i].h = 0.01;
}
@@ -316,7 +317,6 @@
if(count > num_boxes) count = num_boxes;
float x,y,w,h;
int id;
- int i;
for (i = 0; i < count; ++i) {
x = boxes[i].x;
@@ -326,7 +326,7 @@
id = boxes[i].id;
// not detect small objects
- if ((w < 0.01 || h < 0.01)) continue;
+ if ((w < 0.001 || h < 0.001)) continue;
truth[i*5+0] = x;
truth[i*5+1] = y;
@@ -967,8 +967,8 @@
for(i = 0; i < 10000; ++i){
unsigned char bytes[3073];
fread(bytes, 1, 3073, fp);
- int class = bytes[0];
- y.vals[i][class] = 1;
+ int class_id = bytes[0];
+ y.vals[i][class_id] = 1;
for(j = 0; j < X.cols; ++j){
X.vals[i][j] = (double)bytes[j+1];
}
@@ -1031,8 +1031,8 @@
for(i = 0; i < 10000; ++i){
unsigned char bytes[3073];
fread(bytes, 1, 3073, fp);
- int class = bytes[0];
- y.vals[i+b*10000][class] = 1;
+ int class_id = bytes[0];
+ y.vals[i+b*10000][class_id] = 1;
for(j = 0; j < X.cols; ++j){
X.vals[i+b*10000][j] = (double)bytes[j+1];
}
--
Gitblit v1.10.0