Merge pull request #826 from pengx17:2.4_canny_clampfix