{highgui} Fix copy-paste error in conditional
Merge branch 'fix_jpg2000' into 2.4
Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module
Add test for issue #2646
Fix integer overflow in NL-Means denoising on white input

Issues #2646
Merge pull request #343 from taka-no-me:fix_nlmeans_2646