Maksim Shabunin
4bf6bd3d37
Merge pull request #3972 from PhilLab:docLineno
10 years ago
Roman Donchenko
e01b485ac6
Merge pull request #3973 from xsorifc28:patch-1
10 years ago
Philipp Hasper
dadf53f17c
Doxygen: replaced @includelineno by @include to enable copy-pasting
10 years ago
Vadim Pisarevsky
07e07655d4
Merge pull request #3967 from Belev:fix-typo
10 years ago
Vadim Pisarevsky
e60dcc9b3b
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
10 years ago
Vadim Pisarevsky
7245803405
Merge pull request #3954 from martin-ueding:master
10 years ago
Vadim Pisarevsky
ce7812fcb0
Merge pull request #3962 from apavlenko:fix_polylines_empty
10 years ago
Maksim Shabunin
bcf02ae439
Merge pull request #3678 from mshabunin:explicit-sse-disable
10 years ago
Vadim Pisarevsky
8919c3162d
Merge pull request #3964 from Dikay900:master_diff_to_2_4
10 years ago
Belev
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
10 years ago
Samed Ozdemir
5e44aa37ff
Fixed a typo, "requited" -> "required"
10 years ago
Maksim Shabunin
9efc57f24b
Increased perf_imgproc.moments max error
10 years ago
kalistratovag
20156d1eeb
Adding 1 to moments to avoid tests fails
10 years ago
Maksim Shabunin
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
10 years ago
Thomas Gabrowski
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
10 years ago
Mansour Moufid
655b28ee0c
Use the CMake find_library command to find the FFmpeg libraries.
...
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
10 years ago
Roman Donchenko
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
10 years ago
Mansour Moufid
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
10 years ago
Luis Díaz Más
b599774e30
Fix a bug that impede to set the trackbar pos using the Qt control panel
...
Conflicts:
modules/highgui/src/window_QT.cpp
10 years ago
Luis Díaz Más
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
10 years ago
Craig Reynolds
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
10 years ago
Boris Daskalov
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.
10 years ago
Vladimir Kolesnikov
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.
10 years ago
Alexander Nitsch
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.
10 years ago
Milania1
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
10 years ago
Ilya Lavrenov
614edafe73
typo
10 years ago
Dikay900
9f7548ab89
update openni sample comments referring #81
10 years ago
Andrey Pavlenko
d2409d12c6
porting polylines with empty `vector<Point>` from 2.4 to master
10 years ago
Alexander Alekhin
6a5f413f27
Merge tag '3.0.0-rc1'
10 years ago
Vadim Pisarevsky
755527a90a
Merge pull request #3958 from ilya-lavrenov:cuda_aarch64
10 years ago
Vadim Pisarevsky
1e90b2f51d
Merge pull request #3957 from dhood:fm-8pt-bug
10 years ago
Ilya Lavrenov
f57063efa2
port of aarch64 cuda changes from 2.4
10 years ago
Alexander Alekhin
b057a62c8b
Set status to rc
10 years ago
Vadim Pisarevsky
12a3156aff
Merge pull request #3955 from vpisarev:fixed_mjpeg_encoder
10 years ago
Deanna Hood
eee210f3b5
Fix Bug #3441 , #4072 , #4173 : 8-point fundamental matrix calculation error
10 years ago
Deanna Hood
34bc3b8595
Don't relax error level for particular fundamental matrix calculation methods
10 years ago
Vadim Pisarevsky
d825b7ee9a
fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream
10 years ago
Martin Ueding
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.
10 years ago
Vadim Pisarevsky
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
10 years ago
Vadim Pisarevsky
30912b49f3
fixed compile warnings; hopefully fixed test failures
10 years ago
Vadim Pisarevsky
882dc0a7f6
Merge pull request #3950 from paroj:fix-gftt_ocl
10 years ago
Vadim Pisarevsky
d8f62673d7
Merge pull request #3951 from kalistratovag:mjpeg_dec_uninitialized
10 years ago
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
10 years ago
kalistratovag
08925330e0
mjpec_decoder initialize m_movi_start variable
10 years ago
Pavel Rojtberg
1ea41e7246
fix gftt opencv kernel when using mask
10 years ago
Vadim Pisarevsky
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
10 years ago
Vadim Pisarevsky
415a212d09
Merge pull request #3936 from dhood:fitEllipse-bug
10 years ago
Vadim Pisarevsky
bac4999ae4
Merge pull request #3948 from PhilLab:markdownPatch
10 years ago
Philipp Hasper
0b20ce696a
Fixed markdown: **Note** -> @note
10 years ago
Vadim Pisarevsky
a69b435c92
Merge pull request #3909 from Nuzhny007:master
10 years ago