From 37d7c1e79f65a75caf87e29a562d30c51cd654e5 Mon Sep 17 00:00:00 2001
From: Joe Redmon <pjreddie@gmail.com>
Date: Thu, 26 Nov 2015 21:52:56 +0000
Subject: [PATCH] fixed label linking
---
src/yolo_kernels.cu | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/yolo_kernels.cu b/src/yolo_kernels.cu
index a0ff5f7..e102f54 100644
--- a/src/yolo_kernels.cu
+++ b/src/yolo_kernels.cu
@@ -20,6 +20,9 @@
extern "C" void convert_yolo_detections(float *predictions, int classes, int num, int square, int side, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
extern "C" void draw_yolo(image im, int num, float thresh, box *boxes, float **probs);
+extern "C" char *voc_names[];
+extern "C" image voc_labels[];
+
static float **probs;
static box *boxes;
static network net;
@@ -57,11 +60,11 @@
printf("\033[1;1H");
printf("\nFPS:%.0f\n",fps);
printf("Objects:\n\n");
- draw_yolo(det, l.side*l.side*l.n, thresh, boxes, probs);
+ draw_detections(det, l.side*l.side*l.n, thresh, boxes, probs, voc_names, voc_labels, 20);
return 0;
}
-extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh)
+extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index)
{
printf("YOLO demo\n");
net = parse_network_cfg(cfgfile);
@@ -72,7 +75,7 @@
srand(2222222);
- cv::VideoCapture cam(0);
+ cv::VideoCapture cam(cam_index);
cap = cam;
if(!cap.isOpened()) error("Couldn't connect to webcam.\n");
@@ -118,7 +121,7 @@
}
}
#else
-extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh){
+extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh, int cam_index){
fprintf(stderr, "YOLO demo needs OpenCV for webcam images.\n");
}
#endif
--
Gitblit v1.10.0