From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp
---
src/image.h | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/image.h b/src/image.h
index e124860..165a624 100644
--- a/src/image.h
+++ b/src/image.h
@@ -8,11 +8,6 @@
#include <math.h>
#include "box.h"
-#ifdef OPENCV
-#include "opencv2/highgui/highgui_c.h"
-#include "opencv2/imgproc/imgproc_c.h"
-#endif
-
typedef struct {
int h;
int w;
@@ -26,7 +21,8 @@
void draw_box_width(image a, int x1, int y1, int x2, int y2, int w, float r, float g, float b);
void draw_bbox(image a, box bbox, int w, float r, float g, float b);
void draw_label(image a, int r, int c, image label, const float *rgb);
-void draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image *labels, int classes);
+void write_label(image a, int r, int c, image *characters, char *string, float *rgb);
+void draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image **labels, int classes);
image image_distance(image a, image b);
void scale_image(image m, float s);
image crop_image(image im, int dx, int dy, int w, int h);
@@ -34,7 +30,11 @@
image random_augment_image(image im, float angle, float aspect, int low, int high, int size);
void random_distort_image(image im, float hue, float saturation, float exposure);
image resize_image(image im, int w, int h);
+void fill_image(image m, float s);
+void letterbox_image_into(image im, int w, int h, image boxed);
+image letterbox_image(image im, int w, int h);
image resize_min(image im, int min);
+image resize_max(image im, int max);
void translate_image(image m, float s);
void normalize_image(image p);
image rotate_image(image m, float rad);
@@ -59,17 +59,12 @@
void show_image(image p, const char *name);
void show_image_normalized(image im, const char *name);
+void save_image_png(image im, const char *name);
void save_image(image p, const char *name);
void show_images(image *ims, int n, char *window);
void show_image_layers(image p, char *name);
void show_image_collapsed(image p, char *name);
-#ifdef OPENCV
-void save_image_jpg(image p, const char *name);
-image get_image_from_stream(CvCapture *cap);
-image ipl_to_image(IplImage* src);
-#endif
-
void print_image(image m);
image make_image(int w, int h, int c);
@@ -79,6 +74,7 @@
image copy_image(image p);
image load_image(char *filename, int w, int h, int c);
image load_image_color(char *filename, int w, int h);
+image **load_alphabet();
float get_pixel(image m, int x, int y, int c);
float get_pixel_extend(image m, int x, int y, int c);
--
Gitblit v1.10.0