From 65e430588d76adbcf435db6b2e3aec791de651d0 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 26 May 2018 13:36:30 +0000
Subject: [PATCH] Merge pull request #909 from jing-vision/master
---
src/classifier.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/classifier.c b/src/classifier.c
index c84dcb2..98dd4c6 100644
--- a/src/classifier.c
+++ b/src/classifier.c
@@ -598,7 +598,7 @@
void try_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filename, int layer_num)
{
- network net = parse_network_cfg(cfgfile);
+ network net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -679,7 +679,7 @@
void predict_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filename, int top)
{
- network net = parse_network_cfg(cfgfile);
+ network net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -868,7 +868,7 @@
}
else {
//cap = cvCaptureFromCAM(cam_index);
- cap = get_capture_webcam(filename);
+ cap = get_capture_webcam(cam_index);
}
int top = option_find_int(options, "top", 1);
@@ -1004,7 +1004,7 @@
}
else {
//cap = cvCaptureFromCAM(cam_index);
- cap = get_capture_webcam(filename);
+ cap = get_capture_webcam(cam_index);
}
int top = option_find_int(options, "top", 1);
@@ -1069,7 +1069,7 @@
{
#ifdef OPENCV
printf("Classifier Demo\n");
- network net = parse_network_cfg(cfgfile);
+ network net = parse_network_cfg_custom(cfgfile, 1);
if(weightfile){
load_weights(&net, weightfile);
}
@@ -1084,7 +1084,7 @@
cap = get_capture_video_stream(filename);
}else{
//cap = cvCaptureFromCAM(cam_index);
- cap = get_capture_webcam(filename);
+ cap = get_capture_webcam(cam_index);
}
int top = option_find_int(options, "top", 1);
--
Gitblit v1.10.0