64b56d7018
This reverts commit 4aaaef5967240d2da4d78674048c0c3a1a6fef53. Conflicts: modules/imgproc/include/opencv2/imgproc/types_c.h modules/legacy/include/opencv2/legacy/legacy.hpp