Merge pull request #1413 from alalek:fix_build

Author: mshabunin

modules/cnn_3dobj/CMakeLists.txt

@@ -1,3 +1,5 @@
+set(BUILD_opencv_cnn_3dobj_INIT OFF)  # Must be disabled by default - requires custom build of Caffe.
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 
 find_package(Caffe)
@@ -8,7 +10,9 @@ else()
   message(STATUS "Caffe:   NO")
 endif()
 
-find_package(Protobuf)
+if(NOT BUILD_PROTOBUF)
+  find_package(Protobuf)
+endif()
 if(Protobuf_FOUND)
   message(STATUS "Protobuf:   YES")
   set(HAVE_PROTOBUF 1)

modules/cnn_3dobj/FindProtobuf.cmake

@@ -58,18 +58,10 @@ struct CallMetaData
 
 } // namespaces
 
-#ifdef __GNUC__
-#define CVVISUAL_FUNCTION_NAME_MACRO __PRETTY_FUNCTION__
-#else
-#define CVVISUAL_FUNCTION_NAME_MACRO __func__
-#endif
-
 /**
  * @brief Creates an instance of CallMetaData with the location of the macro as
  * value.
  */
-#define CVVISUAL_LOCATION                                                      \
-	::cvv::impl::CallMetaData(__FILE__, __LINE__,                          \
-	                          CVVISUAL_FUNCTION_NAME_MACRO)
+#define CVVISUAL_LOCATION ::cvv::impl::CallMetaData(__FILE__, __LINE__, CV_Func)
 
 #endif

modules/cvv/include/opencv2/cvv/call_meta_data.hpp

@@ -67,14 +67,14 @@ void changedPixelImage(const cv::Mat& mat0, const cv::Mat& mat1, cv::Mat& out)
 template<int Depth, int Channels>
 void changedPixelImage(const cv::Mat& mat0, const cv::Mat& mat1, cv::Mat& out)
 {
-	using PixelInType=const cvv::qtutil::PixelType<Depth,Channels>;
+	using PixelInType=cvv::qtutil::PixelType<Depth,Channels>;
 	using PixelOutType=cvv::qtutil::DepthType<CV_8U>;
 
 
 	cv::Mat result=cv::Mat::zeros(mat0.rows, mat0.cols,CV_8U);
 	bool same;
-	PixelInType* in0;
-	PixelInType* in1;
+	const PixelInType* in0;
+	const PixelInType* in1;
 	for(int i=0;i<result.rows;i++)
 	{
 		for(int j=0;j<result.cols;j++)

modules/cvv/src/qtutil/filter/changed_pixels_widget.cpp

@@ -12,7 +12,7 @@ TEST(LocationTest, FileLineFunction)
 	auto locationMacroResult = CVVISUAL_LOCATION;
 	size_t line = __LINE__ - 1;
 	auto file = __FILE__;
-	auto fun = CVVISUAL_FUNCTION_NAME_MACRO;
+	auto fun = CV_Func;
 	EXPECT_EQ(locationMacroResult.isKnown, true);
 	EXPECT_EQ(locationMacroResult.file, file);
 	EXPECT_EQ(locationMacroResult.line, line);

modules/cvv/test/test_location.cpp

@@ -79,7 +79,9 @@ add_definitions(-DCNN_NO_SERIALIZATION -DCNN_USE_CAFFE_CONVERTER)
 
 # NOTE: In case that proto files already exist,
 #       this is not needed anymore.
-find_package(Protobuf QUIET)
+if(NOT BUILD_PROTOBUF)
+  find_package(Protobuf QUIET)
+endif()
 
 if(NOT ${Protobuf_FOUND})
   message(STATUS "Module opencv_dnn_modern disabled because Protobuf is not found")

modules/dnn_modern/CMakeLists.txt

@@ -121,7 +121,7 @@ Mat loadPLYSimple(const char* fileName, int withNormals)
   {
     float* data = cloud.ptr<float>(i);
     int col = 0;
-    for (; col < withNormals ? 6 : 3; ++col)
+    for (; col < (withNormals ? 6 : 3); ++col)
     {
       ifs >> data[col];
     }