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 | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/image.c b/src/image.c
index b25bf05..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;
@@ -369,7 +386,6 @@
// Will do a scaled image resize with the correct aspect ratio.
outImg = resizeImage(croppedImg, newHeight, newWidth, 0);
cvReleaseImage( &croppedImg );
-
}
else {
@@ -415,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;
@@ -720,7 +755,7 @@
void show_images(image *ims, int n, char *window)
{
image m = collapse_images_vert(ims, n);
- //save_image(m, window);
+ save_image(m, window);
show_image(m, window);
free_image(m);
}
--
Gitblit v1.10.0