From e31c50127e3d364b0b14b5a36a12ffa1a2046f44 Mon Sep 17 00:00:00 2001 From: Joseph Redmon Date: Thu, 15 Mar 2018 15:40:09 -0700 Subject: [PATCH] no opencv bad opencv --- Makefile | 2 +- examples/detector.c | 4 ++++ examples/super.c | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 48560f9c..a0455d06 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GPU=1 CUDNN=1 -OPENCV=1 +OPENCV=0 OPENMP=1 DEBUG=0 diff --git a/examples/detector.c b/examples/detector.c index c7c2c73b..ad98291b 100644 --- a/examples/detector.c +++ b/examples/detector.c @@ -624,6 +624,7 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam void censor_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename, int class, float thresh, int skip) { +#ifdef OPENCV image **alphabet = load_alphabet(); char *base = basecfg(cfgfile); network *net = load_network(cfgfile, weightfile, 0); @@ -702,10 +703,12 @@ void censor_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_ind free_image(in); } } + #endif } void extract_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_index, const char *filename, int class, float thresh, int skip) { +#ifdef OPENCV image **alphabet = load_alphabet(); char *base = basecfg(cfgfile); network *net = load_network(cfgfile, weightfile, 0); @@ -790,6 +793,7 @@ void extract_detector(char *datacfg, char *cfgfile, char *weightfile, int cam_in free_image(in); } } + #endif } /* diff --git a/examples/super.c b/examples/super.c index 79799d05..89a8e562 100644 --- a/examples/super.c +++ b/examples/super.c @@ -94,7 +94,6 @@ void test_super(char *cfgfile, char *weightfile, char *filename) printf("%s: Predicted in %f seconds.\n", input, sec(clock()-time)); save_image(out, "out"); show_image(out, "out"); - cvWaitKey(0); free_image(im); if (filename) break;