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
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
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
Vadim Pisarevsky
33dc41056f
Merge pull request #5392 from elenash:fisheye_fix
2015-11-03 10:57:36 +00:00
Viet Dinh
b6e8a47fca
fix whitespace errors
2015-11-02 09:28:37 -05:00
Viet Dinh
ed0065266e
update fixing bug #5599
2015-11-02 08:38:05 -05:00
Vadim Pisarevsky
c21ed69731
Merge pull request #5586 from mshabunin:run-py-changes-2.4
2015-11-02 12:05:00 +00:00
Viet Dinh
03e7b71707
fix whitespace errors
2015-11-02 00:50:05 -05:00
Viet Dinh
e06c696b3c
fix whitespace errors
2015-11-02 00:20:13 -05:00
Viet Dinh
40ce9f97d6
fix whitespace errors
2015-11-02 00:04:51 -05:00
Viet Dinh
0bc44376a5
fix bug #5599
...
solves equations more correctly, eliminates “nan” error.
2015-11-01 23:30:28 -05:00
Viet Dinh
fdf549b921
fix bug #5599
2015-11-01 11:08:01 -05:00
Maksim Shabunin
021ff0efa6
Merge pull request #5575 from mshabunin:fix-vs2015-2.4
2015-10-30 13:47:18 +00:00
Maksim Shabunin
1e869c5e49
ts: refactor run.py script
...
Conflicts:
modules/ts/misc/run.py
2015-10-29 13:04:05 +03:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
Alexander Alekhin
4552ca98c4
Merge pull request #5574 from ilya-lavrenov:image-sequence-videocapture
2015-10-27 15:41:59 +00:00
Ilya Lavrenov
9e2395e7e0
return false in grabFrame failed in open method
2015-10-27 16:56:31 +03:00
Ilya Lavrenov
05945bf00e
fixed case when grabbing failed
2015-10-27 16:26:24 +03:00
Ilya Lavrenov
9d78a1ea9f
allow to retrieve videocapture properties before first frame reading
2015-10-26 14:37:38 +03:00
Alexander Smorkalov
8e40becab1
Debian packages with legacy C headers added to list of conflicts, relpaces, etc.
...
(cherry picked from commit e245aed6bb
)
2015-10-26 10:56:34 +03:00
Alexander Alekhin
60eda6f25c
export simple libs from OPENCV_LINKER_LIBS ( fix #5541 )
...
(cherry picked from commit 937a096bf1
)
2015-10-26 10:55:38 +03:00
Alexander Smorkalov
2e78a3e5e9
Fixed samples build with nonfree.
...
(cherry picked from commit 341e7b3be2
)
2015-10-26 10:55:24 +03:00
Alexander Smorkalov
966d35a9fb
Made samples build independent from nonfree module.
...
(cherry picked from commit bba8c0beac
)
2015-10-26 10:55:14 +03:00
Alexander Smorkalov
42447a7610
Set of lintain warning fixes for -samples debian package.
...
(cherry picked from commit ff00220302
)
2015-10-26 10:55:00 +03:00
Aaron Simmons
ca50969c2b
brining over fix in master ( #4140 ) for libz import on 64-bit android
...
(cherry picked from commit 55a9fdf051
)
2015-10-26 10:54:44 +03:00
a-andre
2d3e170370
install opencv2/highgui.hpp header
...
(cherry picked from commit d16fb30512
)
2015-10-26 10:54:29 +03:00
Alexander Smorkalov
8a37fc8223
Added missing copyright headers.
...
(cherry picked from commit 408107ce6d
)
2015-10-26 10:53:52 +03:00
Alexander Smorkalov
a5c20f8592
Debian formatted copyright file added to all debian packages.
...
(cherry picked from commit 9d24b3c3b0
)
2015-10-26 10:53:38 +03:00
Ilya Lavrenov
96a2edb375
delete video readers
...
(cherry picked from commit 0d5b739d35
)
2015-10-26 10:53:23 +03:00
Ilya Lavrenov
15b313ce4b
fixed memory leak in findHomography tests
...
(cherry picked from commit ec5244a73a
)
2015-10-26 10:52:57 +03:00
Alexander Smorkalov
1ea6568951
Fixed wrong-name-for-changelog-of-native-package warning for deb packages.
...
(cherry picked from commit cb1dc7cb6e
)
2015-10-26 10:51:22 +03:00
Ilya Lavrenov
56654ae360
added some property setting and getting
...
(cherry picked from commit 75fcedf0ed
)
2015-10-26 10:50:00 +03:00
Ilya Lavrenov
9a3e53e738
repaired GStreamer 0.10 version
...
(cherry picked from commit c19ed39a78
)
2015-10-26 10:49:43 +03:00
Ilya Lavrenov
2243bfa181
repaired gstreamer camera capture:
...
1. Enabled property retrieval: height, width, FPS
2. Fixed issue when isOpened returns always true even for non-existing devices
3. Ability to work with non-0 device. Camera capture index is taken into account
(cherry picked from commit dbd7912b88
)
2015-10-26 10:49:32 +03:00