Merge pull request #557 from nstiurca:fix-cvv-MSVC

modules/cvv/CMakeLists.txt

@@ -4,7 +4,12 @@ if(NOT HAVE_QT5)
 endif()
 
 # we need C++11 and want warnings:
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -pedantic")
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11 /W4")
+  add_definitions(/D__func__=__FUNCTION__)
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -pedantic")
+endif()
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wmissing-declarations)
 
 # Qt5

modules/cvv/src/impl/filter_call.cpp

@@ -12,8 +12,8 @@ namespace impl
 FilterCall::FilterCall(cv::InputArray in, cv::InputArray out,
                        impl::CallMetaData data, QString type,
                        QString description, QString requestedView)
-    : Call{ data,                   std::move(type),
+    : Call( data,                   std::move(type),
-	    std::move(description), std::move(requestedView) },
+	    std::move(description), std::move(requestedView) ),
       input_{ in.getMat().clone() }, output_{ out.getMat().clone() }
 {
 }

modules/cvv/src/impl/match_call.cpp

@@ -18,8 +18,8 @@ MatchCall::MatchCall(cv::InputArray img1, std::vector<cv::KeyPoint> keypoints1,
                      std::vector<cv::DMatch> matches, impl::CallMetaData data,
                      QString type, QString description, QString requestedView,
                      bool useTrainDescriptor)
-    : Call{ data,                   std::move(type),
+    : Call( data,                   std::move(type),
-	    std::move(description), std::move(requestedView) },
+	    std::move(description), std::move(requestedView) ),
       img1_{ img1.getMat().clone() }, keypoints1_{ std::move(keypoints1) },
       img2_{ img2.getMat().clone() }, keypoints2_{ std::move(keypoints2) },
       matches_{ std::move(matches) }, usesTrainDescriptor_{ useTrainDescriptor }

modules/cvv/src/impl/single_image_call.cpp

@@ -14,8 +14,8 @@ namespace impl
 SingleImageCall::SingleImageCall(cv::InputArray img, impl::CallMetaData data,
                                  QString type, QString description,
                                  QString requestedView)
-    : Call{ data,                   std::move(type),
+    : Call( data,                   std::move(type),
-	    std::move(description), std::move(requestedView) },
+	    std::move(description), std::move(requestedView) ),
       img{ img.getMat().clone() }
 {
 }

modules/cvv/src/qtutil/matchview/colorutil.hpp

@@ -1,6 +1,7 @@
 #ifndef CVVISUAL_COLOR_UTIL
 #define CVVISUAL_COLOR_UTIL
 
+#include <cstdint>
 #include <vector>
 
 #include <QColor>

modules/cvv/src/qtutil/util.cpp

@@ -4,6 +4,7 @@
 #include <stdexcept>
 #include <thread>
 #include <functional>
+#include <memory>
 
 #include <QDesktopServices>
 #include <QUrl>

modules/cvv/src/view/defaultfilterview.cpp

@@ -19,7 +19,7 @@ namespace view
 
 DefaultFilterView::DefaultFilterView(const std::vector<cv::Mat> &images,
 				     QWidget *parent)
-    : FilterView{ parent }
+    : FilterView( parent )
 {
 
 	auto layout = util::make_unique<QHBoxLayout>();

modules/cvv/src/view/dual_filter_view.cpp

@@ -31,7 +31,7 @@ namespace view
 
 // neuer Konstruktor
 DualFilterView::DualFilterView(std::array<cv::Mat, 2> images, QWidget *parent)
-    : FilterView{ parent }, rawImages_(images)
+    : FilterView( parent ), rawImages_(images)
 {
 	auto layout = util::make_unique<QHBoxLayout>();
 	auto imageLayout = util::make_unique<QHBoxLayout>();

modules/cvv/src/view/linematchview.cpp

@@ -24,7 +24,7 @@ LineMatchView::LineMatchView(std::vector<cv::KeyPoint> leftKeyPoints,
 			     std::vector<cv::KeyPoint> rightKeyPoints,
 			     std::vector<cv::DMatch> matches, cv::Mat leftIm,
 			     cv::Mat rightIm, bool usetrainIdx, QWidget *parent)
-    : MatchView{ parent }
+    : MatchView( parent )
 {
 	std::vector<cv::KeyPoint> allkeypoints;
 	for(auto key:rightKeyPoints)

modules/cvv/src/view/pointmatchview.cpp

@@ -21,7 +21,7 @@ PointMatchView::PointMatchView(std::vector<cv::KeyPoint> leftKeyPoints,
 			       std::vector<cv::DMatch> matches, cv::Mat leftIm,
 			       cv::Mat rightIm, bool usetrainIdx,
 			       QWidget *parent)
-    : MatchView{ parent }
+    : MatchView( parent )
 {
 	auto layout = util::make_unique<QHBoxLayout>();
 	auto accor = util::make_unique<qtutil::Accordion>();

modules/cvv/src/view/singlefilterview.cpp

@@ -20,7 +20,7 @@ namespace view
 
 SingleFilterView::SingleFilterView(const std::vector<cv::Mat> &images,
 				   QWidget *parent)
-    : FilterView{ parent }
+    : FilterView( parent )
 {
 	auto imwid = util::make_unique<QWidget>();
 	auto accor = util::make_unique<qtutil::Accordion>();

modules/cvv/src/view/translationsmatchview.cpp

@@ -19,7 +19,7 @@ TranslationMatchView::TranslationMatchView(
     std::vector<cv::KeyPoint> leftKeyPoints,
     std::vector<cv::KeyPoint> rightKeyPoints, std::vector<cv::DMatch> matches,
     cv::Mat leftIm, cv::Mat rightIm, bool usetrainIdx, QWidget *parent)
-    : MatchView{ parent }
+    : MatchView( parent )
 {
 	std::vector<cv::KeyPoint> allkeypoints;
 	for(auto key:rightKeyPoints)