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
robertxwu
33cd7f38a8
re-submit
...
(cherry picked from commit 4a68cc1675
2015-10-26 10:49:02 +03:00
Hajo Nils Krabbenhöft
2fc0ce5c24
buffer_size should be in bytes, not bits
...
(cherry picked from commit 7825cbeb7d
2015-10-26 10:46:33 +03:00
Hajo Nils Krabbenhöft
c5d009d6c4
fix crash for large BW tif images
...
(cherry picked from commit d38fee7599
2015-10-26 10:46:23 +03:00
Roman Donchenko
7d28541bbe
test2.py: fail if a downloaded image can't be decoded
...
(cherry picked from commit 56f17e4921
2015-10-26 10:45:22 +03:00
Alexander Alekhin
8c2d712fb0
Merge pull request #5538 from micalan:JpegExif
2015-10-25 15:18:08 +00:00
Alexander Alekhin
c3eb1254cf
Merge pull request #5570 from paroj:qsliderfix
2015-10-24 14:38:38 +00:00
Alexander Alekhin
89697310b0
Merge pull request #5553 from pletessier:aspect-ratio
2015-10-24 14:38:02 +00:00
Pierre Letessier
e6615c5825
Changed CV_FFMPEG_CAP_PROP_SAR_* values
2015-10-24 11:22:18 +02:00
Lorena García
7cff60f4f6
Changed src matrix complement computation
2015-10-24 00:33:36 +02:00
jisli
251610f6a1
fix header problem(can't find cstdint) on OSX platform
2015-10-23 15:25:26 -07:00
Lorena García
fb03330ea3
Fixed CV_Assert
2015-10-24 00:22:50 +02:00
Pavel Rojtberg
cfd498a8eb
fix compilation with qt
...
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Pierre Letessier
baa21484a1
Added CV_CAP_PROP_SAR properties to videoio module
2015-10-23 21:14:22 +02:00
micalan
0a306f8804
Camera orientation handling is added for jpeg files
2015-10-23 21:19:35 +03:00
Alexander Alekhin
9a0beda037
Merge pull request #5489 from paroj:v4l2noconvert
2015-10-23 16:35:36 +00:00
Alexander Alekhin
09e6c82190
Merge pull request #5474 from paroj:v4l2ctrls
2015-10-23 16:28:26 +00:00
Alexander Alekhin
95d6002f16
Merge pull request #5568 from asmorkalov:as/legacy_c_deb_pack_dep
2015-10-23 15:37:26 +00:00
Alexander Smorkalov
e245aed6bb
Debian packages with legacy C headers added to list of conflicts, relpaces, etc.
2015-10-23 16:09:04 +03:00
Maksim Shabunin
e9ec52368f
Merge pull request #5562 from rodrigob:patch-2
2015-10-23 10:58:10 +00:00
Rodrigo Benenson
0ef7387298
mush -> must
...
fixed typo
2015-10-22 23:27:55 +02:00
Alexander Alekhin
debe99f1a4
Merge pull request #5531 from mshabunin:fix-vs2015
2015-10-22 16:28:42 +00:00
Alexander Alekhin
031568831c
Merge pull request #5513 from jet47:ctest-extended-support
2015-10-22 12:37:40 +00:00
Maksim Shabunin
497d92e7d1
Merge pull request #5533 from sturkmen72:patch-12
2015-10-22 12:30:38 +00:00
Maksim Shabunin
1cb0dfa669
Merge pull request #5500 from StevenPuttemans:fix_mask_notice_copyTo_2.4
2015-10-22 12:28:54 +00:00
Maksim Shabunin
4e7a14355d
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
2015-10-22 12:27:45 +00:00
Maksim Shabunin
490b327be9
Merge pull request #5365 from sturkmen72:patch-2
2015-10-22 12:25:48 +00:00
Maksim Shabunin
ff35726fc3
Merge pull request #5432 from sturkmen72:patch-11
2015-10-22 12:24:47 +00:00
Maksim Shabunin
31e0d90da6
Enable temp objects destruction test for VS versions less than 2015
2015-10-22 12:44:03 +03:00
Vadim Pisarevsky
b34f0d99bb
Merge pull request #5539 from sturkmen72:patch-14
2015-10-21 11:54:52 +00:00
Vadim Pisarevsky
66f2000548
Merge pull request #5532 from grundman:patch-2
2015-10-21 11:54:30 +00:00
Vadim Pisarevsky
91e9e6489b
Merge pull request #5542 from renatoGarcia:matx_constructors
2015-10-21 11:46:27 +00:00
Vadim Pisarevsky
f820df2ea0
Merge pull request #5543 from aman11dhanpat:master
2015-10-21 11:44:35 +00:00
Vadim Pisarevsky
a91dcb015d
Merge pull request #5548 from berak:patch-2
2015-10-21 11:41:25 +00:00
berak
781931a671
update python features2d tutorials
2015-10-21 08:22:22 +02:00
Alexander Alekhin
4dc2313527
Merge pull request #5552 from hyunkim9123:camshift-2.4
2015-10-21 06:13:38 +00:00
Suleyman TURKMEN
fd4761ba31
Update face detection samples
2015-10-20 19:09:21 +03:00
Maksim Shabunin
3119f0a61b
Merge pull request #5519 from hyunkim9123:camshift_py
2015-10-20 14:43:33 +00:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Alexander Alekhin
938d42a89f
Merge pull request #5545 from alalek:fix_linker_libs
2015-10-19 15:29:02 +00:00
Alexander Alekhin
1648e9292c
Merge pull request #5431 from MiguelAlgaba:em_one_cluster
2015-10-19 15:27:35 +00:00
