e2f74309f7
Default AGAST threshold is 40 (as authors recomandation)
2015-04-29 23:54:16 +03:00
0ec5561b4e
Adjust AGAST perftest to be at parity (better) with FAST ones.
2015-04-29 23:42:57 +03:00
0039690f11
Merge branch 'master' of https://github.com/Itseez/opencv into brisk
2015-04-28 18:51:13 +03:00
07e07655d4
Merge pull request #3967 from Belev:fix-typo
2015-04-28 14:47:05 +00:00
e60dcc9b3b
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
2015-04-28 11:00:57 +00:00
7245803405
Merge pull request #3954 from martin-ueding:master
2015-04-28 10:55:05 +00:00
ce7812fcb0
Merge pull request #3962 from apavlenko:fix_polylines_empty
2015-04-28 10:47:36 +00:00
bcf02ae439
Merge pull request #3678 from mshabunin:explicit-sse-disable
2015-04-28 10:41:14 +00:00
8919c3162d
Merge pull request #3964 from Dikay900:master_diff_to_2_4
2015-04-28 10:38:54 +00:00
2200e0fb7e
Fix typo
...
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
2015-04-28 13:10:08 +03:00
0ded2984b8
Merge remote-tracking branch 'upstream/master' into brisk
2015-04-28 06:48:52 +03:00
9efc57f24b
Increased perf_imgproc.moments max error
2015-04-27 17:05:55 +03:00
20156d1eeb
Adding 1 to moments to avoid tests fails
2015-04-27 15:36:40 +03:00
1138a38dbe
Use explicit no-sse flags when SSE is off
...
Also:
- Silence clang warnings about unsupported command line arguments
- Add diagnostic print to calib3d test
- Fixed perf test relative error check
- Fix iOS build problem
2015-04-27 15:36:10 +03:00
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
2015-04-26 12:22:41 +02:00
655b28ee0c
Use the CMake find_library command to find the FFmpeg libraries.
...
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
2015-04-25 19:00:33 +02:00
5455e38e15
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
Conflicts:
modules/highgui/src/cap_msmf.hpp
2015-04-25 18:54:54 +02:00
b99f7a29df
Cast some image coordinates and sizes to double.
...
Conflicts:
modules/gpu/perf/perf_imgproc.cpp
Cast a long integer to double explicitly.
Conflicts:
modules/python/src2/cv2.cpp
Cast some matrix sizes to type int.
Change some vector mask types to unsigned.
Conflicts:
modules/core/src/arithm.cpp
2015-04-25 18:54:53 +02:00
b599774e30
Fix a bug that impede to set the trackbar pos using the Qt control panel
...
Conflicts:
modules/highgui/src/window_QT.cpp
2015-04-25 18:54:53 +02:00
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
2015-04-25 18:54:52 +02:00
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
2015-04-25 18:54:51 +02:00
3b5530fb67
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-04-25 18:54:51 +02:00
2c73e49dac
Not block PDB file in multithreaded build on Windows.
...
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
2015-04-25 18:54:50 +02:00
d6c95621e8
Implement CMAKE_CURRENT_LIST_DIR for older CMake
...
The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.
Fixes issue #4205 .
Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.
2015-04-24 23:10:50 +02:00
b94c513cee
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
...
Conflicts:
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
2015-04-24 22:48:44 +02:00
614edafe73
typo
2015-04-24 22:38:51 +02:00
9f7548ab89
update openni sample comments referring #81
2015-04-24 18:19:03 +02:00
d2409d12c6
porting polylines with empty vector<Point> from 2.4 to master
2015-04-24 17:11:51 +03:00
6a5f413f27
Merge tag '3.0.0-rc1'
2015-04-24 14:56:47 +03:00
755527a90a
Merge pull request #3958 from ilya-lavrenov:cuda_aarch64
2015-04-23 17:16:52 +00:00
1e90b2f51d
Merge pull request #3957 from dhood:fm-8pt-bug
2015-04-23 17:16:25 +00:00
f57063efa2
port of aarch64 cuda changes from 2.4
2015-04-23 17:57:29 +03:00
b057a62c8b
Set status to rc
2015-04-23 17:29:40 +03:00
12a3156aff
Merge pull request #3955 from vpisarev:fixed_mjpeg_encoder
2015-04-23 14:21:32 +00:00
eee210f3b5
Fix Bug #3441 , #4072 , #4173 : 8-point fundamental matrix calculation error
2015-04-23 10:09:48 -04:00
34bc3b8595
Don't relax error level for particular fundamental matrix calculation methods
2015-04-23 10:08:42 -04:00
d825b7ee9a
fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream
2015-04-23 14:40:44 +03:00
5ffb53f229
Add example data types for calibrateCamera call
...
It took me a while to figure out what was meant with
OpenCV Error: Assertion failed (i < 0) in getMat
While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/ )
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
After I fixed that, I got the next error message:
OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
collectCalibrationData, file
/build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
line 3193
The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.
In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.
2015-04-23 13:30:14 +02:00
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
2015-04-23 06:25:25 +00:00
30912b49f3
fixed compile warnings; hopefully fixed test failures
2015-04-23 00:39:44 +03:00
882dc0a7f6
Merge pull request #3950 from paroj:fix-gftt_ocl
2015-04-22 19:08:15 +00:00
d8f62673d7
Merge pull request #3951 from kalistratovag:mjpeg_dec_uninitialized
2015-04-22 19:03:20 +00:00
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
08925330e0
mjpec_decoder initialize m_movi_start variable
2015-04-22 19:49:11 +03:00
1ea41e7246
fix gftt opencv kernel when using mask
2015-04-22 16:13:50 +02:00
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
415a212d09
Merge pull request #3936 from dhood:fitEllipse-bug
2015-04-22 11:22:35 +00:00
bac4999ae4
Merge pull request #3948 from PhilLab:markdownPatch
2015-04-22 11:02:50 +00:00
0b20ce696a
Fixed markdown: **Note** -> @note
2015-04-22 08:08:10 +02:00
a69b435c92
Merge pull request #3909 from Nuzhny007:master
2015-04-21 14:02:59 +00:00
cbalint13