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
|
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
|
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 |
|
Alexander Alekhin
|
4dc2313527
|
Merge pull request #5552 from hyunkim9123:camshift-2.4
|
2015-10-21 06:13:38 +00:00 |
|
Alexander Alekhin
|
938d42a89f
|
Merge pull request #5545 from alalek:fix_linker_libs
|
2015-10-19 15:29:02 +00:00 |
|
Alexander Alekhin
|
937a096bf1
|
export simple libs from OPENCV_LINKER_LIBS (fix #5541)
|
2015-10-19 13:49:41 +03:00 |
|
paul.kim
|
78a566611d
|
Fix the issue in mouse click event
|
2015-10-17 10:42:48 +09:00 |
|
Suleyman TURKMEN
|
73240b736b
|
Update camera_calibration_and_3d_reconstruction.rst
|
2015-10-16 22:30:00 +03:00 |
|
Alexander Smorkalov
|
bf41e791ff
|
Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples
|
2015-10-15 10:56:23 +00:00 |
|
Alexander Smorkalov
|
bac151675a
|
Merge pull request #5501 from asmorkalov:as/samples_lintian_fixes
|
2015-10-15 10:52:46 +00:00 |
|
Alexander Smorkalov
|
341e7b3be2
|
Fixed samples build with nonfree.
|
2015-10-14 16:19:37 +03:00 |
|
Alexander Alekhin
|
98c26d95e5
|
Merge pull request #5511 from paleozogt:android-64-bit
|
2015-10-14 11:35:05 +00:00 |
|
Alexander Smorkalov
|
bba8c0beac
|
Made samples build independent from nonfree module.
|
2015-10-14 12:56:58 +03:00 |
|
Alexander Alekhin
|
bd34f6dd98
|
Merge pull request #5505 from a-andre:highguiheader
|
2015-10-14 09:11:21 +00:00 |
|
Aaron Simmons
|
55a9fdf051
|
brining over fix in master (#4140) for libz import on 64-bit android
|
2015-10-13 17:42:40 -06:00 |
|
a-andre
|
d16fb30512
|
install opencv2/highgui.hpp header
|
2015-10-13 18:16:14 +02:00 |
|
Alexander Alekhin
|
8b23d1ec64
|
Merge pull request #5498 from asmorkalov:as/copyright_headers
|
2015-10-13 14:22:57 +00:00 |
|
Alexander Smorkalov
|
ff00220302
|
Set of lintain warning fixes for -samples debian package.
|
2015-10-13 16:32:53 +03:00 |
|
StevenPuttemans
|
8ed25ad75f
|
adding extra explanation for mask parameter
|
2015-10-13 15:21:35 +02:00 |
|
Alexander Smorkalov
|
408107ce6d
|
Added missing copyright headers.
|
2015-10-13 15:02:38 +03:00 |
|
Alexander Alekhin
|
3558da9ab7
|
Merge pull request #5494 from asmorkalov:as/deb_copyright
|
2015-10-13 08:54:20 +00:00 |
|
Alexander Smorkalov
|
9d24b3c3b0
|
Debian formatted copyright file added to all debian packages.
|
2015-10-13 09:09:07 +03:00 |
|
Alexander Alekhin
|
779dad12fb
|
Merge pull request #5491 from ilya-lavrenov:video-writers-delete
|
2015-10-12 10:48:16 +00:00 |
|
Alexander Alekhin
|
297a92cd94
|
Merge pull request #5490 from ilya-lavrenov:mem-leak-calib3d
|
2015-10-12 10:47:50 +00:00 |
|
Ilya Lavrenov
|
0d5b739d35
|
delete video readers
|
2015-10-12 00:40:23 +03:00 |
|
Ilya Lavrenov
|
ec5244a73a
|
fixed memory leak in findHomography tests
|
2015-10-12 00:11:45 +03:00 |
|
Alexander Alekhin
|
454e5e5fa4
|
Merge pull request #5461 from berak:fix_putText_24
|
2015-10-06 17:12:25 +00:00 |
|
berak
|
bb9bd3132a
|
fix zero length std::string in putText()
|
2015-10-06 18:31:00 +02:00 |
|
Elena Shipunova
|
e539a9632d
|
Fix in fisheye calibrate function: #5389
|
2015-10-01 19:03:26 +03:00 |
|
StevenPuttemans
|
406cfc48c9
|
adding markers to OpenCV for 2.4 branch
|
2015-10-01 16:08:25 +02:00 |
|
Alexander Alekhin
|
59082c8ee8
|
Merge pull request #5398 from asmorkalov:as/wrong-name-for-changelog-of-native-package
|
2015-09-28 13:41:46 +00:00 |
|
Alexander Smorkalov
|
cb1dc7cb6e
|
Fixed wrong-name-for-changelog-of-native-package warning for deb packages.
|
2015-09-28 12:30:26 +03:00 |
|
Alexander Alekhin
|
58a11ac079
|
Merge pull request #5403 from sturkmen72:patch-9
|
2015-09-25 12:08:13 +00:00 |
|
Suleyman TURKMEN
|
69d84c8f3e
|
Update how_to_scan_images.cpp
|
2015-09-25 14:32:58 +03:00 |
|
Maksim Shabunin
|
79ab6567ee
|
Merge pull request #5395 from enesates:patch-2
|
2015-09-25 07:35:14 +00:00 |
|
Alexander Alekhin
|
60a689d27c
|
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
|
2015-09-24 14:46:23 +00:00 |
|
Enes Ateş
|
5df2713b16
|
XML file path correction
in documentation exact path is images/CameraCalibration/VID5
see also PR #5393
|
2015-09-24 10:34:42 +02:00 |
|
Alexander Alekhin
|
134a3f165d
|
Merge pull request #5381 from robertxwu:Bugfix_for_issue_#_of_5145
|
2015-09-23 09:58:24 +00:00 |
|
robertxwu
|
4a68cc1675
|
re-submit
|
2015-09-21 13:57:25 -07:00 |
|
Vadim Pisarevsky
|
f838a832b2
|
Merge pull request #5357 from fxtentacle:ha-2.4.11
|
2015-09-21 14:31:13 +00:00 |
|
Vadim Pisarevsky
|
6f2fb383e6
|
Merge pull request #5359 from StevenPuttemans:contributing_guidelines_2.4
|
2015-09-21 11:53:06 +00:00 |
|
Alexander Alekhin
|
e1b0d341e4
|
Merge pull request #5360 from SpecLad:test2-fail-on-failed-download
|
2015-09-18 12:10:52 +00:00 |
|
Roman Donchenko
|
08ad3b500b
|
test2.py: switch from urllib to urllib2
urllib2 raises an exception if an HTTP request produces an error code,
making the test fail earlier.
|
2015-09-17 18:24:30 +03:00 |
|
Roman Donchenko
|
56f17e4921
|
test2.py: fail if a downloaded image can't be decoded
|
2015-09-17 18:17:06 +03:00 |
|
Roman Donchenko
|
293ea03dcc
|
test2.py: remove unused imports
|
2015-09-17 18:14:49 +03:00 |
|
StevenPuttemans
|
bef1b5322e
|
add link to contributing guidelines
|
2015-09-17 14:14:21 +02:00 |
|