From 481b57a96a9ef29b112caec1bb3e17ffb043ceae Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 25 Sep 2016 06:12:54 +0000
Subject: [PATCH] So I have this new programming paradigm.......

---
 src/image.h |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/image.h b/src/image.h
index 213c4b4..7e7ecf6 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,12 +21,13 @@
 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 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);
 image random_crop_image(image im, int w, int h);
-image random_augment_image(image im, float angle, int low, int high, int size);
+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);
 image resize_min(image im, int min);
@@ -64,12 +60,6 @@
 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 +69,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