Alexander Alekhin
fc1694c97c
Merge pull request #5655 from janstarzy:2.4-canny-fix
2015-11-12 03:10:11 +00:00
Pavel Rojtberg
9233472bdd
use cpp functions in CvLevMarq::step for better readability
2015-11-12 00:20:13 +01:00
Jan Starzynski
2799829bc9
fix potential buffer overflow as in 3.0
2015-11-11 16:19:20 +01:00
jiakai
933dfed4b8
check offset in ExifReader::getString
2015-11-11 20:17:24 +08:00
Vladislav Vinogradov
d5e6503fe5
fix signed/unsigned comparison warning in core/test/test_math.cpp
2015-11-11 11:53:39 +03:00
hoangviet1985
6441620f45
The right signs give the right results
2015-11-10 16:18:07 -05:00
Dan
aa14b6d2f3
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
2015-11-10 12:29:51 -05:00
Dan
01f40cfafc
Corrected the case where channel == -1
2015-11-10 12:29:29 -05:00
Vadim Pisarevsky
b4112a5878
Merge pull request #5480 from dtmoodie:vecgpumat
2015-11-10 17:02:21 +00:00
Vadim Pisarevsky
3942b1f362
Merge pull request #5340 from alalek:ocl_off
2015-11-10 16:53:36 +00:00
Marian Zajko
1eb9ef6bbf
Fixed downsampling parameter enumerator backward compatibility.
2015-11-10 17:18:10 +01:00
Vadim Pisarevsky
38909d7959
Merge pull request #5597 from andy-held:cmakecudacross
2015-11-10 16:15:26 +00:00
Vadim Pisarevsky
18f4e55692
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function
2015-11-10 16:14:43 +00:00
Vadim Pisarevsky
0f288d1082
Merge pull request #5605 from hoangviet1985:fix_bug_5599
2015-11-10 16:13:26 +00:00
Vadim Pisarevsky
82c1c68560
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4
2015-11-10 16:03:48 +00:00
Vadim Pisarevsky
780b713016
Merge pull request #5638 from hoangviet1985:fix_bug_5623
2015-11-10 16:01:48 +00:00
Vadim Pisarevsky
9ab59fb22e
Merge pull request #5645 from jia-kai:master
2015-11-10 15:56:23 +00:00
Vadim Pisarevsky
7b022371ea
Merge pull request #5646 from brossetti:patch-1
2015-11-10 15:56:05 +00:00
Marian Zajko
286055b0d8
Removed trailing whitespace.
2015-11-10 12:25:57 +01:00
Marian Zajko
2cebe5a3b0
Fixed parameter enumrators list order to retain binary compatibility.
2015-11-10 12:07:19 +01:00
Marian Zajko
2998248dd3
Removed whitespaces reported by buildbot.
2015-11-09 13:30:08 +01:00
Marian Zajko
352b121202
Fixed whitespace issue
...
Removed tabulators from enumerators and ximea adapter source as reported
by precommit docs test.
2015-11-09 12:07:53 +01:00
brossetti
4194b7effe
fixed bug on left mouse button click
...
Adding None as outImage in pos3 of cv2.drawKeypoints. Fixes bug that throws 'TypeError: Required argument 'outImage' (pos 3) not found' on left mouse button click
2015-11-09 04:37:59 -05:00
Pavel Rojtberg
742fb559f7
use cpp functions in cvCalibrateCamera2 to make it more readable
2015-11-08 19:25:38 +01:00
Pavel Rojtberg
955f489621
make CV_CAP_PROP_FORMAT consider the current channel count
2015-11-08 17:01:03 +01:00
Pavel Rojtberg
05f52b697f
replace uyvy_to_rgb24 by tested and conformant cvtColor
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
ad68b79630
replace yuv420p_to_rgb24 by tested and conformant cvtColor
...
Conversion was not ITU 601 conformant. Also add YVU420 format to allowed
zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
8527d895bb
replace rgb24_to_rgb24 by tested cvtColor
...
internally using ipp this conversion is now roughly 2x faster.
also add RGB/ BGR formats to allowed zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
f50817120e
v4l: remove needless CvCaptureCAM_V4L_CPP wrapper
...
possible source of memory leaks and unneeded complexity
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
93d6e800b6
v4l: Fixed memory leaks and inconsistent status return values
...
by updating to c++ coding conventions
- const correctness
- use bool as return value
- use explicit initialization instead of CLEAR macro/ memset
- use cv namespace
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
a581ddd896
remove support of Video4Linux1 API
...
the last kernel that allowed compiling this code was 2.6.37 which was
released almost 5 Years ago. So probably it does not get much testing
any more. Furthermore even back then one was better off using the V4L2
API.
The only change touching currently used code is the removal of the
global V4L2_SUPPORT variable.
2015-11-08 17:01:02 +01:00
Alexander Alekhin
1b6dd03fd7
Merge pull request #5641 from alalek:backport_5320
2015-11-07 05:21:31 +00:00
berak
28974e7290
remove usage of obsolete _dataAsRows flag
2015-11-06 19:59:25 +03:00
Maksim Shabunin
ffb9e877e9
Restore ts/gpu_perf.hpp, trying to compile with VS 2015
2015-11-06 13:26:58 +03:00
Viet Dinh
1e879e1ab1
clean up
2015-11-06 00:29:44 -05:00
Viet Dinh
57829d81ea
mac compile error
2015-11-05 23:31:30 -05:00
Viet Dinh
a20a273982
Merge remote-tracking branch 'Itseez/2.4' into fix_bug_5599
2015-11-05 23:20:04 -05:00
Viet Dinh
e9b31a70bf
mac osx compile errors
2015-11-05 21:44:36 -05:00
Viet Dinh
a1532582a6
optimize code
2015-11-05 19:38:24 -05:00
Viet Dinh
68bcff26fb
fix solveCubic
...
The original solution did not handle correctly when delta = 0,
resulting as nan errors. I also wrote a test case to test solving
equation x^3 = 0 after fixing.
2015-11-05 19:19:56 -05:00
Marian Zajko
691fb1ffae
XIMEA adapter update
...
- replaced m3api/m3apiX64 binaries with latest xiapi32/xiapi64 to
support latest camera models
- added new parameter definitions to videoio_c.h and
SetProperty/GetProperty calls
- added acquisition resetting for specific parmateters in SetProperty
call
- added new error return value evaluators
2015-11-05 15:56:47 +01:00
Maksim Shabunin
7392ce0a81
Added some documentation for MSER
2015-11-05 17:17:18 +03:00
jiakai
80df9ddedb
check for exifSize
2015-11-05 18:32:51 +08:00
jiakai
1260060d7d
check boundary in ExifReader
2015-11-05 17:58:35 +08:00
Viet Dinh
433bc81b30
std::cbrt could not be found
2015-11-03 21:40:52 -05:00
Viet Dinh
c8bf176558
casting warning
2015-11-03 21:10:38 -05:00
Viet Dinh
cfd5caf29d
deal with type casting issues
2015-11-03 16:19:41 -05:00
Viet Dinh
f461d0cb7a
fix compile errors
...
some functions were not found in namespace std
2015-11-03 15:37:25 -05:00
Viet Dinh
09b0193186
even more correct
...
calculates cube root of complex number to give more correct results.
2015-11-03 15:17:49 -05:00
Lorena García
252feb4774
Hit and Miss morphological op
2015-11-03 19:42:22 +01:00