mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-27 11:28:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,475 Commits 6 Branches 127 Tags 3 GiB
25b044e6c3
Commit Graph

13317 Commits

Author SHA1 Message Date
Vadim Pisarevsky
b5fd7868a8 Merge pull request #5487 from Wangyida:python 2015-11-02 12:26:53 +00:00
Vadim Pisarevsky
c21ed69731 Merge pull request #5586 from mshabunin:run-py-changes-2.4 2015-11-02 12:05:00 +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
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
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
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
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 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
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
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
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
Maksim Shabunin
6e9d0d9a0c Visual Studio 2015 warning and test fixes 2015-10-20 12:48:37 +03:00
Alexander Alekhin
1648e9292c Merge pull request #5431 from MiguelAlgaba:em_one_cluster 2015-10-19 15:27:35 +00:00
Aman Verma
d5e314e728 Fixing compilation errors in windows and mac 2015-10-19 10:58:43 +00:00
Aman Verma
b0209ad7f7 Fix for #5495 : add setTrackbarMin 2015-10-19 08:44:06 +00:00
Renato Florentino Garcia
f5b98bea41 Fix behavior of Matx 12 and 16 args constructors. 
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
 2015-10-18 23:16:21 -02:00
Suleyman TURKMEN
51e687f7a9 Update imgproc.hpp 2015-10-18 15:53:15 +03:00
Pavel Rojtberg
eac5cab5cb cap_v4l: implement PROP_CONVERT_RGB 
allows disabling automatic conversion to RGB for certain formats. If
conversion is disabled the returned image just points to the underlying
buffer, so no memcpy is performed.

Note that we do not check image size in retrieve frame any more as it
can not possibly while the device is streaming.
Furthermore this code was disabled altogether by the wrong ifdef in the
previous commit.
 2015-10-18 14:14:20 +02:00
Pavel Rojtberg
5e62e71b13 fix wrong ifdef bracketing 
in the case of HAVE_CAMV4L2 && !HAVE_CAMV4L there was no body for the if
statement.
 2015-10-18 14:13:44 +02:00
Pavel Rojtberg
838947bb8e replace custom yuyv_to_rgb24 implementation by cvtColor 2015-10-18 13:51:20 +02:00
Pavel Rojtberg
80747088e3 avoid needless copies during mjpeg decoding 2015-10-18 13:51:20 +02:00
Pavel Rojtberg
56dd7eda0d remove additional V4L2 pixelformat defines 
they are upstream since at least linux 2.6.8 (10 Years)
http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8
 2015-10-18 13:51:20 +02:00
Pavel Rojtberg
588eba3b37 simplify autosetup_capture_mode_v4l2 by using a for loop 2015-10-18 13:51:20 +02:00
Pavel Rojtberg
5525cc4d09 implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT 
do not use a custom enum instead of the V4L2 fourcc defines for palette.
This way we can easily implement CAP_PROP_FOURCC and CAP_PROP_MODE.
 2015-10-18 13:51:20 +02:00
Pavel Rojtberg
c0fe522c9d allow changing FPS and Image Size using V4L2 
use logic similar to cap_libv4l: replace icvSetVideoSize by v4l2_reset
as it was not used for V4L1, the actual frame format is negotiated in
try_palette_v4l2 and the stream has to restarted anyway.
 2015-10-18 13:51:16 +02:00
Pavel Rojtberg
18034a5138 allow icvGetPropertyCAM_V4L to return zero 
now icvGetPropertyCAM_V4L behaves the same as in cap_libv4l. This also
fixes passing boolean values.
 2015-10-18 13:48:15 +02:00
Pavel Rojtberg
f7981a8ae8 support setting focus and autofocus with V4L2 
also refactor property range handling and opencv property to V4L2
translation.
 2015-10-18 12:56:09 +02:00
Suleyman TURKMEN
73240b736b Update camera_calibration_and_3d_reconstruction.rst 2015-10-16 22:30:00 +03:00
grundman
f260b13a6f Fix racy modification of ForThread::m_state during invocation of stop() 2015-10-16 11:19:27 -07:00
Jan S. (Milania1)
3e0b1f2845 Added example to the documentation for the NormTypes enum (L1, L2, INF) 2015-10-15 19:16:07 +02:00
Bovaz
7be3d3ab2c sqrtf to std::sqrt 2015-10-14 18:57:33 -07:00
Matteo Piovanelli
216baf5b11 Speedup of arcLength 
By my tests, this version of cv::arcLength is almost 10% faster than the
one using a buffer it replaces.
 2015-10-14 13:37:48 -07:00
Alexander Alekhin
37ce3b8cfe Merge pull request #5478 from alalek:fix_android_pack_build 2015-10-14 13:05:18 +00:00
Lorena García
33f77774c5 Hit&Miss morphological operation 2015-10-14 14:01:53 +02:00
Alexander Alekhin
dcca0b499c Merge pull request #5509 from spmallick:master 2015-10-14 09:14:10 +00:00
Alexander Alekhin
d8c352d20d Merge pull request #5504 from aman11dhanpat:master 2015-10-14 09:10:30 +00:00
Alexander Alekhin
c1545c6f2a Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix 2015-10-14 09:09:30 +00:00
edgarriba
1e9bd59f07 load multi/hyperspectral images with using gdal 2015-10-14 09:16:04 +02:00
spmallick
066c775321 Update window_QT.h 
QPushButton was included twice.
 2015-10-13 15:51:43 -07:00
a-andre
d16fb30512 install opencv2/highgui.hpp header 2015-10-13 18:16:14 +02:00
Vladislav Vinogradov
02c48ab7d6 add CTest support to build tree 2015-10-13 17:34:08 +03:00
Vladislav Vinogradov
d81d51d155 assing labels to targets and sources 2015-10-13 17:33:26 +03:00
Alexander Alekhin
466a98f7c3 Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes 2015-10-13 14:24:09 +00:00
AlexanderStohr
0098c4b571 fix VS2010 error with type mismatch due to volatile qualifier 2015-10-13 16:15:49 +02:00
Alexander Stohr
7e3d7677ae not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt 2015-10-13 16:15:48 +02:00
StevenPuttemans
8ed25ad75f adding extra explanation for mask parameter 2015-10-13 15:21:35 +02:00
StevenPuttemans
0a708e4070 adding extra explanation for mask parameter 2015-10-13 15:19:50 +02:00
Alexander Smorkalov
408107ce6d Added missing copyright headers. 2015-10-13 15:02:38 +03:00
Pavel Vlasov
40b2dfae09 Fix for filter2D and IPP < 900 2015-10-13 14:10:32 +03:00
Aman Verma
411be4fde8 Fix for #5481, removing repeated/useless assignment in contours.cpp 2015-10-12 16:16:27 +00:00
Alexander Alekhin
ddd91bcebf android: add targetSdkVersion="21" 2015-10-12 18:12:34 +03:00
Dan
1e1f20cfee Improved consistency. 2015-10-12 09:21:53 -04:00
Alexander Alekhin
779dad12fb Merge pull request #5491 from ilya-lavrenov:video-writers-delete 2015-10-12 10:48:16 +00:00
Pavel Vlasov
89eee6ca99 Fixes for IPP integration: 
dotProd_16s - disabled for IPP 9.0.0;
filter2D - fixed kernel preparation;
morphology - conditions fix and disabled FilterMin and FilterMax for IPP 9.0.0;
GaussianBlur - disabled for CV_8UC1 due to buffer overflow;
integral - disabled for IPP 9.0.0;

IppAutoBuffer class was added;
 2015-10-12 10:51:28 +03: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
