1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 04:25:42 +08:00

Temporary hack to workaround optim build issue on Mac (clang)

This commit is contained in:
Kirill Kornyakov
2014-03-20 23:04:11 +04:00
parent 05fc3a9909
commit 2fb9cac027

View File

@@ -103,7 +103,7 @@ namespace cv{
_particles.row(i).copyTo(new_particles.row(num_particles)); _particles.row(i).copyTo(new_particles.row(num_particles));
} }
} }
Mat_<double> maxrow=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); Mat_<double> maxrow;//=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin());
for(;num_particles<new_particles.rows;num_particles++){ for(;num_particles<new_particles.rows;num_particles++){
maxrow.copyTo(new_particles.row(num_particles)); maxrow.copyTo(new_particles.row(num_particles));
} }
@@ -208,7 +208,7 @@ namespace cv{
} }
void PFSolver::normalize(Mat_<double>& row){ void PFSolver::normalize(Mat_<double>& row){
double logsum=0.0; double logsum=0.0;
double max=*(std::max_element(row.begin(),row.end())); double max;//=*(std::max_element(row.begin(),row.end()));
row-=max; row-=max;
for(int i=0;i<row.cols;i++){ for(int i=0;i<row.cols;i++){
logsum+=exp(row(0,i)); logsum+=exp(row(0,i));