Python test: new options provide local test data paths
Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5

http://code.opencv.org/issues/4048

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Merge pull request #3488 from jeremyhu:PR-4048
Merge pull request #3480 from mshabunin:python-test-24
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
ability to enable OpenMP simultaneously with other parallel framework
Merge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements
Merge pull request #3498 from ilya-lavrenov:omp