Commit b7a76004 authored by Anguelos Nicolaou's avatar Anguelos Nicolaou

Attenpt to supress visual studio and IOS warnings v2

parent 2b788904
...@@ -61,7 +61,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ...@@ -61,7 +61,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(${Caffe_FOUND}) if(${Caffe_FOUND})
include_directories(${Caffe_INCLUDE_DIR}) include_directories(${Caffe_INCLUDE_DIR})
#Anguelos: taken from caffe's cmake #taken from caffe's cmake
find_package(HDF5 COMPONENTS HL REQUIRED) find_package(HDF5 COMPONENTS HL REQUIRED)
include_directories(SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR}) include_directories(SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR})
list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES}) list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES})
...@@ -74,7 +74,7 @@ endif() ...@@ -74,7 +74,7 @@ endif()
if(${Caffe_FOUND}) if(${Caffe_FOUND})
#Anguelos: taken from caffe's cmake #taken from caffe's cmake
target_link_libraries(opencv_text ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} ${HDF5_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(opencv_text ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
endif() endif()
endif() endif()
......
...@@ -133,7 +133,7 @@ public: ...@@ -133,7 +133,7 @@ public:
void classifyBatch(InputArrayOfArrays inputImageList, OutputArray classProbabilities){ void classifyBatch(InputArrayOfArrays inputImageList, OutputArray classProbabilities){
std::vector<Mat> allImageVector; std::vector<Mat> allImageVector;
inputImageList.getMatVector(allImageVector); inputImageList.getMatVector(allImageVector);
classProbabilities.create(Size(unsigned int(this->outputSize_),allImageVector.size()),CV_32F); classProbabilities.create(Size((size_t)(this->outputSize_),allImageVector.size()),CV_32F);
Mat outputMat = classProbabilities.getMat(); Mat outputMat = classProbabilities.getMat();
for(size_t imgNum=0;imgNum<allImageVector.size();imgNum+=this->minibatchSz_){ for(size_t imgNum=0;imgNum<allImageVector.size();imgNum+=this->minibatchSz_){
int rangeEnd=imgNum+std::min<int>(allImageVector.size()-imgNum,this->minibatchSz_); int rangeEnd=imgNum+std::min<int>(allImageVector.size()-imgNum,this->minibatchSz_);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment