diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-02-19 17:54:49 -0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-02-19 17:54:49 -0800 |
| commit | ccd837433df0bfadcd198419ee554e39f7f0a7f9 (patch) | |
| tree | 4a4adf378a09ede4ac62858047fa40f569f1003d /src/caffe/layers/data_layer.cpp | |
| parent | 06ceaf452f65535a42b4f8a07f9cd861878d03e8 (diff) | |
| download | caffeonacl-ccd837433df0bfadcd198419ee554e39f7f0a7f9.tar.gz caffeonacl-ccd837433df0bfadcd198419ee554e39f7f0a7f9.tar.bz2 caffeonacl-ccd837433df0bfadcd198419ee554e39f7f0a7f9.zip | |
Repeal revert of #1878
Diffstat (limited to 'src/caffe/layers/data_layer.cpp')
| -rw-r--r-- | src/caffe/layers/data_layer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp index 0f959a9d..9a2dfac9 100644 --- a/src/caffe/layers/data_layer.cpp +++ b/src/caffe/layers/data_layer.cpp @@ -42,7 +42,7 @@ void DataLayer<Dtype>::DataLayerSetUp(const vector<Blob<Dtype>*>& bottom, Datum datum; datum.ParseFromString(cursor_->value()); - if (DecodeDatum(&datum)) { + if (DecodeDatumNative(&datum)) { LOG(INFO) << "Decoding Datum"; } // image @@ -110,7 +110,7 @@ void DataLayer<Dtype>::InternalThreadEntry() { cv::Mat cv_img; if (datum.encoded()) { - cv_img = DecodeDatumToCVMat(datum); + cv_img = DecodeDatumToCVMatNative(datum); } read_time += timer.MicroSeconds(); timer.Start(); |