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

5 years ago · b098b0563b
parent d9e7b7f638 1062808197
commit b098b0563b
2 changed files with 1 additions and 2 deletions
--- a/modules/dnn_objdetect/include/opencv2/core_detect.hpp
+++ b/modules/dnn_objdetect/include/opencv2/core_detect.hpp
@ -7,7 +7,6 @@
 #include <vector>
 #include <memory>

-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>

 /** @defgroup dnn_objdetect DNN used for object detection
--- a/modules/ximgproc/include/opencv2/ximgproc.hpp
+++ b/modules/ximgproc/include/opencv2/ximgproc.hpp
@ -172,7 +172,7 @@ The function transforms a binary blob image into a skeletized form using the tec
 */
 CV_EXPORTS_W void thinning( InputArray src, OutputArray dst, int thinningType = THINNING_ZHANGSUEN);

-/** @brief Performs anisotropic diffusian on an image.
+/** @brief Performs anisotropic diffusion on an image.

 The function applies Perona-Malik anisotropic diffusion to an image. This is the solution to the partial differential equation: