From e625b32e060753e2029d52bc0150637f2a14cb72 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 14 Aug 2015 15:45:52 +0000
Subject: [PATCH] Should fix for OpenCV 3.0
---
src/image.c | 5 +++++
src/coco.c | 3 +++
src/detection.c | 3 +++
src/imagenet.c | 4 ++++
src/darknet.c | 5 +++--
src/image.h | 6 ------
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/coco.c b/src/coco.c
index ed53cef..66fddf5 100644
--- a/src/coco.c
+++ b/src/coco.c
@@ -7,6 +7,9 @@
#include "parser.h"
#include "box.h"
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#endif
char *coco_classes[] = {"person","bicycle","car","motorcycle","airplane","bus","train","truck","boat","traffic light","fire hydrant","stop sign","parking meter","bench","bird","cat","dog","horse","sheep","cow","elephant","bear","zebra","giraffe","backpack","umbrella","handbag","tie","suitcase","frisbee","skis","snowboard","sports ball","kite","baseball bat","baseball glove","skateboard","surfboard","tennis racket","bottle","wine glass","cup","fork","knife","spoon","bowl","banana","apple","sandwich","orange","broccoli","carrot","hot dog","pizza","donut","cake","chair","couch","potted plant","bed","dining table","toilet","tv","laptop","mouse","remote","keyboard","cell phone","microwave","oven","toaster","sink","refrigerator","book","clock","vase","scissors","teddy bear","hair drier","toothbrush"};
diff --git a/src/darknet.c b/src/darknet.c
index c03ba5b..0b69f40 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -6,8 +6,9 @@
#include "utils.h"
#include "cuda.h"
-#define _GNU_SOURCE
-#include <fenv.h>
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#endif
extern void run_imagenet(int argc, char **argv);
extern void run_detection(int argc, char **argv);
diff --git a/src/detection.c b/src/detection.c
index f595701..c9dea3e 100644
--- a/src/detection.c
+++ b/src/detection.c
@@ -5,6 +5,9 @@
#include "parser.h"
#include "box.h"
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#endif
char *class_names[] = {"aeroplane", "bicycle", "bird", "boat", "bottle", "bus", "car", "cat", "chair", "cow", "diningtable", "dog", "horse", "motorbike", "person", "pottedplant", "sheep", "sofa", "train", "tvmonitor"};
diff --git a/src/image.c b/src/image.c
index 92c9066..d86f752 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3,6 +3,11 @@
#include <stdio.h>
#include <math.h>
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/imgproc/imgproc_c.h"
+#endif
+
#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#define STB_IMAGE_WRITE_IMPLEMENTATION
diff --git a/src/image.h b/src/image.h
index e380025..b635ff1 100644
--- a/src/image.h
+++ b/src/image.h
@@ -1,18 +1,12 @@
#ifndef IMAGE_H
#define IMAGE_H
-
#include <stdlib.h>
#include <stdio.h>
#include <float.h>
#include <string.h>
#include <math.h>
-#ifdef OPENCV
-#include "opencv2/highgui/highgui_c.h"
-#include "opencv2/imgproc/imgproc_c.h"
-#endif
-
typedef struct {
int h;
int w;
diff --git a/src/imagenet.c b/src/imagenet.c
index 499a8d3..aeb7e69 100644
--- a/src/imagenet.c
+++ b/src/imagenet.c
@@ -2,6 +2,10 @@
#include "utils.h"
#include "parser.h"
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#endif
+
void train_imagenet(char *cfgfile, char *weightfile)
{
data_seed = time(0);
--
Gitblit v1.10.0