From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/image.h | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/image.h b/src/image.h
index a0d1875..af6682e 100644
--- a/src/image.h
+++ b/src/image.h
@@ -2,8 +2,17 @@
#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
+
typedef struct {
int h;
int w;
@@ -20,8 +29,13 @@
image resize_image(image im, int w, int h);
void translate_image(image m, float s);
void normalize_image(image p);
-void rotate_image(image m);
+image rotate_image(image m, float rad);
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);
image collapse_image_layers(image source, int border);
image collapse_images_horz(image *ims, int n);
@@ -39,14 +53,13 @@
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);
+image load_image(char *filename, int w, int h, int c);
image load_image_color(char *filename, int w, int h);
-image ipl_to_image(IplImage* src);
-
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);
image get_image_layer(image m, int l);
--
Gitblit v1.10.0