Should fix for OpenCV 3.0

This commit is contained in:
Joseph Redmon 2015-08-14 08:45:32 -07:00
parent 7ebaec7306
commit e625b32e06
6 changed files with 18 additions and 8 deletions

View File

@ -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"};

View File

@ -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);

View File

@ -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"};

View File

@ -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

View File

@ -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;

View File

@ -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);