Vadim Pisarevsky
7ca9e49749
Merge pull request #5607 from n3011:patch-1
2015-11-02 11:55:12 +00:00
Vadim Pisarevsky
a69fd6029a
Merge pull request #5512 from edgarriba:gdal_lan
2015-11-02 11:53:08 +00:00
Vadim Pisarevsky
3c31d6add3
Merge pull request #5515 from LorenaGdL:hitAndMiss
2015-11-02 11:49:37 +00:00
Vadim Pisarevsky
7323823b38
Merge pull request #5582 from sizeofvoid:master
2015-11-02 11:39:43 +00:00
Vadim Pisarevsky
b2f6aedec9
Merge pull request #5587 from lupustr3:pvlasov/ipp_cond_update
2015-11-02 11:38:02 +00:00
Vadim Pisarevsky
46dd502f4a
Merge pull request #5602 from ChrisKitching:clearerMatErrors
2015-11-02 11:37:34 +00:00
Vadim Pisarevsky
39346f3204
Merge pull request #5592 from berak:python_rect2d
2015-11-02 11:36:03 +00:00
Vadim Pisarevsky
32b44173e7
Merge pull request #5595 from mshabunin:fix-bitonal-tif
2015-11-02 11:32:17 +00:00
Vadim Pisarevsky
00f222a9b4
Merge pull request #5598 from ajbernal:ocl_bilateral_bugfix
2015-11-02 11:22:25 +00:00
Vadim Pisarevsky
920427af5e
Merge pull request #5600 from grundman:patch-3
2015-11-02 11:15:08 +00:00
Vadim Pisarevsky
d55e44f0b7
Merge pull request #5608 from n3011:patch-2
2015-11-02 11:14:39 +00:00
Vadim Pisarevsky
92298c88bd
Merge pull request #5609 from n3011:patch-3
2015-11-02 11:14:24 +00:00
Vadim Pisarevsky
c963757b43
Merge pull request #5610 from n3011:patch-4
2015-11-02 11:13:49 +00:00
Ishant Mrinal Haloi
47b2511f07
Update driver_api_stereo_multi.cpp
2015-11-02 15:08:27 +08:00
Ishant Mrinal Haloi
52b4fe63c1
Update cascadeclassifier_nvidia_api.cpp
2015-11-02 15:07:45 +08:00
Ishant Mrinal Haloi
46be45b4f7
Update driver_api_multi.cpp
2015-11-02 15:06:38 +08:00
Ishant Mrinal Haloi
64eb69cb15
Update multi.cpp
2015-11-02 15:05:45 +08: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
edgarriba
f50858dd24
set GA_ReadOnly flag again since test error
2015-11-01 12:07:05 +01:00
Chris Kitching
0f8a266787
Make Mat assertion failures more helpful
...
Instead of chaining a bunch of sanity checks together with "&&", let's just have several asserts. That way, when an assert fails, you don't get a monsterous "<huge evil expression>
failed" error, but only the bit you care about, making your life rather a lot easier.
2015-11-01 01:02:15 +00:00
edgarriba
a242556b1d
Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
...
Conflicts:
modules/imgcodecs/include/opencv2/imgcodecs.hpp
2015-10-31 20:18:41 +01:00
edgarriba
decdae515b
set GA_Update flag in order remove ERROR 8: band 1: Attempt to write to read only dataset inGDALRasterBand::Fill()
2015-10-31 20:11:05 +01:00
edgarriba
9ff14bc411
add support for float32 and float 64
2015-10-31 20:00:39 +01:00
grundman
f609ddba05
Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
...
Current implementation returns NaN for some configs of FFMPEG, call default get_fps() instead (as also used by PROP_POS_MSEC)
2015-10-30 17:48:04 -07:00
Ariel Bernal
cc903d0605
Fix for #5590 . OpenCL BilateralFilter implementation failes to
...
build for some OCL drivers.
Some OCL vendors treat implicit scalar-vector conversions for
operators as errors when type conversion is required.
2015-10-30 09:39:11 -07:00
Hajo Nils Krabbenhöft
a8e550f5bf
Fixed crash when reading b/w tif images ( fixes #5579 )
2015-10-30 17:41:52 +03:00
Maksim Shabunin
021ff0efa6
Merge pull request #5575 from mshabunin:fix-vs2015-2.4
2015-10-30 13:47:18 +00:00
Maksim Shabunin
6e2a68fdf3
Merge pull request #5384 from mshabunin:run-py-changes
2015-10-30 13:45:59 +00:00
berak
1048b235bf
add Rect2d to python bindings
2015-10-30 10:02:33 +01:00
Pavel Vlasov
5ae3693567
Condition update for 8u IPP in GaussianBlur. Bug was fixed in 9.0.1;
2015-10-29 13:21:13 +03: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
Maksim Shabunin
90c74e3be0
ts: refactor run.py script
2015-10-29 11:28:12 +03:00
Wangyida
ca599eee40
python modification for Point3D
2015-10-29 10:24:49 +08:00
Rafael Sadowski
e38b54a786
fix cmake OpenBSD linker libs
...
OpenBSD needs m and pthread like Net- and FreeBSD.
2015-10-28 22:47:00 +01:00
Anton V. Shokurov
b9b40a73ba
Exposure and autofocus properties fixed/added.
...
Exposure can now be manually controlled (implemented only in libv4l).
Will work only with a kernel version >= 4.5.
Autofocus can be enabled/disabled.
2015-10-28 07:37:51 -04: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 Alekhin
dfec99691b
Merge pull request #5370 from berak:fix_svm_autoTrain
2015-10-26 10:47:29 +00: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