Merge pull request #1910 from philkr/encoded

  add force_encoded_color flag to the data layer and warn about
  mixed encoding

diff --cc src/caffe/layers/data_layer.cpp
index 9a2dfac,7716406..8877caf
--- 1/src/caffe/layers/data_layer.cpp
--- 2/src/caffe/layers/data_layer.cpp
+++ b/src/caffe/layers/data_layer.cpp
@@@ -102,6 -91,8 +104,7 @@@ void DataLayer<Dtype>::InternalThreadEn
    if (this->output_labels_) {
      top_label = this->prefetch_label_.mutable_cpu_data();
    }
 -  const int batch_size = this->layer_param_.data_param().batch_size();
+   bool force_color = this->layer_param_.data_param().force_encoded_color();
    for (int item_id = 0; item_id < batch_size; ++item_id) {
      timer.Start();
      // get a blob
@@@ -110,7 -101,15 +113,17 @@@
  
      cv::Mat cv_img;
      if (datum.encoded()) {
-        cv_img = DecodeDatumToCVMatNative(datum);
 -      if (force_color)
++      if (force_color) {
+         cv_img = DecodeDatumToCVMat(datum, true);
 -      else
++      } else {
+         cv_img = DecodeDatumToCVMatNative(datum);
 -      if (cv_img.channels() != this->transformed_data_.channels())
++      }
++      if (cv_img.channels() != this->transformed_data_.channels()) {
+         LOG(WARNING) << "Your dataset contains encoded images with mixed "
+         << "channel sizes. Consider adding a 'force_color' flag to the "
+         << "model definition, or rebuild your dataset using "
+         << "convert_imageset.";
++      }
      }
      read_time += timer.MicroSeconds();
      timer.Start();

diff --cc src/caffe/layers/window_data_layer.cpp
Simple merge

diff --cc src/caffe/proto/caffe.proto
Simple merge