potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source 
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489.
This commit is contained in:
Alexander Alekhin
2018-06-04 19:24:09 +03:00
parent 80709697e5 b2cff44084
commit 45dd575ed2
147 changed files with 5707 additions and 2831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/viz/CMakeLists.txt
+1 -1
View File
@@ -19,7 +19,7 @@ if(NOT BUILD_SHARED_LIBS)
endif()
endforeach()
if(_conflicts)
message(STATUS "Disabling VIZ module due conflicts with VTK dependencies: ${_conflicts}")
message(STATUS "Disabling VIZ module due to conflicts with VTK dependencies: ${_conflicts}")
ocv_module_disable(viz)
endif()
endif()
modules/viz/include/opencv2/viz/widgets.hpp
+1 -1
View File
@@ -506,7 +506,7 @@ namespace cv
};
/////////////////////////////////////////////////////////////////////////////
/// Compond widgets
/// Compound widgets
/** @brief This 3D Widget represents a coordinate system. :
*/
modules/viz/src/shapes.cpp
+1 -1
View File
@@ -528,7 +528,7 @@ void cv::viz::WText3D::setText(const String &text)
cv::String cv::viz::WText3D::getText() const
{
vtkFollower *actor = vtkFollower::SafeDownCast(WidgetAccessor::getProp(*this));
vtkActor *actor = vtkActor::SafeDownCast(WidgetAccessor::getProp(*this));
CV_Assert("This widget does not support text." && actor);
vtkPolyDataMapper *mapper = vtkPolyDataMapper::SafeDownCast(actor->GetMapper());