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
Viet Dinh
537a978dcf
update test_math.cpp
2015-11-03 12:52:49 -05:00
Andreas Franek
01c5a0ed12
Simplifies cross compilation with CUDA for ARM boards. CUDA arch is set for all ARM targets, --unresolved-symbols=ignore-in-shared-libs is set when cross-compiling for ARM and FindCUDA.cmake was adjusted to find shared library stubs within the CUDA toolkit.
2015-11-03 12:30:34 +01:00
Vadim Pisarevsky
b3ac274617
Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix
2015-11-03 10:59:45 +00:00
Vadim Pisarevsky
de49ed3c15
Merge pull request #5388 from alalek:disable_invalid_string_usage
2015-11-03 10:58:57 +00:00
Vadim Pisarevsky
33dc41056f
Merge pull request #5392 from elenash:fisheye_fix
2015-11-03 10:57:36 +00:00
Alexander Alekhin
4514158e43
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
2015-11-03 10:18:44 +00:00
Abe Friesen
5a918986cc
Merge branch 'lr_predict' of https://github.com/afriesen/opencv into lr_predict
2015-11-02 17:49:52 -08:00
Abe Friesen
9c6ff4d955
- LogisticRegressionImpl::predict() was changed to return the predicted value and to only write to the OutputArray results if specified (no longer segfaults).
...
- Refactored batch and mini_batch training to use a common gradient computation function (removed duplicate code).
- Altered the cost computation so that NAN is not computed unnecessarily.
- Greatly simplified (and sped up) the code that appends a column of 1s to the data.
- Minor code cleanup.
Removed unused variables.
Added cast to float to remove warning
2015-11-02 17:49:06 -08:00
Abe Friesen
d367e159c1
Added cast to float to remove warning
2015-11-02 17:36:27 -08:00
Abe Friesen
db78fcd11a
Removed unused variables.
2015-11-02 17:17:35 -08:00
Abe Friesen
dc1b01e002
- LogisticRegressionImpl::predict() was changed to return the predicted value and to only write to the OutputArray results if specified (no longer segfaults).
...
- Refactored batch and mini_batch training to use a common gradient computation function (removed duplicate code).
- Altered the cost computation so that NAN is not computed unnecessarily.
- Greatly simplified (and sped up) the code that appends a column of 1s to the data.
- Minor code cleanup.
2015-11-02 16:16:49 -08:00
Vadim Pisarevsky
979f88f6db
Merge pull request #5518 from Bovaz:master
2015-11-02 15:58:58 +00:00
Vadim Pisarevsky
8512ca7490
Merge pull request #5484 from PolarNick239:master
2015-11-02 15:45:59 +00:00
Vadim Pisarevsky
67ef84d883
Merge pull request #5386 from StevenPuttemans:add_markers
2015-11-02 15:45:38 +00:00
