From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Tue, 6 Nov 2018 20:04:31 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~471
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c6f1ab57d4250ee46e32d1b51c056431965b470;p=platform%2Fupstream%2Fopencv.git

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

2c6f1ab57d4250ee46e32d1b51c056431965b470
diff --cc doc/Doxyfile.in
index c8d127b,50f4926..3127733
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@@ -104,10 -104,10 +104,10 @@@ INPUT                  = @CMAKE_DOXYGEN
  INPUT_ENCODING         = UTF-8
  FILE_PATTERNS          =
  RECURSIVE              = YES
 -EXCLUDE                =
 +EXCLUDE                = @CMAKE_DOXYGEN_EXCLUDE_LIST@
  EXCLUDE_SYMLINKS       = NO
  EXCLUDE_PATTERNS       = *.inl.hpp *.impl.hpp *_detail.hpp */cudev/**/detail/*.hpp *.m */opencl/runtime/*
- EXCLUDE_SYMBOLS        = cv::DataType<*> cv::traits::* int void CV__*
+ EXCLUDE_SYMBOLS        = cv::DataType<*> cv::traits::* int void CV__* T __CV*
  EXAMPLE_PATH           = @CMAKE_DOXYGEN_EXAMPLE_PATH@
  EXAMPLE_PATTERNS       = *
  EXAMPLE_RECURSIVE      = YES