From b5936b499abc94c0efffbcc99b5698574b59d860 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 05 Sep 2015 00:52:44 +0000
Subject: [PATCH] lots of stuff
---
src/image.h | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/image.h b/src/image.h
index af6682e..27dc62a 100644
--- a/src/image.h
+++ b/src/image.h
@@ -1,17 +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
+#include "box.h"
typedef struct {
int h;
@@ -23,10 +18,13 @@
float get_color(int c, int x, int max);
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);
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 resize_image(image im, int w, int h);
+image resize_image2(image im, int w, int h);
void translate_image(image m, float s);
void normalize_image(image p);
image rotate_image(image m, float rad);
@@ -36,6 +34,8 @@
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);
+image grayscale_image(image im);
image collapse_image_layers(image source, int border);
image collapse_images_horz(image *ims, int n);
@@ -47,6 +47,10 @@
void show_image_layers(image p, char *name);
void show_image_collapsed(image p, char *name);
+#ifdef OPENCV
+void save_image_jpg(image p, char *name);
+#endif
+
void print_image(image m);
image make_image(int w, int h, int c);
@@ -59,7 +63,8 @@
float get_pixel(image m, int x, int y, int c);
float get_pixel_extend(image m, int x, int y, int c);
void set_pixel(image m, int x, int y, int c, float val);
-float billinear_interpolate(image im, float x, float y, int c);
+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);
--
Gitblit v1.10.0