From e36182cd8c5dd5c6d0aa1f77cf5cdca87e8bb1f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 21 Nov 2014 23:35:19 +0000
Subject: [PATCH] cleaned up data parsing a lot. probably nothing broken?

---
 src/image.h |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/image.h b/src/image.h
index 9f7d74d..9f7fc8e 100644
--- a/src/image.h
+++ b/src/image.h
@@ -1,6 +1,7 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 typedef struct {
@@ -12,7 +13,7 @@
 
 image image_distance(image a, image b);
 void scale_image(image m, float s);
-void add_scalar_image(image m, float s);
+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);
@@ -21,11 +22,20 @@
 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 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_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);
 void print_image(image m);
 
 image make_image(int h, int w, int c);
@@ -35,10 +45,12 @@
 image float_to_image(int h, int w, 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);
 
 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);
 
 image get_image_layer(image m, int l);

--
Gitblit v1.10.0