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

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

Browse Source
This commit is contained in:
Alexander Alekhin
2019-05-28 19:41:48 +03:00
committed by Alexander Alekhin
parent ed96864892 0d477d7364
commit 43467a2ac7
56 changed files with 2025 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/include/opencv2/dnn/all_layers.hpp
+1 -1
View File
@@ -608,7 +608,7 @@ CV__DNN_INLINE_NS_BEGIN
};
/**
* @brief Bilinear resize layer from https://github.com/cdmh/deeplab-public
* @brief Bilinear resize layer from https://github.com/cdmh/deeplab-public-ver2
*
* It differs from @ref ResizeLayer in output shape and resize scales computations.
*/