Merge 2.4 into master #2616
Merged
Merge 2.4 into master #2616
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SpecLad
commented
Apr 14, 2014
SpecLad
commented
- Fix typos in old python wrapper documentation(Bug #3628) #2571 from MartinChodakowski:fix-old-python-doc-typos
- Corrected bug #1437. #2575 from rold2007:Bugfix_1437
- fix condition in CV_OperationsTest::operations1() #2579 from maksqwe:test_operations_fix
- Viz minor - cloud shading support #2591 from Nerei:viz_cloud_shading_support
- fix typo in test_cameracalibration #2599 from maksqwe:test_calibration_2.4
- Remove unused local variables for 2.4 #2603 from maksqwe:unused_fix_2.4
Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
…Param. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.) The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx.
Conflicts: modules/core/test/test_arithm.cpp modules/cuda/src/cascadeclassifier.cpp modules/imgproc/doc/geometric_transformations.rst modules/objdetect/src/hog.cpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/src/gftt.cpp modules/ocl/src/moments.cpp
|
@kirill-kornyakov Review, please. |
|
👍 |
SpecLad
pushed a commit
that referenced
this pull request
Apr 15, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.