projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4dae5e8
)
io.cpp: changed the imread flag to cv::IMREAD_COLOR
author
Yangqing Jia
<jiayq84@gmail.com>
Tue, 19 Nov 2013 21:37:28 +0000
(13:37 -0800)
committer
Yangqing Jia
<jiayq84@gmail.com>
Tue, 19 Nov 2013 21:37:28 +0000
(13:37 -0800)
src/caffe/util/io.cpp
patch
|
blob
|
history
diff --git
a/src/caffe/util/io.cpp
b/src/caffe/util/io.cpp
index
ced807a
..
570fa0a
100644
(file)
--- a/
src/caffe/util/io.cpp
+++ b/
src/caffe/util/io.cpp
@@
-70,7
+70,7
@@
bool ReadImageToDatum(const string& filename, const int label,
const int height, const int width, Datum* datum) {
cv::Mat cv_img;
if (height > 0 && width > 0) {
- cv::Mat cv_img_origin = cv::imread(filename,
CV_LOAD_IMAGE
_COLOR);
+ cv::Mat cv_img_origin = cv::imread(filename,
cv::IMREAD
_COLOR);
cv::resize(cv_img_origin, cv_img, cv::Size(height, width));
} else {
cv_img = cv::imread(filename, CV_LOAD_IMAGE_COLOR);