4.x
fix drawDetectedCornersCharuco, drawDetectedMarkers, drawDetectedDiamonds added tests
Merge remote-tracking branch 'upstream/3.4' into merge-3.4