From 57fce97fd5c2486997a6ee9ac67cccf2a5f35c81 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 18 Apr 2018 19:17:24 +0000
Subject: [PATCH] yolo_console_dll.cpp uses Yolo v3 by default
---
src/image.h | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/image.h b/src/image.h
index 7e7ecf6..24b8684 100644
--- a/src/image.h
+++ b/src/image.h
@@ -9,8 +9,8 @@
#include "box.h"
typedef struct {
- int h;
- int w;
+ int w;
+ int h;
int c;
float *data;
} image;
@@ -22,7 +22,8 @@
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);
+void draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image **labels, int classes);
+void draw_detections_v3(image im, detection *dets, int num, float thresh, char **names, image **alphabet, 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);
@@ -30,7 +31,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);
+YOLODLL_API 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);
@@ -41,7 +46,7 @@
void distort_image(image im, float hue, float sat, float val);
void saturate_exposure_image(image im, float sat, float exposure);
void hsv_to_rgb(image im);
-void rgbgr_image(image im);
+YOLODLL_API void rgbgr_image(image im);
void constrain_image(image im);
void composite_3d(char *f1, char *f2, char *out, int delta);
int best_3d_shift_r(image a, image b, int min, int max);
@@ -55,6 +60,7 @@
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);
@@ -62,14 +68,14 @@
void print_image(image m);
-image make_image(int w, int h, int c);
+YOLODLL_API image make_image(int w, int h, int c);
image make_random_image(int w, int h, int c);
image make_empty_image(int w, int h, int c);
image float_to_image(int w, int h, int c, float *data);
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();
+YOLODLL_API 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);
@@ -79,7 +85,7 @@
image get_image_layer(image m, int l);
-void free_image(image m);
+YOLODLL_API void free_image(image m);
void test_resize(char *filename);
#endif
--
Gitblit v1.10.0