diff options
| author | Ronghang Hu <huronghang@hotmail.com> | 2015-11-20 03:08:03 -0800 |
|---|---|---|
| committer | Ronghang Hu <huronghang@hotmail.com> | 2015-11-20 03:08:03 -0800 |
| commit | df21b6a1c1d200d54d7917f3d78951473dbf02fb (patch) | |
| tree | 3bdbafcf3c4589462d1c10d0dcaf3faa29be3f29 /src/caffe/util | |
| parent | 70dbcd08601b642eeaa25188c54e68b840b3f399 (diff) | |
| parent | e09329077d7612d7d1a185ea120be6be91bf03d2 (diff) | |
| download | caffeonacl-df21b6a1c1d200d54d7917f3d78951473dbf02fb.tar.gz caffeonacl-df21b6a1c1d200d54d7917f3d78951473dbf02fb.tar.bz2 caffeonacl-df21b6a1c1d200d54d7917f3d78951473dbf02fb.zip | |
Merge pull request #3363 from BonsaiAI/remove-opencv-include
Exclude core.hpp when building without OpenCV
Diffstat (limited to 'src/caffe/util')
| -rw-r--r-- | src/caffe/util/io.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/caffe/util/io.cpp b/src/caffe/util/io.cpp index f2b1dd98..835d2d4e 100644 --- a/src/caffe/util/io.cpp +++ b/src/caffe/util/io.cpp @@ -2,8 +2,8 @@ #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/io/zero_copy_stream_impl.h> #include <google/protobuf/text_format.h> -#include <opencv2/core/core.hpp> #ifdef USE_OPENCV +#include <opencv2/core/core.hpp> #include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui_c.h> #include <opencv2/imgproc/imgproc.hpp> |