[patch] Patch for opencv-3.0.0

opencv-3.0.0-min.patch (text/plain), 2.12 KB, created by Andrew on 2016-02-01 06:55:54 UTC

--- modules/cvv/src/view/linematchview.cpp.orig	2016-02-01 16:30:48.569145679 +1000
+++ modules/cvv/src/view/linematchview.cpp	2016-02-01 16:30:48.562145679 +1000
@@ -45,8 +45,8 @@
 	qtutil::MatchScene *matchscene_ptr = matchscene.get();
 	int updateAreaDelay=std::min(std::max(matches.size(),
 					      std::max(leftKeyPoints.size(),
-						       rightKeyPoints.size()))/10,50lu);
-	matchscene_ptr->getLeftImage().setUpdateAreaDelay(updateAreaDelay);
+					      rightKeyPoints.size()))/(std::size_t)10,(std::size_t)50);
+        matchscene_ptr->getLeftImage().setUpdateAreaDelay(updateAreaDelay);
 	matchscene_ptr->getRightImage().setUpdateAreaDelay(updateAreaDelay);
 
 	matchManagment_ = matchmnt.get();
--- modules/cvv/src/view/pointmatchview.cpp.orig	2016-02-01 16:30:48.569145679 +1000
+++ modules/cvv/src/view/pointmatchview.cpp	2016-02-01 16:30:48.562145679 +1000
@@ -30,7 +30,7 @@
 	auto matchmnt = util::make_unique<qtutil::MatchManagement>(matches);
 
 	qtutil::MatchScene *matchscene_ptr = matchscene.get();
-	int updateAreaDelay=std::min(std::max(matches.size(),std::max(leftKeyPoints.size(),rightKeyPoints.size()))/10,50lu);
+	int updateAreaDelay=std::min(std::max(matches.size(),std::max(leftKeyPoints.size(),rightKeyPoints.size()))/(std::size_t)10,(std::size_t)50);
 	matchscene_ptr->getLeftImage().setUpdateAreaDelay(updateAreaDelay);
 	matchscene_ptr->getRightImage().setUpdateAreaDelay(updateAreaDelay);
 
--- modules/cvv/src/view/translationsmatchview.cpp.orig	2016-02-01 16:30:48.570145679 +1000
+++ modules/cvv/src/view/translationsmatchview.cpp	2016-02-01 16:30:48.563145679 +1000
@@ -39,7 +39,7 @@
 	auto keyPointmnt = util::make_unique<qtutil::KeyPointManagement>(allkeypoints);
 
 	qtutil::MatchScene *matchscene_ptr = matchscene.get();
-	int updateAreaDelay=std::min(std::max(matches.size(),std::max(leftKeyPoints.size(),rightKeyPoints.size()))/10,50lu);
+	int updateAreaDelay=std::min(std::max(matches.size(),std::max(leftKeyPoints.size(),rightKeyPoints.size()))/(std::size_t)10,(std::size_t)50);
 	matchscene_ptr->getLeftImage().setUpdateAreaDelay(updateAreaDelay);
 	matchscene_ptr->getRightImage().setUpdateAreaDelay(updateAreaDelay);