File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
61
61
if (${Caffe_FOUND} )
62
62
63
63
include_directories (${Caffe_INCLUDE_DIR} )
64
- #Anguelos: taken from caffe's cmake
64
+ #taken from caffe's cmake
65
65
find_package (HDF5 COMPONENTS HL REQUIRED )
66
66
include_directories (SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR} )
67
67
list (APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES} )
@@ -74,7 +74,7 @@ endif()
74
74
75
75
76
76
if (${Caffe_FOUND} )
77
- #Anguelos: taken from caffe's cmake
77
+ #taken from caffe's cmake
78
78
target_link_libraries (opencv_text ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} ${HDF5_LIBRARIES} ${Boost_LIBRARIES} )
79
79
endif ()
80
80
endif ()
Original file line number Diff line number Diff line change @@ -133,7 +133,7 @@ class DictNetCaffeImpl: public DictNet{
133
133
void classifyBatch (InputArrayOfArrays inputImageList, OutputArray classProbabilities){
134
134
std::vector<Mat> allImageVector;
135
135
inputImageList.getMatVector (allImageVector);
136
- classProbabilities.create (Size (unsigned int (this ->outputSize_ ),allImageVector.size ()),CV_32F);
136
+ classProbabilities.create (Size (( size_t ) (this ->outputSize_ ),allImageVector.size ()),CV_32F);
137
137
Mat outputMat = classProbabilities.getMat ();
138
138
for (size_t imgNum=0 ;imgNum<allImageVector.size ();imgNum+=this ->minibatchSz_ ){
139
139
int rangeEnd=imgNum+std::min<int >(allImageVector.size ()-imgNum,this ->minibatchSz_ );
You can’t perform that action at this time.
0 commit comments