Skip to content

Commit

Permalink
Merge pull request BVLC#805 from alfredtofu/dev
Browse files Browse the repository at this point in the history
Update image_data_layer.cpp
  • Loading branch information
Yangqing committed Jul 28, 2014
2 parents 2a23ead + 2f7c63f commit e2bfe59
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/caffe/layers/image_data_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void ImageDataLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom,
vector<Blob<Dtype>*>* top) {
Layer<Dtype>::SetUp(bottom, top);
const int new_height = this->layer_param_.image_data_param().new_height();
const int new_width = this->layer_param_.image_data_param().new_height();
const int new_width = this->layer_param_.image_data_param().new_width();
CHECK((new_height == 0 && new_width == 0) ||
(new_height > 0 && new_width > 0)) << "Current implementation requires "
"new_height and new_width to be set at the same time.";
Expand Down

0 comments on commit e2bfe59

Please sign in to comment.