Amro
13a0a37e63 fix randMVNormal in ML (#5469) 
Fix the failed assertion by replacing the GEMM call.

Also random numbers are generated from normal distribution ~N(0,1),
instead of uniform distribution ~U(0,1).
 2015-10-11 01:54:11 +03:00
Nickolay Polyarniy
846e6f731a stereoRectifyUncalibrated: assertion of input points shape fixed 
Fix for https://github.com/Itseez/opencv/issues/4426
Documentation says that input points format is the same to input for findFundamentalMat
 2015-10-10 14:00:31 +03:00
Dikay900
7b0b12de58 appropriate logic behind last accepted stage when rejectingLevels is true 2015-10-09 23:19:42 +02:00
Dan Moodie
3d1355efc1 Updated input / output array to support std::vector<cv::cuda::GpuMat> 
Expanded support for std::vector<cv::cuda::GpuMat>.

Whitespace fix.
 2015-10-09 15:12:57 -04:00
Alexander Alekhin
dbcc55a196 cleanup <build>/src|gen folders to remove stalled/unused Java files 2015-10-09 17:28:50 +03:00
Alexander Alekhin
441eeef319 Merge pull request #5470 from apavlenko:android_camera_gl_view 2015-10-08 13:31:51 +00:00
Andrey Pavlenko
23fea91e84 minor fixes 2015-10-08 12:37:59 +03:00
StevenPuttemans
47db20eced removing unexisting functionality in ML header 2015-10-08 11:10:05 +02:00
Alexander Alekhin
484c68cbb8 Merge pull request #5460 from sergiud:highgui-autosize-gtk3 2015-10-07 14:47:16 +00:00
Alexander Alekhin
56e8827ce0 Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size 2015-10-07 14:42:29 +00:00
Andrey Pavlenko
15db8243ef refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21 2015-10-07 15:01:32 +03:00
Alexander Alekhin
454e5e5fa4 Merge pull request #5461 from berak:fix_putText_24 2015-10-06 17:12:25 +00:00
Alexander Alekhin
706b8a6266 Merge pull request #5459 from aman11dhanpat:master 2015-10-06 17:12:03 +00:00
Alexander Alekhin
559b538be8 Merge pull request #5458 from berak:fix_putText 2015-10-06 17:11:47 +00:00
berak
bb9bd3132a fix zero length std::string in putText() 2015-10-06 18:31:00 +02:00
berak
f2decec3e8 fix zero length std::string in putText() 2015-10-06 17:07:40 +02:00
Sergiu Dotenco
514b202d7b highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3 2015-10-06 17:01:28 +02:00
Aman Verma
dff7037156 Adding fix for issue 5451 "putText fails with empty std::string" 2015-10-06 14:23:27 +00:00
Sergiu Dotenco
9da4fe4b02 videoio: fixed segmentation fault at frame size change 2015-10-06 15:09:31 +02:00
Alexander Alekhin
6025738b8b Merge pull request #5454 from alalek:fix_ffmpeg_priv_data 2015-10-06 10:01:59 +00:00
Alexander Alekhin
7a4b2e18a7 Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation 2015-10-06 10:01:39 +00:00
Alexander Alekhin
4760d32937 ffmpeg: fix invalid NULL pointer access 
Catched on Ubuntu 12.04 with FFMPEG:
  codec:                     YES (ver 53.35.0)
  format:                    YES (ver 53.21.1)
  util:                      YES (ver 51.22.3)
  swscale:                   YES (ver 2.1.0)
  resample:                  NO
  gentoo-style:              YES
 2015-10-05 19:28:35 +03:00
Alexander Alekhin
33f5ac5c15 Merge pull request #5429 from PhilLab:patch-6 2015-10-05 12:50:17 +00:00
Alexander Alekhin
59a41c1c51 Merge pull request #5453 from paroj:capgstleak 2015-10-05 12:47:11 +00:00
Pavel Rojtberg
345cd1242f do not leak GstMapInfo 
it is new'ed but never deleted. However it does not need to be global or
heap allocated in the first place.
 2015-10-05 12:28:47 +02:00
Jan S. (Milania1)
3d2a24f61d Added example to the documentation for the normalize() method 2015-10-04 20:23:45 +02:00
Alexander Alekhin
50a0a167f0 fix ffmpeg frame creation (fix #5439) 2015-10-02 18:27:18 +03:00
Alexander Alekhin
76afd9a1b5 Merge pull request #5436 from jet47:fix-cuda-normalize 2015-10-02 12:50:38 +00:00
Alexander Alekhin
b37387ef90 Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes 2015-10-02 12:49:37 +00:00
Suleyman TURKMEN
21c0acff24 Update imgcodecs.hpp 2015-10-02 14:00:24 +03:00
Vladislav Vinogradov
1bf811c3f1 fix cuda::normalize (dtype < 0) case 2015-10-02 11:41:01 +03:00
StevenPuttemans
587dca9b1c adding markers to OpenCV 2015-10-02 08:48:15 +02:00
Elena Shipunova
e539a9632d Fix in fisheye calibrate function: #5389 2015-10-01 19:03:26 +03:00
Pavel Vlasov
6a0d3b06f2 IPPInitSingelton initialization guards; 2015-10-01 17:48:49 +03:00
Miguel Algaba
b71a27b96c Assert fix: allow one cluster as valid parameter 2015-10-01 16:45:59 +02:00
StevenPuttemans
406cfc48c9 adding markers to OpenCV for 2.4 branch 2015-10-01 16:08:25 +02:00
Vadim Pisarevsky
d69b7c332a Merge pull request #5385 from alalek:fix_android_camera_datarace 2015-10-01 13:58:01 +00:00
Philipp Hasper
05846438e3 Typo in CameraBridgeViewBase.java 
Corrected typo and unused imports
 2015-10-01 15:09:14 +02:00
Vadim Pisarevsky
af5e631a7a Merge pull request #5402 from sturkmen72:patch-10 2015-10-01 13:01:26 +00:00
Pavel Vlasov
e837d69f8f IPPInitSingelton was added to contain IPP related global variables; 
OPENCV_IPP env var now allows to select IPP architecture level for IPP9+;
IPP initialization logic was unified across modules;
 2015-10-01 09:58:48 +03:00
Alexander Alekhin
34e4e66bf1 Merge pull request #5419 from lupustr3:pvlasov/ipp9_integration 2015-09-30 17:36:43 +00:00
Alexander Alekhin
9b6424e0c6 Merge pull request #5415 from lupustr3:pvlasov/ipp_version_change 2015-09-29 17:11:30 +00:00
Pavel Vlasov
62854dcc0d Enables support of IPP 9.0.0; 
HAVE_IPP_ICV_ONLY will be undefined if OpenCV was linked against ICV packet from IPP9 or greater. ICV9+ packets will be aligned with IPP in OpenCV APIs
This will ease code management between IPP and ICV
 2015-09-29 17:27:13 +03:00
Pavel Vlasov
75c7917643 IPP_VERSION_X100 was changed to: 
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
 2015-09-29 17:24:18 +03:00
Alexander Alekhin
ddf82d0b15 Merge pull request #5405 from lupustr3:pvlasov/ipp_functions_refactoring 2015-09-28 17:20:41 +00:00
Suleyman TURKMEN
7c226ed7a2 adding new flags to imread to load image reduced 2015-09-28 02:00:02 +03:00
Alexander Alekhin
dd9da53860 disable String(int) ctor 
MSVC and GCC compilers interprets cv::String a(0) as a valid
statement with conversion of "int" argument to "const char*".
This patch forbids this expected behaviour.
 2015-09-27 14:54:11 +03:00
Balint Cristian
fdbed4a473 Speedup AGAST nonmax-suppression. 2015-09-26 04:43:07 +03:00
Pavel Vlasov
14b006e808 IPP_VERSION_X100 was changed to: 
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
 2015-09-25 17:50:15 +03:00
Pavel Vlasov
2177c7c5a8 Some IPP functions were encapsulated; 
Minor changes to IPP implementations;
 2015-09-25 17:30:26 +03:00
Alexander Alekhin
3a3f4038bf Merge pull request #5391 from paroj:parser_nonempty 2015-09-25 11:01:09 +00:00
Pavel Rojtberg
46ada3886f fix wrong parsing of values containing '=' 
fixes #5074
 2015-09-24 17:27:07 +02:00
Alexander Alekhin
60a689d27c Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2 2015-09-24 14:46:23 +00:00
robertxwu
db78de9c3b findChessboardCorners causes crash due to out-of-bounds memory corruption. 
Refer to the following issue for detail:
https://github.com/Itseez/opencv/issues/5145
 2015-09-24 12:59:00 +03:00
Pavel Rojtberg
1dd7f546af CommandLineParser: add special <none> value to disallow empty strings 
some mandatory string keys like paths must not be empty. Add the special
default value `<none>` so the CommandLineParser can enforce this and
generate an according error message for us.
 2015-09-23 15:43:46 +02:00
Alexander Alekhin
e5ece03db1 Merge pull request #5382 from paroj:parserthrow 2015-09-23 10:18:00 +00:00
Alexander Alekhin
6f04385a0e Merge pull request #5379 from sturkmen72:patch-9 2015-09-23 10:15:03 +00:00
Alexander Alekhin
134a3f165d Merge pull request #5381 from robertxwu:Bugfix_for_issue_#_of_5145 2015-09-23 09:58:24 +00:00
berak
74fc9acdd1 initialize temp_train_samples in SVM::autoTrain 
add smoke test
 2015-09-23 11:08:48 +02:00
Pavel Rojtberg
a388806555 enable additional CommandLineParser tests 2015-09-22 18:37:51 +02:00
Pavel Rojtberg
2ced3ba276 CommandLineParser: throw on programmer error 
requesting a previously undeclared key is most likely an programming
error. e.g. a typo "--unused vs --unsued".
So throw in those cases.

Add an according failure testcase.
 2015-09-22 18:35:49 +02:00
Alexander Alekhin
eb2e061e3f fix Android camera datarace (mCameraFrameReady) 2015-09-22 17:03:09 +03:00
Alexander Alekhin
d430e802f2 cmdparser: allow empty strings 2015-09-22 16:34:37 +03:00
Alexander Alekhin
12f01b778b fix perf tests 2015-09-22 15:20:40 +03:00
Alexander Alekhin
21e38f2949 Merge pull request #5383 from alalek:fix_tests 2015-09-22 12:11:22 +00:00
Alexander Alekhin
be507b20cd fix perf tests 2015-09-22 15:02:43 +03:00
Vadim Pisarevsky
9f697510ca Merge pull request #5320 from berak:lda_fix 2015-09-22 10:38:46 +00:00
Alexander Alekhin
4bb4c92f68 Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix 2015-09-22 10:19:52 +00:00
robertxwu
4a68cc1675 re-submit 2015-09-21 13:57:25 -07:00
Pavel Vlasov
33e659786f Fix for cmp16s condition during IPP compare type convert; 2015-09-21 18:11:20 +03:00
Vadim Pisarevsky
f838a832b2 Merge pull request #5357 from fxtentacle:ha-2.4.11 2015-09-21 14:31:13 +00:00
Alexander Alekhin
d945aff132 Merge pull request #5371 from Dikay900:ports_to_master 2015-09-21 13:52:45 +00:00
Alexander Alekhin
a9b91bb400 Merge pull request #5372 from alalek:cmd_tests 2015-09-21 13:52:26 +00:00
Vadim Pisarevsky
c9ccf3b55d Merge pull request #5346 from art-programmer:art-programmer-patch-1 2015-09-21 12:06:46 +00:00
Vadim Pisarevsky
706828a6d9 Merge pull request #5324 from mshabunin:hal-tests 2015-09-21 12:04:01 +00:00
Vadim Pisarevsky
01345fc159 Merge pull request #5344 from psalvaggio:master 2015-09-21 11:53:41 +00:00
Dikay900
55df326589 PR #4003 2015-09-21 13:44:35 +02:00
Gleb Gladilov
2bc4486966 Added test of minMaxLoc on filling with maximums of int 2015-09-21 13:44:30 +02:00
Gleb Gladilov
344d9fd83f Fixed minMaxLoc and test functions 2015-09-21 13:44:29 +02:00
Vitaly Tuzov
4a0152c731 Resize area result verification moved to the separate function 
fix position of assert expected/actual parameter
 2015-09-21 13:44:28 +02:00
Vitaly Tuzov
7d245e0f29 Added more resize_area tests to ensure right rounding behavior for half and quarter downscaling 2015-09-21 13:44:27 +02:00
Elena Shipunova
5de01fde53 do not proceed with removing zero-length slice 2015-09-21 13:44:26 +02:00
Alexander Alekhin
108bb75430 Merge pull request #5361 from alalek:update_ffmpeg_support 2015-09-21 10:48:42 +00:00
Alexander Alekhin
4613d37eba Merge pull request #5366 from taketwo:use-stream-in-bilateral-filter 2015-09-21 10:47:12 +00:00
Alexander Alekhin
05b1636780 Merge pull request #5329 from paroj:cliparser 2015-09-21 09:46:54 +00:00
berak
2f7c926670 remove usage of obsolete _dataAsRows flag 2015-09-21 07:59:09 +02:00
Suleyman TURKMEN
dff9d2288b Update window_w32.cpp 2015-09-21 00:34:15 +03:00
Alexander Alekhin
d3071db0d7 add some CommandLineParser tests 2015-09-20 13:14:41 +03:00
Andrey Pavlenko
8e088d38a5 draft implementation of alternative CameraBridge via GLES 
a simple sample will look like:

```java
public class MainActivity extends Activity implements CameraGLSurfaceView.CameraTextureListener {

	CameraGLSurfaceView mView;
	ByteBuffer buf;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        requestWindowFeature(Window.FEATURE_NO_TITLE);
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                WindowManager.LayoutParams.FLAG_FULLSCREEN);
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);

        mView = new CameraGLSurfaceView(this, null);
        mView.setCameraTextureListener(this);
        setContentView(mView);
        buf = ByteBuffer.allocateDirect(1920*1080*4);
    }

    @Override
    protected void onPause() {
        mView.onPause();
        super.onPause();
    }

    @Override
    protected void onResume() {
        super.onResume();
        mView.onResume();
    }

	@Override
	public void onCameraViewStarted(int width, int height) {
		// TODO Auto-generated method stub

	}

	@Override
	public void onCameraViewStopped() {
		// TODO Auto-generated method stub

	}

	@Override
	public boolean onCameraFrame(int texIn, int texOut, int width, int height) {
		Log.i("MAIN", "onCameraFrame");
		int w=width, h=height;
		/*
		// option 1:
		// just return 'false' to display texIn on screen
		retutn false;
		*/

		/*
		// option 2:
		// fast copy texIn to texOut
		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
    	GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
		GLES20.glCopyTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, 0, 0, w, h, 0);
		return true;
		*/

		// option 3:
		// read, modify and write back pixels
		GLES20.glReadPixels(0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);

		buf.rewind();
		// red line
		for(int i=0; i<h; i++) {
			buf.position(w*4*i+i*4);
			buf.put((byte) -1);
			buf.position(w*4*i+i*4+4);
			buf.put((byte) -1);
		}
		buf.rewind();

		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
    	GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
		GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
		return true;
	}
}
```
 2015-09-19 16:18:02 +03:00
Pavel Rojtberg
31da833574 ts/ts_perf: fix wrong has() usage 
`has()` only tests for an argument presence which is always true for
arguments with default values. Use `get<bool>()` to check the value
instead.
 2015-09-18 18:42:14 +02:00
Pavel Rojtberg
96cc618410 has() should only test for the presence of the argument 
and not consider its value. treat arguments with a set default value as
present.
 2015-09-18 18:42:14 +02:00
Pavel Rojtberg
08dd126f08 do not parse empty default values and improve error messages 2015-09-18 18:42:14 +02:00
Alexander Alekhin
0051208684 Merge pull request #5349 from lupustr3:pvlasov/tls_update 2015-09-18 14:39:08 +00:00
Alexander Alekhin
d2b10d8aa1 Merge pull request #5355 from renatoGarcia:master 2015-09-18 13:38:29 +00:00
Alexander Alekhin
e1b0d341e4 Merge pull request #5360 from SpecLad:test2-fail-on-failed-download 2015-09-18 12:10:52 +00:00
Alexander Alekhin
1b2c11e7b3 Merge pull request #5343 from paroj:boolean_algebra 2015-09-18 12:06:31 +00:00
Sergey Alexandrov
4094b2d7a5 Use stream argument when launching bilateral filter kernel 2015-09-18 13:12:58 +02:00
Alexander Alekhin
af0942c78f Merge pull request #5335 from Dikay900:ports_to_master 2015-09-18 11:06:08 +00:00
Pavel Rojtberg
f0282337e3 simplify error conditions 
`A || !A` is `true` so write `(A && B) || !A` as `B || !A`
 2015-09-18 12:12:49 +02:00
jisli
f88e9a748a update ffmpeg support 
Migration have been done for these ffmpeg/libav changes:

2013-12-11 - 29c83d2 / b9fb59d,409a143 / 9431356,44967ab / d7b3ee9 - lavc 55.45.101 / 55.28.1 - avcodec.h
  av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
  used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
  avcodec_free_frame() respectively. The latter three functions are deprecated.

2012-10-08 - ae77266 / 78071a1 - lavu 51.74.100 / 51.42.0 - pixfmt.h
  Rename PixelFormat to AVPixelFormat and all PIX_FMT_* to AV_PIX_FMT_*.
  To provide backwards compatibility, PixelFormat is now #defined as
  AVPixelFormat.
  Note that this can break user code that includes pixfmt.h and uses the
  'PixelFormat' identifier. Such code should either #undef PixelFormat
  or stop using the PixelFormat name.
 2015-09-17 20:24:37 +03: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
Pavel Vlasov
aa485ccd75 TLS keys leak fix; 
Disables TLS copy constructor and operator, as they can lead to errors and reservation of too much keys in TLS storage;

gather method was added to TLS to gather data from all threads;
 2015-09-17 15:49:20 +03:00
Renato Florentino Garcia
1a18fa1c94 Correct a typo. 2015-09-16 21:16:23 -03:00
Hajo Nils Krabbenhöft
7825cbeb7d buffer_size should be in bytes, not bits 2015-09-16 22:19:51 +02:00
Hajo Nils Krabbenhöft
d38fee7599 fix crash for large BW tif images 2015-09-16 22:04:42 +02:00
art-programmer
e0ef293645 Update em.cpp 
Fix a bug. When reading from a saved model, function decomposeCovs() will be called. And if covMatType is COV_MAT_DIAGONAL, covsEigenValues is computed using SVD and eigen values are sorted so that the order of eigen values is not preserved. This would lead to different result when calling function predict2. This issues is discussed here: http://stackoverflow.com/questions/23485982/got-different-empredict-results-after-emread-saved-model-in-opencv.
 2015-09-14 19:35:53 -05:00
Philip Salvaggio
fcf971bded Improved documentation for connectedComponentsWithStats. 2015-09-14 09:25:32 -04:00
Vadim Pisarevsky
9533982729 Merge pull request #5272 from avershov:opencl-vaapi-fallback 2015-09-14 11:54:20 +00:00
Alexander Alekhin
bf42b9603b fix "unreachable code" warning 2015-09-14 13:11:12 +03:00
Maksim Shabunin
603864dba2 Warning fix 2015-09-14 12:15:56 +03:00
Alexander Alekhin
1a8d7f9587 ocl: temporary restore OpenCL tls data (ocl.cpp without fix) 2015-09-13 20:28:24 +03:00
Alexander Alekhin
7213e5f68a ocl: correct disabling of OpenCL code 2015-09-13 20:28:23 +03:00
Ilya Lavrenov
3143f2fb50 fixed uninitialized memory writing/reading in flann 2015-09-13 12:43:44 +02:00
Ilya Lavrenov
df21a24f81 initialize padding of CvString with zeros 2015-09-13 12:38:10 +02:00
Ilya Lavrenov
ee2008abe8 fixed "Conditional jump or move depends on uninitialised value(s)" in GBD 2015-09-13 12:36:57 +02:00
Ilya Lavrenov
1d77d697ef fixed memory leak in GBTrees 2015-09-13 12:15:30 +02:00
Ilya Lavrenov
cf0f47f589 fixed memory leak in descriptor regression tests 2015-09-13 12:14:30 +02:00
Ilya Lavrenov
f7d36bbad5 fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp 2015-09-13 12:08:19 +02:00
Ilya Lavrenov
d81a0df489 fixed memory leak caused by illegal memory access 2015-09-11 19:07:20 +02:00
Ilya Lavrenov
e7ac52d17a fixed "Conditional jump or move depends on uninitialised value" warning 2015-09-11 19:03:33 +02:00
Ilya Lavrenov
7e26cf569f typo 2015-09-11 19:01:18 +02:00
Ilya Lavrenov
e390c8c728 fixed typo 2015-09-11 18:59:33 +02:00
Tsukasa Sugiura
b23e536894 Fix LineAA in case of 4 channel 
Fix bug when enter 4 channel image to LineAA function.
 2015-09-12 01:48:28 +09:00
Ilya Lavrenov
5547398786 fixed memory leaks in warpAffine tests 2015-09-11 18:47:30 +02:00
Ilya Lavrenov
7eba9055e0 fixed memory leaks in floodfill tests 2015-09-11 18:47:20 +02:00
Ilya Lavrenov
2a8ef1d065 fixed memory leaks in cvtyuv tests 2015-09-11 18:47:11 +02:00
Ilya Lavrenov
0303e8067e fixed memory leak in core ds tests 2015-09-11 18:46:52 +02:00
Ilya Lavrenov
11981c31f0 fixed valgrind warning in polylines 2015-09-11 18:45:01 +02:00
Tsukasa Sugiura
cd13b30fde Fix LineAA in case of 4 channel 
Fix bug when enter 4 channel image to LineAA function.
 2015-09-12 01:42:25 +09:00
Roman Donchenko
ec0508269a NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG() 
This ensures that test data is not dependent on the order the tests are
executed in.
 2015-09-11 18:39:32 +02:00
Roman Donchenko
a3b515c524 flann: fix AutotunedIndex crashing if a KDTree index is selected 
Backport of mariusmuja/flann@f8ca6df3.
 2015-09-11 18:37:51 +02:00
Roman Donchenko
e1be6d0888 Refactor a section of icvRotatingCalipers to work around a GCC bug 
https://bugs.launchpad.net/ubuntu/+source/gcc-4.9/+bug/1474304
 2015-09-11 18:34:16 +02:00
Maksim Shabunin
a275489f0a HAL universal intrinsics tests and documentation 2015-09-11 18:36:13 +03:00
Alexander Alekhin
190d00ea3e Merge pull request #5317 from alalek:workaround 2015-09-11 11:42:33 +00:00
Maksim Shabunin
31fbe8caeb Merge pull request #5255 from berak:java_videowriter 2015-09-11 11:09:16 +00:00
Alexander Alekhin
b29cde552a Merge pull request #5325 from jet47:gpu-stereobp-fix 2015-09-10 14:40:05 +00:00
Alexey Ershov
933ad0e710 changed call to getDefault: false to true in fallback initialization 2015-09-10 14:36:40 +03:00
Maksim Shabunin
d2add41b6b Merge pull request #5321 from alalek:copy_if_different 2015-09-10 09:41:49 +00:00
Maksim Shabunin
0a6e93dd3a Merge pull request #5258 from sturkmen72:patch-6 2015-09-10 09:22:07 +00:00
Vladislav Vinogradov
3ef067cc65 add extra checks to data_step_down to prevent out-of-border access 2015-09-10 10:05:25 +03:00
Vladislav Vinogradov
f903192c17 revert previous change in gpu::StereoBeliefPropogation 2015-09-10 10:05:04 +03:00
Vladislav Vinogradov
e2a9df408f fix for gpu::StereoBeliefPropogation: 
use continuous memory for internal buffers
 2015-09-10 09:55:46 +03:00
Alexander Alekhin
ad70ab404c ocl: workaround for getUMat() 2015-09-09 18:56:14 +03:00
Andrey Pavlenko
cea2dafa0f man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in UMat::getMat() 2015-09-09 18:05:29 +03:00
Alexander Alekhin
536634b1fe Merge pull request #5293 from alalek:tapi_custom_ptr_perf 2015-09-09 14:59:17 +00:00
Alexander Alekhin
cdfdf29eca Merge pull request #5292 from alalek:tapi_custom_ptr 2015-09-09 14:58:28 +00:00
Vadim Pisarevsky
32c386786e Merge pull request #5294 from LorenaGdL:master 2015-09-09 13:41:39 +00:00
Vadim Pisarevsky
cba401fe53 Merge pull request #5313 from sturkmen72:patch-5 2015-09-09 10:39:25 +00:00
Vadim Pisarevsky
666de1b087 Merge pull request #5312 from sturkmen72:patch-2 2015-09-09 10:30:22 +00:00
Alexander Alekhin
b15a9d675e cmake: use copy_if_different 2015-09-08 22:42:05 +03:00
Alexey Ershov
5937e58a11 fixed argument in call to {Input|Output}Array.getMat() 2015-09-08 19:29:19 +03:00
Alexey Ershov
949410b347 separated UMat & Mat usage in interop/copy paths 2015-09-07 21:11:05 +03:00
Maksim Shabunin
5618f4a0ac Fixed: Concurrency static scheduler release failed 2015-09-07 18:59:07 +03:00
Elena Shipunova
036c3b4e6d do not proceed with removing zero-length slice 2015-09-07 13:50:30 +03:00
Suleyman TURKMEN
9df5400200 Update drawing.cpp 
https://github.com/Itseez/opencv/issues/4791
 2015-09-07 11:33:29 +03:00
Suleyman TURKMEN
c63f443bba Update drawing.cpp 
https://github.com/Itseez/opencv/issues/4791
 2015-09-07 11:30:14 +03:00
Suleyman TURKMEN
e15dabf1db documentation patch 2015-09-05 10:41:01 +03:00
Alexander Alekhin
6fefc53e56 Merge pull request #5299 from ilya-lavrenov:core_hog 2015-09-04 14:30:17 +00:00
Alexander Alekhin
76235cbb70 Merge pull request #5300 from ilya-lavrenov:cuda_warnings 2015-09-04 10:21:44 +00:00
Alexey Ershov
68a0347ff9 fallback path & sample timing implemented 
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
 2015-09-04 02:42:49 +03:00
Ilya Lavrenov
6a05939e1c fixed warnings in gpu module 2015-09-03 19:13:00 +03:00
Ilya Lavrenov
7b1eb3af7b initialize padding of CvString with zeros 2015-09-03 18:33:15 +03:00
Ilya Lavrenov
3934d61de7 fixed uninitialized memory writing/reading in flann 2015-09-03 13:25:29 +03:00
Alexander Alekhin
4ecc023219 UMat: add perf test for custom ptr 2015-09-03 10:48:07 +03:00
Alexander Alekhin
8694ba0978 update custom_ptr test 2015-09-03 10:46:38 +03:00
Lorena García
4e7bd86fad TrainData doc update 
Update docs according to PR #5127
 2015-09-03 05:52:04 +02:00
Alexander Alekhin
a98ee0d3b2 Merge pull request #5289 from ilya-lavrenov:flann 2015-09-02 11:41:03 +00:00
Alexander Alekhin
73a8e65cbd Merge pull request #5285 from ilya-lavrenov:ml5 2015-09-02 11:39:07 +00:00
Alexander Alekhin
ae0d428b62 Merge pull request #5281 from ilya-lavrenov:ml2 2015-09-02 11:38:45 +00:00
Ilya Lavrenov
32d7c1950a fixed memory leak in flann index 2015-09-01 16:58:35 +03:00
Vadim Pisarevsky
5603617b7c Merge pull request #5284 from ilya-lavrenov:ml4 2015-09-01 12:31:46 +00:00
Vadim Pisarevsky
43aae3fee8 Merge pull request #5283 from ilya-lavrenov:ml3 2015-09-01 12:31:05 +00:00
Vadim Pisarevsky
a7a4a2ae30 Merge pull request #5280 from ilya-lavrenov:ml 2015-09-01 12:30:36 +00:00
Ilya Lavrenov
1b8c2589c0 fixed memory leak in GBTrees 2015-09-01 14:38:11 +03:00
Maksim Shabunin
8c65f8a0d1 fixup! Some changes to support mingw-w64 2015-09-01 13:49:23 +03:00
Ilya Lavrenov
887736bcd4 fixed "Conditional jump or move depends on uninitialised value(s)" in GBD 2015-09-01 13:22:49 +03:00
Alexander Alekhin
5b1967f80c Merge pull request #5274 from ilya-lavrenov:features2d 2015-09-01 10:14:29 +00:00
Ilya Lavrenov
3a1bb93340 release filestorage before exception 2015-09-01 13:04:33 +03:00
Ilya Lavrenov
dfb49097e3 fixed memory leak in ANN 2015-09-01 12:29:52 +03:00
Ilya Lavrenov
d7bb1025f3 fixed memory leak in ml module 2015-09-01 11:26:25 +03:00
Maksim Shabunin
771af4f32d Some changes to support mingw-w64 
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253)
 2015-09-01 00:59:08 +03:00
Ilya Lavrenov
dc441f50cd fixed memory leak in descriptor regression tests 2015-08-31 17:30:42 +03:00
Ilya Lavrenov
be499b42d9 fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp 2015-08-31 17:21:55 +03:00
Elad Joseph
7c16ad3f49 Update documentation in calib3d.hpp 
Fixed small mistake in documentation.
The prism coefficients in y'' equation were mistakenly written as s1,s2 instead of s3,s4
 2015-08-30 12:42:30 +03:00
Vadim Pisarevsky
a78da45fec Merge pull request #5242 from apavlenko:fix_releasing_temp_umat 2015-08-27 14:29:52 +00:00
Vladislav Vinogradov
7ddc0bdd37 fix potential out-of-border access in gpu StereoBeliefPropagation 2015-08-27 16:09:37 +03:00
Vadim Pisarevsky
bd43c62a75 Merge pull request #5232 from sturkmen72:patch-6 2015-08-27 07:07:53 +00:00
berak
a11ff876d4 enable VideoWriter class for java 
fixing fourcc
 2015-08-27 08:04:58 +02:00
Suleyman TURKMEN
f660461bb3 documentation patch 2015-08-26 17:40:38 +03:00
Andrey Pavlenko
b78eb49178 removing a garbage comment 2015-08-26 14:15:18 +03:00
Andrey Pavlenko
4aefb9f2fc making the test deepper 2015-08-26 13:38:26 +03:00
Alexander Alekhin
bbff288447 fix build with python3 only 2015-08-26 13:08:06 +03:00
Vadim Pisarevsky
b33853c5be Merge pull request #4199 from AVshokurov:master 2015-08-25 18:09:50 +00:00
Vadim Pisarevsky
587b0cc7b4 Merge pull request #4200 from Astero92:#3800 2015-08-25 18:08:54 +00:00
Vadim Pisarevsky
96fa0ef752 Merge pull request #5115 from ManuelFreudenreich:hog_variable 2015-08-25 14:45:53 +00:00
Andrey Pavlenko
3656a1aa66 fixing 'map_unmap_counting' 2015-08-25 17:25:03 +03:00
Vadim Pisarevsky
edcd2c0408 Merge pull request #4176 from alalek:issue_4461 2015-08-25 07:46:28 +00:00
Vadim Pisarevsky
e2b677ddcf Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps 2015-08-25 07:44:29 +00:00