From 05fc3a99095f16077db940f5b694b76171a3bf7a Mon Sep 17 00:00:00 2001 From: Kirill Kornyakov Date: Thu, 20 Mar 2014 23:03:16 +0400 Subject: [PATCH 1/7] Fix bioinspired build on Mac (clang) --- modules/bioinspired/src/transientareassegmentationmodule.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/bioinspired/src/transientareassegmentationmodule.cpp b/modules/bioinspired/src/transientareassegmentationmodule.cpp index 663cd5d56..252956ce8 100644 --- a/modules/bioinspired/src/transientareassegmentationmodule.cpp +++ b/modules/bioinspired/src/transientareassegmentationmodule.cpp @@ -77,6 +77,8 @@ #include "precomp.hpp" #include "basicretinafilter.hpp" +#include + #define _SEGMENTATIONDEBUG //define SEGMENTATIONDEBUG to access more data/methods namespace cv From 2fb9cac027f3582d499f0b6fa85093c3e4261e0c Mon Sep 17 00:00:00 2001 From: Kirill Kornyakov Date: Thu, 20 Mar 2014 23:04:11 +0400 Subject: [PATCH 2/7] Temporary hack to workaround optim build issue on Mac (clang) --- modules/tracking/src/PFSolver.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tracking/src/PFSolver.hpp b/modules/tracking/src/PFSolver.hpp index f85047cee..ba8910665 100644 --- a/modules/tracking/src/PFSolver.hpp +++ b/modules/tracking/src/PFSolver.hpp @@ -103,7 +103,7 @@ namespace cv{ _particles.row(i).copyTo(new_particles.row(num_particles)); } } - Mat_ maxrow=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); + Mat_ maxrow;//=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); for(;num_particles& row){ double logsum=0.0; - double max=*(std::max_element(row.begin(),row.end())); + double max;//=*(std::max_element(row.begin(),row.end())); row-=max; for(int i=0;i Date: Thu, 20 Mar 2014 23:07:29 +0400 Subject: [PATCH 3/7] Initial version of Travis config --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..1e5a09121 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: cpp +compiler: + - gcc + - clang +before_script: + - cd ../ + - git clone https://github.com/Itseez/opencv.git + - mkdir ../opencv-build + - cd ../opencv-build + - cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules ../opencv +script: + - make -j5 +notifications: + email: false From 5ec0442311e60b849fc9517de880fdb80cd412c2 Mon Sep 17 00:00:00 2001 From: Kirill Kornyakov Date: Thu, 20 Mar 2014 23:11:51 +0400 Subject: [PATCH 4/7] Ping Travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e5a09121..9c0c1ceb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ compiler: before_script: - cd ../ - git clone https://github.com/Itseez/opencv.git - - mkdir ../opencv-build - - cd ../opencv-build + - mkdir ../build-opencv + - cd ../build-opencv - cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules ../opencv script: - make -j5 From 04651a25db13c6429e1db8d6466d68fa6ddcb3d4 Mon Sep 17 00:00:00 2001 From: Kirill Kornyakov Date: Thu, 20 Mar 2014 23:14:27 +0400 Subject: [PATCH 5/7] Fix Travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c0c1ceb4..23b3aba4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ compiler: before_script: - cd ../ - git clone https://github.com/Itseez/opencv.git - - mkdir ../build-opencv - - cd ../build-opencv + - mkdir build-opencv + - cd build-opencv - cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules ../opencv script: - make -j5 From 597055362033982cedb8f1276477f525da1301cf Mon Sep 17 00:00:00 2001 From: Kirill Kornyakov Date: Thu, 20 Mar 2014 23:30:44 +0400 Subject: [PATCH 6/7] Revert "Temporary hack to workaround optim build issue on Mac (clang)" This reverts commit 2fb9cac027f3582d499f0b6fa85093c3e4261e0c. --- modules/tracking/src/PFSolver.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tracking/src/PFSolver.hpp b/modules/tracking/src/PFSolver.hpp index ba8910665..f85047cee 100644 --- a/modules/tracking/src/PFSolver.hpp +++ b/modules/tracking/src/PFSolver.hpp @@ -103,7 +103,7 @@ namespace cv{ _particles.row(i).copyTo(new_particles.row(num_particles)); } } - Mat_ maxrow;//=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); + Mat_ maxrow=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); for(;num_particles& row){ double logsum=0.0; - double max;//=*(std::max_element(row.begin(),row.end())); + double max=*(std::max_element(row.begin(),row.end())); row-=max; for(int i=0;i Date: Tue, 1 Apr 2014 16:48:43 -0700 Subject: [PATCH 7/7] Workaround build issue on Mac --- modules/tracking/src/PFSolver.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/tracking/src/PFSolver.hpp b/modules/tracking/src/PFSolver.hpp index f85047cee..89f2dd9d7 100644 --- a/modules/tracking/src/PFSolver.hpp +++ b/modules/tracking/src/PFSolver.hpp @@ -103,7 +103,10 @@ namespace cv{ _particles.row(i).copyTo(new_particles.row(num_particles)); } } - Mat_ maxrow=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); + //Mat_ maxrow=_particles.row(std::max_element(_logweight.begin(),_logweight.end())-_logweight.begin()); + double max_element; + minMaxLoc(_logweight, 0, &max_element); + Mat_ maxrow=_particles.row(max_element); for(;num_particles& row){ double logsum=0.0; - double max=*(std::max_element(row.begin(),row.end())); + //double max=*(std::max_element(row.begin(),row.end())); + double max; + minMaxLoc(row, 0, &max); row-=max; for(int i=0;i