From d97331b88ff3d50035b1e22c9d0eb671b61227e3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 15 Apr 2015 07:32:32 +0000
Subject: [PATCH] level adjustment for images
---
src/crop_layer.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/crop_layer.c b/src/crop_layer.c
index df6eb41..bc13151 100644
--- a/src/crop_layer.c
+++ b/src/crop_layer.c
@@ -7,10 +7,10 @@
int h = layer.crop_height;
int w = layer.crop_width;
int c = layer.c;
- return float_to_image(h,w,c,layer.output);
+ return float_to_image(w,h,c,layer.output);
}
-crop_layer *make_crop_layer(int batch, int h, int w, int c, int crop_height, int crop_width, int flip)
+crop_layer *make_crop_layer(int batch, int h, int w, int c, int crop_height, int crop_width, int flip, float angle)
{
fprintf(stderr, "Crop Layer: %d x %d -> %d x %d x %d image\n", h,w,crop_height,crop_width,c);
crop_layer *layer = calloc(1, sizeof(crop_layer));
@@ -19,6 +19,7 @@
layer->w = w;
layer->c = c;
layer->flip = flip;
+ layer->angle = angle;
layer->crop_width = crop_width;
layer->crop_height = crop_height;
layer->output = calloc(crop_width*crop_height * c*batch, sizeof(float));
@@ -28,14 +29,19 @@
return layer;
}
-void forward_crop_layer(const crop_layer layer, float *input)
+void forward_crop_layer(const crop_layer layer, network_state state)
{
int i,j,c,b,row,col;
int index;
int count = 0;
int flip = (layer.flip && rand()%2);
- int dh = rand()%(layer.h - layer.crop_height);
- int dw = rand()%(layer.w - layer.crop_width);
+ int dh = rand()%(layer.h - layer.crop_height + 1);
+ int dw = rand()%(layer.w - layer.crop_width + 1);
+ if(!state.train){
+ flip = 0;
+ dh = (layer.h - layer.crop_height)/2;
+ dw = (layer.w - layer.crop_width)/2;
+ }
for(b = 0; b < layer.batch; ++b){
for(c = 0; c < layer.c; ++c){
for(i = 0; i < layer.crop_height; ++i){
@@ -47,7 +53,7 @@
}
row = i + dh;
index = col+layer.w*(row+layer.h*(c + layer.c*b));
- layer.output[count++] = input[index];
+ layer.output[count++] = state.input[index];
}
}
}
--
Gitblit v1.10.0