Merge pull request #1878 from philkr/encoded
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Tue, 17 Feb 2015 05:03:31 +0000 (21:03 -0800)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Tue, 17 Feb 2015 05:03:31 +0000 (21:03 -0800)
Groom handling of encoded image inputs

1  2 
src/caffe/layers/data_layer.cpp
src/caffe/layers/window_data_layer.cpp

Simple merge