Merge pull request #1910 from philkr/encoded
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 20 Feb 2015 02:01:13 +0000 (18:01 -0800)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 20 Feb 2015 02:01:13 +0000 (18:01 -0800)
commit9114424cef4f61539d5a457d64bdf98e178881bc
tree92c5031546b7af39b9a74eebb1d0d1f4dabbed92
parentccd837433df0bfadcd198419ee554e39f7f0a7f9
parenta2f7f479a82290ca60126873f18ed54e37bb9e2c
Merge pull request #1910 from philkr/encoded

  add force_encoded_color flag to the data layer and warn about
  mixed encoding
src/caffe/layers/data_layer.cpp
src/caffe/layers/window_data_layer.cpp
src/caffe/proto/caffe.proto