fix im2col height/width bound check bug (issue #284 identified by

jeffdonahue · jeffdonahue · commit 1fa5ae26a49a · 2014-04-06T23:53:02.000-07:00
@kmatzen)
diff --git a/src/caffe/util/im2col.cu b/src/caffe/util/im2col.cu
@@ -29,7 +29,7 @@ __global__ void im2col_gpu_kernel(const int n, const Dtype* data_im,
       for (int j = 0; j < ksize; ++j) {
         int h = h_in + i;
         int w = w_in + j;
-        *data_col = (h >= 0 && w >= 0 && h < width && w < height) ?
+        *data_col = (h >= 0 && w >= 0 && h < height && w < width) ?
             data_im[i * width + j] : 0;
         data_col += height_col * width_col;
       }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ __global__ void im2col_gpu_kernel(const int n, const Dtype* data_im,`
`29`	`29`	`for (int j = 0; j < ksize; ++j) {`
`30`	`30`	`int h = h_in + i;`
`31`	`31`	`int w = w_in + j;`
`32`		`- *data_col = (h >= 0 && w >= 0 && h < width && w < height) ?`
	`32`	`+ *data_col = (h >= 0 && w >= 0 && h < height && w < width) ?`
`33`	`33`	`data_im[i * width + j] : 0;`
`34`	`34`	`data_col += height_col * width_col;`
`35`	`35`	`}`