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)
commit2f5af3fb973db2bc09b56ef76a73f6fc82de2703
tree43d7712d18b4e86659b470ea6a250f10d5b5e010
parent4ba3dfbcbd2eea13a4719c197309b67fead12480
parent52465873d08cfd58a4c84ee8b239908814de4f39
Merge pull request #1878 from philkr/encoded

Groom handling of encoded image inputs
src/caffe/layers/data_layer.cpp
src/caffe/layers/window_data_layer.cpp