From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi

---
 src/image.h |   81 ++++++++++++++++++++++++----------------
 1 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/src/image.h b/src/image.h
index 8b36c69..ece7cb6 100644
--- a/src/image.h
+++ b/src/image.h
@@ -1,9 +1,18 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <float.h>
+#include <string.h>
+#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;
@@ -12,61 +21,69 @@
 } image;
 
 float get_color(int c, int x, int max);
-void jitter_image(image a, int h, int w, int dh, int dw);
 void flip_image(image a);
 void draw_box(image a, int x1, int y1, int x2, int y2, float r, float g, float b);
+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);
 image image_distance(image a, image b);
 void scale_image(image m, float s);
-image crop_image(image im, int dr, int dc, int h, int w);
-image resize_image(image im, int h, int w);
+image crop_image(image im, int dx, int dy, int w, int h);
+image random_crop_image(image im, int low, int high, int size);
+image resize_image(image im, int w, int h);
+image resize_min(image im, int min);
 void translate_image(image m, float s);
 void normalize_image(image p);
-void z_normalize_image(image p);
-void threshold_image(image p, float t);
-void zero_image(image m);
-void rotate_image(image m);
-void subtract_image(image a, image b);
-float avg_image_layer(image m, int l);
-void embed_image(image source, image dest, int h, int w);
-void add_into_image(image src, image dest, int h, int w);
+image rotate_image(image m, float rad);
+void rotate_image_cw(image im, int times);
+void embed_image(image source, image dest, int dx, int dy);
+void saturate_image(image im, float sat);
+void exposure_image(image im, float sat);
+void saturate_exposure_image(image im, float sat, float exposure);
+void hsv_to_rgb(image im);
+void rgbgr_image(image im);
+void constrain_image(image im);
+void composite_3d(char *f1, char *f2, char *out);
+
+image grayscale_image(image im);
+image threshold_image(image im, float thresh);
+
 image collapse_image_layers(image source, int border);
 image collapse_images_horz(image *ims, int n);
 image collapse_images_vert(image *ims, int n);
-image get_sub_image(image m, int h, int w, int dh, int dw);
 
-void show_image(image p, char *name);
-void save_image(image p, char *name);
+void show_image(image p, const char *name);
+void show_image_normalized(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);
-void show_images_grid(image **ims, int h, int w, char *window);
-void test_grid();
-image grid_images(image **ims, int h, int w);
+
+#ifdef OPENCV
+void save_image_jpg(image p, 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 h, int w, int c);
-image make_empty_image(int h, int w, int c);
-image make_random_image(int h, int w, int c);
-image make_random_kernel(int size, int c, float scale);
-image float_to_image(int h, int w, int c, float *data);
+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 h, int w);
-image load_image_color(char *filename, int h, int w);
-image ipl_to_image(IplImage* src);
+image load_image(char *filename, int w, int h, int c);
+image load_image_color(char *filename, int w, int h);
 
 float get_pixel(image m, int x, int y, int c);
 float get_pixel_extend(image m, int x, int y, int c);
-void add_pixel(image m, int x, int y, int c, float val);
 void set_pixel(image m, int x, int y, int c, float val);
+void add_pixel(image m, int x, int y, int c, float val);
+float bilinear_interpolate(image im, float x, float y, int c);
 
 image get_image_layer(image m, int l);
 
-void two_d_convolve(image m, int mc, image kernel, int kc, int stride, image out, int oc, int edge);
-void upsample_image(image m, int stride, image out);
-void convolve(image m, image kernel, int stride, int channel, image out, int edge);
-void back_convolve(image m, image kernel, int stride, int channel, image out, int edge);
-void kernel_update(image m, image update, int stride, int channel, image out, int edge);
-
 void free_image(image m);
 void test_resize(char *filename);
 #endif

--
Gitblit v1.10.0