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.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/src/image.c b/src/image.c
index 5c138d3..15b1523 100644
--- a/src/image.c
+++ b/src/image.c
@@ -138,7 +138,7 @@
}
free_image(copy);
if(disp->height < 500 || disp->width < 500 || disp->height > 1000){
- int w = 1500;
+ int w = 500;
int h = w*p.h/p.w;
if(h > 1000){
h = 1000;
@@ -199,6 +199,7 @@
image make_empty_image(int h, int w, int c)
{
image out;
+ out.data = 0;
out.h = h;
out.w = w;
out.c = c;
@@ -264,7 +265,7 @@
}
}
-void add_scalar_image(image m, float s)
+void translate_image(image m, float s)
{
int i;
for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
@@ -368,7 +369,6 @@
// Will do a scaled image resize with the correct aspect ratio.
outImg = resizeImage(croppedImg, newHeight, newWidth, 0);
cvReleaseImage( &croppedImg );
-
}
else {
@@ -414,6 +414,25 @@
return out;
}
+image load_image_color(char *filename, int h, int w)
+{
+ IplImage* src = 0;
+ if( (src = cvLoadImage(filename, 1)) == 0 )
+ {
+ printf("Cannot load file image %s\n", filename);
+ exit(0);
+ }
+ if(h && w && (src->height != h || src->width != w)){
+ //printf("Resized!\n");
+ IplImage *resized = resizeImage(src, h, w, 1);
+ cvReleaseImage(&src);
+ src = resized;
+ }
+ image out = ipl_to_image(src);
+ cvReleaseImage(&src);
+ return out;
+}
+
image load_image(char *filename, int h, int w)
{
IplImage* src = 0;
@@ -645,15 +664,49 @@
for(i =0 ; i < m.h*m.w*m.c; ++i) printf("%lf, ", m.data[i]);
printf("\n");
}
+image collapse_images_vert(image *ims, int n)
+{
+ int color = 1;
+ int border = 1;
+ int h,w,c;
+ w = ims[0].w;
+ h = (ims[0].h + border) * n - border;
+ c = ims[0].c;
+ if(c != 3 || !color){
+ w = (w+border)*c - border;
+ c = 1;
+ }
-image collapse_images(image *ims, int n)
+ image filters = make_image(h,w,c);
+ int i,j;
+ for(i = 0; i < n; ++i){
+ int h_offset = i*(ims[0].h+border);
+ image copy = copy_image(ims[i]);
+ //normalize_image(copy);
+ if(c == 3 && color){
+ embed_image(copy, filters, h_offset, 0);
+ }
+ else{
+ for(j = 0; j < copy.c; ++j){
+ int w_offset = j*(ims[0].w+border);
+ image layer = get_image_layer(copy, j);
+ embed_image(layer, filters, h_offset, w_offset);
+ free_image(layer);
+ }
+ }
+ free_image(copy);
+ }
+ return filters;
+}
+
+image collapse_images_horz(image *ims, int n)
{
int color = 1;
int border = 1;
int h,w,c;
int size = ims[0].h;
h = size;
- w = (size + border) * n - border;
+ w = (ims[0].w + border) * n - border;
c = ims[0].c;
if(c != 3 || !color){
h = (h+border)*c - border;
@@ -665,7 +718,7 @@
for(i = 0; i < n; ++i){
int w_offset = i*(size+border);
image copy = copy_image(ims[i]);
- normalize_image(copy);
+ //normalize_image(copy);
if(c == 3 && color){
embed_image(copy, filters, 0, w_offset);
}
@@ -684,11 +737,49 @@
void show_images(image *ims, int n, char *window)
{
- image m = collapse_images(ims, n);
+ image m = collapse_images_vert(ims, n);
+ save_image(m, window);
show_image(m, window);
free_image(m);
}
+image grid_images(image **ims, int h, int w)
+{
+ int i;
+ image *rows = calloc(h, sizeof(image));
+ for(i = 0; i < h; ++i){
+ rows[i] = collapse_images_horz(ims[i], w);
+ }
+ image out = collapse_images_vert(rows, h);
+ for(i = 0; i < h; ++i){
+ free_image(rows[i]);
+ }
+ free(rows);
+ return out;
+}
+
+void test_grid()
+{
+ int i,j;
+ int num = 3;
+ int topk = 3;
+ image **vizs = calloc(num, sizeof(image*));
+ for(i = 0; i < num; ++i){
+ vizs[i] = calloc(topk, sizeof(image));
+ for(j = 0; j < topk; ++j) vizs[i][j] = make_image(3,3,3);
+ }
+ image grid = grid_images(vizs, num, topk);
+ save_image(grid, "Test Grid");
+ free_image(grid);
+}
+
+void show_images_grid(image **ims, int h, int w, char *window)
+{
+ image out = grid_images(ims, h, w);
+ show_image(out, window);
+ free_image(out);
+}
+
void free_image(image m)
{
free(m.data);
--
Gitblit v1.10.0