From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server
---
src/image.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 205 insertions(+), 3 deletions(-)
diff --git a/src/image.c b/src/image.c
index 24e3292..b946be8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4,6 +4,23 @@
int windows = 0;
+void draw_box(image a, int x1, int y1, int x2, int y2)
+{
+ int i, c;
+ for(c = 0; c < a.c; ++c){
+ for(i = x1; i < x2; ++i){
+ a.data[i + y1*a.w + c*a.w*a.h] = (c==0)?1:-1;
+ a.data[i + y2*a.w + c*a.w*a.h] = (c==0)?1:-1;
+ }
+ }
+ for(c = 0; c < a.c; ++c){
+ for(i = y1; i < y2; ++i){
+ a.data[x1 + i*a.w + c*a.w*a.h] = (c==0)?1:-1;
+ a.data[x2 + i*a.w + c*a.w*a.h] = (c==0)?1:-1;
+ }
+ }
+}
+
image image_distance(image a, image b)
{
int i,j;
@@ -113,6 +130,7 @@
return copy;
}
+
void show_image(image p, char *name)
{
int i,j,k;
@@ -137,7 +155,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;
@@ -152,6 +170,30 @@
cvReleaseImage(&disp);
}
+void save_image(image p, char *name)
+{
+ int i,j,k;
+ image copy = copy_image(p);
+ normalize_image(copy);
+
+ char buff[256];
+ //sprintf(buff, "%s (%d)", name, windows);
+ sprintf(buff, "%s.png", name);
+
+ IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
+ int step = disp->widthStep;
+ for(i = 0; i < p.h; ++i){
+ for(j = 0; j < p.w; ++j){
+ for(k= 0; k < p.c; ++k){
+ disp->imageData[i*step + j*p.c + k] = (unsigned char)(get_pixel(copy,i,j,k)*255);
+ }
+ }
+ }
+ free_image(copy);
+ cvSaveImage(buff, disp,0);
+ cvReleaseImage(&disp);
+}
+
void show_image_layers(image p, char *name)
{
int i;
@@ -174,6 +216,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;
@@ -227,7 +270,19 @@
return out;
}
-void add_scalar_image(image m, float s)
+void add_into_image(image src, image dest, int h, int w)
+{
+ int i,j,k;
+ for(k = 0; k < src.c; ++k){
+ for(i = 0; i < src.h; ++i){
+ for(j = 0; j < src.w; ++j){
+ add_pixel(dest, h+i, w+j, k, get_pixel(src, i, j, k));
+ }
+ }
+ }
+}
+
+void translate_image(image m, float s)
{
int i;
for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
@@ -331,7 +386,6 @@
// Will do a scaled image resize with the correct aspect ratio.
outImg = resizeImage(croppedImg, newHeight, newWidth, 0);
cvReleaseImage( &croppedImg );
-
}
else {
@@ -377,6 +431,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, 0);
+ 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;
@@ -404,6 +477,20 @@
}
return out;
}
+image get_sub_image(image m, int h, int w, int dh, int dw)
+{
+ image out = make_image(dh, dw, m.c);
+ int i,j,k;
+ for(k = 0; k < out.c; ++k){
+ for(i = 0; i < dh; ++i){
+ for(j = 0; j < dw; ++j){
+ float val = get_pixel(m, h+i, w+j, k);
+ set_pixel(out, i, j, k, val);
+ }
+ }
+ }
+ return out;
+}
float get_pixel(image m, int x, int y, int c)
{
@@ -594,6 +681,121 @@
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 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 = (ims[0].w + border) * n - border;
+ c = ims[0].c;
+ if(c != 3 || !color){
+ h = (h+border)*c - border;
+ c = 1;
+ }
+
+ image filters = make_image(h,w,c);
+ int i,j;
+ for(i = 0; i < n; ++i){
+ int w_offset = i*(size+border);
+ image copy = copy_image(ims[i]);
+ //normalize_image(copy);
+ if(c == 3 && color){
+ embed_image(copy, filters, 0, w_offset);
+ }
+ else{
+ for(j = 0; j < copy.c; ++j){
+ int h_offset = j*(size+border);
+ image layer = get_image_layer(copy, j);
+ embed_image(layer, filters, h_offset, w_offset);
+ free_image(layer);
+ }
+ }
+ free_image(copy);
+ }
+ return filters;
+}
+
+void show_images(image *ims, int n, char *window)
+{
+ 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)
{
--
Gitblit v1.10.0