From 0f645836f193e75c4c3b718369e6fab15b5d19c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 11 Feb 2015 03:41:03 +0000
Subject: [PATCH] Detection is back, baby\!
---
src/image.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/image.c b/src/image.c
index 99837e1..a686a3e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7,16 +7,41 @@
void draw_box(image a, int x1, int y1, int x2, int y2)
{
int i, c;
+ if(x1 < 0) x1 = 0;
+ if(x1 >= a.w) x1 = a.w-1;
+ if(x2 < 0) x2 = 0;
+ if(x2 >= a.w) x2 = a.w-1;
+
+ if(y1 < 0) y1 = 0;
+ if(y1 >= a.h) y1 = a.h-1;
+ if(y2 < 0) y2 = 0;
+ if(y2 >= a.h) y2 = a.h-1;
+
for(c = 0; c < a.c; ++c){
for(i = x1; i < x2; ++i){
- a.data[i + y1*a.w + c*a.w*a.h] = 0;
- a.data[i + y2*a.w + c*a.w*a.h] = 0;
+ 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] = 0;
- a.data[x2 + i*a.w + c*a.w*a.h] = 0;
+ 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;
+ }
+ }
+}
+
+void jitter_image(image a, int h, int w, int dh, int dw)
+{
+ int i,j,k;
+ for(k = 0; k < a.c; ++k){
+ for(i = 0; i < h; ++i){
+ for(j = 0; j < w; ++j){
+ int src = j + dw + (i+dh)*a.w + k*a.w*a.h;
+ int dst = j + i*w + k*w*h;
+ //printf("%d %d\n", src, dst);
+ a.data[dst] = a.data[src];
+ }
}
}
}
@@ -459,7 +484,7 @@
exit(0);
}
if(h && w ){
- IplImage *resized = resizeImage(src, h, w, 1);
+ IplImage *resized = resizeImage(src, h, w, 0);
cvReleaseImage(&src);
src = resized;
}
@@ -677,10 +702,21 @@
void print_image(image m)
{
- int i;
- for(i =0 ; i < m.h*m.w*m.c; ++i) printf("%lf, ", m.data[i]);
+ int i, j, k;
+ for(i =0 ; i < m.c; ++i){
+ for(j =0 ; j < m.h; ++j){
+ for(k = 0; k < m.w; ++k){
+ printf("%.2lf, ", m.data[i*m.h*m.w + j*m.w + k]);
+ if(k > 30) break;
+ }
+ printf("\n");
+ if(j > 30) break;
+ }
+ printf("\n");
+ }
printf("\n");
}
+
image collapse_images_vert(image *ims, int n)
{
int color = 1;
--
Gitblit v1.10.0