platform/upstream/opencv.git
8 years agoCvLevMarq: remove fixed rows instead of setting them to zero
Pavel Rojtberg [Sat, 21 Nov 2015 00:30:53 +0000 (01:30 +0100)]
CvLevMarq: remove fixed rows instead of setting them to zero

use the same approach like in fisheye calibration: instead of setting
masked out rows to zero, remove them from the equation system.
This way JtJ does not become singular and we can use the much faster LU
decomposition instead of SVD.

This results in a speedup of the Calibrate unit tests of 3x-10x.

8 years agoupdate SOLVEPNP documentation
Pavel Rojtberg [Thu, 10 Dec 2015 22:01:00 +0000 (23:01 +0100)]
update SOLVEPNP documentation

8 years agoMerge pull request #5774 from mshabunin:coverity_fixes
Vadim Pisarevsky [Wed, 9 Dec 2015 13:32:44 +0000 (13:32 +0000)]
Merge pull request #5774 from mshabunin:coverity_fixes

8 years agoMerge pull request #5768 from cbalint13:kaze_akaze
Vadim Pisarevsky [Wed, 9 Dec 2015 13:18:25 +0000 (13:18 +0000)]
Merge pull request #5768 from cbalint13:kaze_akaze

8 years agoMerge pull request #5770 from emiswelt:master
Vadim Pisarevsky [Wed, 9 Dec 2015 12:19:53 +0000 (12:19 +0000)]
Merge pull request #5770 from emiswelt:master

8 years agoMerge pull request #5748 from songyuncen:fix#5745
Vadim Pisarevsky [Wed, 9 Dec 2015 12:17:40 +0000 (12:17 +0000)]
Merge pull request #5748 from songyuncen:fix#5745

8 years agoValgrind: fixed uninitialized image usage in descriptors regression tests
Maksim Shabunin [Tue, 8 Dec 2015 15:24:39 +0000 (18:24 +0300)]
Valgrind: fixed uninitialized image usage in descriptors regression tests

8 years agoValgrind: do not use uninitialized data in optflow
Maksim Shabunin [Tue, 8 Dec 2015 14:47:06 +0000 (17:47 +0300)]
Valgrind: do not use uninitialized data in optflow

8 years agoCoverity: fixed uninitialized field in ExifReader
Maksim Shabunin [Tue, 8 Dec 2015 13:38:59 +0000 (16:38 +0300)]
Coverity: fixed uninitialized field in ExifReader

8 years agoCoverity: fixed uninitialized fields in test_goodfeaturetotrack
Maksim Shabunin [Tue, 8 Dec 2015 13:03:12 +0000 (16:03 +0300)]
Coverity: fixed uninitialized fields in test_goodfeaturetotrack

8 years agoCoverity: memory leak in OpenEXR reader
Maksim Shabunin [Tue, 8 Dec 2015 12:52:21 +0000 (15:52 +0300)]
Coverity: memory leak in OpenEXR reader

8 years agoCoverity: uninitialized fields in Stitcher
Maksim Shabunin [Tue, 8 Dec 2015 12:36:00 +0000 (15:36 +0300)]
Coverity: uninitialized fields in Stitcher

8 years agoCoverity: fixed some negative argument issues
Maksim Shabunin [Tue, 8 Dec 2015 12:15:51 +0000 (15:15 +0300)]
Coverity: fixed some negative argument issues

8 years agoCoverity: uninitialized values in ExifEntry_t structure
Maksim Shabunin [Tue, 8 Dec 2015 11:58:09 +0000 (14:58 +0300)]
Coverity: uninitialized values in ExifEntry_t structure

8 years agoMerge pull request #5773 from GregoryMorse:master
Vadim Pisarevsky [Wed, 9 Dec 2015 11:15:25 +0000 (11:15 +0000)]
Merge pull request #5773 from GregoryMorse:master

8 years agoUpdate CMakeLists.txt
Gregory Morse [Wed, 9 Dec 2015 02:45:10 +0000 (03:45 +0100)]
Update CMakeLists.txt

WinRT parallels library is causing conflicts in VC++ due to inconsistent usage with C++/CX which is now present in parallels.cpp.  This support should be included in all projects with WinRT specific code except if doing special native C++ tasks.

8 years agoUpdate CMakeLists.txt
Gregory Morse [Wed, 9 Dec 2015 02:42:25 +0000 (03:42 +0100)]
Update CMakeLists.txt

Fix C++/CX support for all WINRT and bring back native-mode only support which was removed

8 years agoMerge remote-tracking branch 'origin/fix#5745' into fix#5745
songyuncen [Wed, 9 Dec 2015 00:03:51 +0000 (08:03 +0800)]
Merge remote-tracking branch 'origin/fix#5745' into fix#5745

8 years agobuild failed, trailing whitespace.
songyuncen [Tue, 8 Dec 2015 15:18:53 +0000 (23:18 +0800)]
build failed, trailing whitespace.

8 years agoChanged parameter order of cv::stereoRectify in documentation,
emiswelt [Tue, 8 Dec 2015 22:28:32 +0000 (22:28 +0000)]
Changed parameter order of cv::stereoRectify in documentation,
so it matches the code.

8 years agoFix KAZE/AKAZE descriptors to use angle instead radians.
Balint Cristian [Tue, 8 Dec 2015 20:04:41 +0000 (22:04 +0200)]
Fix KAZE/AKAZE descriptors to use angle instead radians.

8 years agoMerge pull request #5230 from PhilLab:patch-4
Vadim Pisarevsky [Tue, 8 Dec 2015 18:46:33 +0000 (18:46 +0000)]
Merge pull request #5230 from PhilLab:patch-4

8 years agoMerge pull request #5765 from alalek:pthread_mutex_init
Vadim Pisarevsky [Tue, 8 Dec 2015 16:49:41 +0000 (16:49 +0000)]
Merge pull request #5765 from alalek:pthread_mutex_init

8 years agoMerge pull request #5670 from askourik:opencv_agast_tree
Vadim Pisarevsky [Tue, 8 Dec 2015 16:46:10 +0000 (16:46 +0000)]
Merge pull request #5670 from askourik:opencv_agast_tree

8 years agobuild failed, trailing whitespace.
songyuncen [Tue, 8 Dec 2015 15:18:53 +0000 (23:18 +0800)]
build failed, trailing whitespace.

8 years agoremove compile warnings in shapedescr.cpp
songyuncen [Tue, 8 Dec 2015 14:23:23 +0000 (22:23 +0800)]
remove compile warnings in shapedescr.cpp

8 years agochange the algorithm of minimum enclosing circle with EMO Welzl's method
songyuncen [Tue, 8 Dec 2015 13:38:59 +0000 (21:38 +0800)]
change the algorithm of minimum enclosing circle with EMO Welzl's method

8 years agoMerge pull request #5758 from eladj:py_tutorial_hdr
Vadim Pisarevsky [Tue, 8 Dec 2015 12:29:53 +0000 (12:29 +0000)]
Merge pull request #5758 from eladj:py_tutorial_hdr

8 years agoMerge pull request #5660 from jet47:cuda-wrap-stream-3.0
Vadim Pisarevsky [Tue, 8 Dec 2015 12:28:57 +0000 (12:28 +0000)]
Merge pull request #5660 from jet47:cuda-wrap-stream-3.0

8 years agoMerge pull request #5757 from alalek:merge-2.4
Vadim Pisarevsky [Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)]
Merge pull request #5757 from alalek:merge-2.4

8 years agoMerge pull request #5755 from teng88:patch-4
Vadim Pisarevsky [Tue, 8 Dec 2015 11:47:09 +0000 (11:47 +0000)]
Merge pull request #5755 from teng88:patch-4

8 years agopthreads: remove usage of non-POSIX PTHREAD_RECURSIVE_MUTEX_INITIALIZER* defines
Alexander Alekhin [Tue, 8 Dec 2015 10:55:02 +0000 (13:55 +0300)]
pthreads: remove usage of non-POSIX PTHREAD_RECURSIVE_MUTEX_INITIALIZER* defines

related issues: #5423 #5476

8 years agoMerge pull request #5735 from Astero92:angle_unit
Vadim Pisarevsky [Tue, 8 Dec 2015 10:35:13 +0000 (10:35 +0000)]
Merge pull request #5735 from Astero92:angle_unit

8 years agoMerge pull request #5759 from grundman:patch-1
Vadim Pisarevsky [Tue, 8 Dec 2015 10:33:54 +0000 (10:33 +0000)]
Merge pull request #5759 from grundman:patch-1

8 years agoMerge pull request #5756 from mshabunin:smooth_neon_fix
Maksim Shabunin [Tue, 8 Dec 2015 08:59:58 +0000 (08:59 +0000)]
Merge pull request #5756 from mshabunin:smooth_neon_fix

8 years agoMerge pull request #3540 from AlexanderUsentsov:good_feature
Maksim Shabunin [Tue, 8 Dec 2015 08:02:27 +0000 (08:02 +0000)]
Merge pull request #3540 from AlexanderUsentsov:good_feature

8 years agoMerge 2.4 into master
Alexander Alekhin [Tue, 8 Dec 2015 07:24:54 +0000 (10:24 +0300)]
Merge 2.4 into master

PR #2968: cce2d99 8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher

The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.

PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.

PR #3190
fix blobdetector

PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.

PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h

PR #3792: afdf319
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function

PR #5490: ec5244a
fixed memory leak in findHomography tests

PR #5491: 0d5b739
delete video readers

PR #5574

PR #5202

8 years agoFixed histogram substraction bug with NEON instructions (arguments in wrong order).
Florent [Thu, 15 Oct 2015 04:49:32 +0000 (13:49 +0900)]
Fixed histogram substraction bug with NEON instructions (arguments in wrong order).

8 years agofixed whitespace
Elad Joseph [Mon, 7 Dec 2015 20:06:08 +0000 (22:06 +0200)]
fixed whitespace

8 years agoUpdate imgwarp.cpp
grundman [Mon, 7 Dec 2015 19:48:45 +0000 (11:48 -0800)]
Update imgwarp.cpp

github editor does not show white space and inserts one for you ... great combination

8 years agofixed whitespace
Elad Joseph [Mon, 7 Dec 2015 19:39:01 +0000 (21:39 +0200)]
fixed whitespace

8 years agoUpdate imgwarp.cpp
grundman [Mon, 7 Dec 2015 19:25:39 +0000 (11:25 -0800)]
Update imgwarp.cpp

Check for identity resize => use copy instead (1.37 ms -> 0.07 ms on 720p)

8 years agoAdd HDR tutorial to the python tutorials
Elad Joseph [Mon, 7 Dec 2015 18:57:10 +0000 (20:57 +0200)]
Add HDR tutorial to the python tutorials

Add py_hdr tutorial under py_tutorials\py_photo.
This tutorial is similar to the one which is given at the C++ tutorials.

8 years agoadded test for goodFeaturesToTrack;
ausentso [Thu, 3 Dec 2015 13:19:08 +0000 (16:19 +0300)]
added test for goodFeaturesToTrack;

8 years agoUpdate haarfeatures.cpp
Teng Cao [Mon, 7 Dec 2015 11:51:30 +0000 (19:51 +0800)]
Update haarfeatures.cpp

8 years agoUpdate haarfeatures.cpp
Teng Cao [Mon, 7 Dec 2015 11:01:04 +0000 (19:01 +0800)]
Update haarfeatures.cpp

8 years agocalculate innTilted only for Haar::ALL mode
Teng Cao [Mon, 7 Dec 2015 10:50:54 +0000 (18:50 +0800)]
calculate innTilted only for Haar::ALL mode

major time consuming part for training app is in function fillPassedSamples for negatives,
this change make SetImage quicker, in a test of my own data, the total time for SetImage decrease from 9177666 to 5839263,
only help for Haar feature and non Haar::ALL mode which is the most commonly case

8 years agoMerge pull request #5717 from jet47:cuda-maxwell-fixes
Vadim Pisarevsky [Mon, 7 Dec 2015 10:16:48 +0000 (10:16 +0000)]
Merge pull request #5717 from jet47:cuda-maxwell-fixes

8 years agoMerge pull request #5651 from hoangviet1985:fix_solvePoly_3.0.0
Vadim Pisarevsky [Mon, 7 Dec 2015 10:12:54 +0000 (10:12 +0000)]
Merge pull request #5651 from hoangviet1985:fix_solvePoly_3.0.0

8 years agoMerge pull request #5704 from sturkmen72:patch-3
Vadim Pisarevsky [Mon, 7 Dec 2015 10:09:57 +0000 (10:09 +0000)]
Merge pull request #5704 from sturkmen72:patch-3

8 years agoMerge pull request #5731 from teng88:patch-1
Vadim Pisarevsky [Mon, 7 Dec 2015 10:07:43 +0000 (10:07 +0000)]
Merge pull request #5731 from teng88:patch-1

8 years agoMerge pull request #5743 from mshabunin:hal_extend
Vadim Pisarevsky [Mon, 7 Dec 2015 10:01:22 +0000 (10:01 +0000)]
Merge pull request #5743 from mshabunin:hal_extend

8 years agoMerge pull request #5747 from Sethur:patch-1
Alexander Alekhin [Mon, 7 Dec 2015 09:40:01 +0000 (09:40 +0000)]
Merge pull request #5747 from Sethur:patch-1

8 years agoMerge pull request #5751 from mikanbako:fix-document
Vadim Pisarevsky [Mon, 7 Dec 2015 09:37:46 +0000 (09:37 +0000)]
Merge pull request #5751 from mikanbako:fix-document

8 years agoAdd documentation about detail of image type
Keita Kita [Sun, 6 Dec 2015 04:52:43 +0000 (13:52 +0900)]
Add documentation about detail of image type

connectedComponents and connectedComponentsWithStats in
imgproc accept 8-bit single channel image only for input.

8 years agotry to fix : enclosing circle always larger than 1.0
songyuncen [Sat, 5 Dec 2015 02:57:29 +0000 (10:57 +0800)]
try to fix : enclosing circle always larger than 1.0

issue #5745

8 years agoFixed duplicate PATH in TBB_DEFAULT_INCLUDE_DIRS
Sethur [Fri, 4 Dec 2015 14:07:41 +0000 (15:07 +0100)]
Fixed duplicate PATH in TBB_DEFAULT_INCLUDE_DIRS

8 years agoDocumentation patch for cv::mixChannels
Suleyman TURKMEN [Sun, 22 Nov 2015 00:55:27 +0000 (02:55 +0200)]
Documentation patch for cv::mixChannels

8 years agoFix documentation warning
Maksim Shabunin [Thu, 3 Dec 2015 14:30:45 +0000 (17:30 +0300)]
Fix documentation warning

8 years agoFixed NEON compilation issue
Maksim Shabunin [Thu, 3 Dec 2015 12:40:55 +0000 (15:40 +0300)]
Fixed NEON compilation issue

8 years agoFixed some build issues
Maksim Shabunin [Thu, 3 Dec 2015 12:25:42 +0000 (15:25 +0300)]
Fixed some build issues

8 years agoMerge pull request #5741 from PolarNick239:master
Maksim Shabunin [Thu, 3 Dec 2015 12:00:20 +0000 (12:00 +0000)]
Merge pull request #5741 from PolarNick239:master

8 years agoHAL: fixed header path
Maksim Shabunin [Thu, 3 Dec 2015 11:56:15 +0000 (14:56 +0300)]
HAL: fixed header path

8 years agoHAL: improvements
Maksim Shabunin [Thu, 3 Dec 2015 11:43:37 +0000 (14:43 +0300)]
HAL: improvements

- added new functions from core module: split, merge, add, sub, mul, div, ...
- added function replacement mechanism
- added example of HAL replacement library

8 years agoMerge pull request #5742 from GabrieleDalmazzone:GabrieleDalmazzone-patch-1
Alexander Alekhin [Thu, 3 Dec 2015 10:29:22 +0000 (10:29 +0000)]
Merge pull request #5742 from GabrieleDalmazzone:GabrieleDalmazzone-patch-1

8 years agoMerge pull request #5720 from asmorkalov:as/cuda_qnx
Maksim Shabunin [Thu, 3 Dec 2015 07:41:22 +0000 (07:41 +0000)]
Merge pull request #5720 from asmorkalov:as/cuda_qnx

8 years agots module: includes moved out from cvtest namespace
Nikolay Polyarniy [Wed, 2 Dec 2015 21:15:38 +0000 (00:15 +0300)]
ts module: includes moved out from cvtest namespace

8 years agoMerge remote-tracking branch 'origin/master' into angle_unit
Dominik Kleiser [Wed, 2 Dec 2015 17:39:12 +0000 (18:39 +0100)]
Merge remote-tracking branch 'origin/master' into angle_unit

8 years agoMerge pull request #5572 from paroj:nov4l1
Alexander Alekhin [Wed, 2 Dec 2015 16:49:59 +0000 (16:49 +0000)]
Merge pull request #5572 from paroj:nov4l1

8 years agouse float for CV_PI
Dominik Kleiser [Wed, 2 Dec 2015 16:33:40 +0000 (17:33 +0100)]
use float for CV_PI

8 years agouse floats for the calculation
Dominik Kleiser [Wed, 2 Dec 2015 15:38:44 +0000 (16:38 +0100)]
use floats for the calculation

8 years agoMerge pull request #5725 from alalek:ippicv_update_20151201
Alexander Alekhin [Wed, 2 Dec 2015 14:22:29 +0000 (14:22 +0000)]
Merge pull request #5725 from alalek:ippicv_update_20151201

8 years agoFix the unit of angle for AKaze/Kaze KeyPoints
Dominik Kleiser [Wed, 2 Dec 2015 10:51:37 +0000 (11:51 +0100)]
Fix the unit of angle for AKaze/Kaze KeyPoints

Convert the return value of getAngle from radian to degrees.

8 years agoippicv: update 20151201 (9.0.1)
Alexander Alekhin [Tue, 1 Dec 2015 10:12:32 +0000 (13:12 +0300)]
ippicv: update 20151201 (9.0.1)

8 years agoUpdate cascadeclassifier.cpp
teng88 [Wed, 2 Dec 2015 03:50:22 +0000 (11:50 +0800)]
Update cascadeclassifier.cpp

minor fix since predict() returun int

8 years agoMerge pull request #5727 from lupustr3:pvlasov/ipp_warnings_fix
Alexander Alekhin [Tue, 1 Dec 2015 14:43:20 +0000 (14:43 +0000)]
Merge pull request #5727 from lupustr3:pvlasov/ipp_warnings_fix

8 years agoFixed warnings for IPP9+ build;
Pavel Vlasov [Tue, 1 Dec 2015 13:10:29 +0000 (16:10 +0300)]
Fixed warnings for IPP9+ build;

8 years agoRace condition bug-fix in hog.cu
GabrieleDalmazzone [Tue, 1 Dec 2015 08:19:31 +0000 (09:19 +0100)]
Race condition bug-fix in hog.cu

See https://github.com/Itseez/opencv/issues/5721

COMMENTS:
* The second __syncthreads() is necessary, I am sure of that.
* The code works without the first __syncthreads() too, but I have however added it for symmetry. Anyway it doesn't affect time performances, I have checked it with some profiling with nvvp

8 years agoMerge pull request #5708 from comdiv:#5707
Alexander Alekhin [Mon, 30 Nov 2015 09:52:16 +0000 (09:52 +0000)]
Merge pull request #5708 from comdiv:#5707

8 years agoMerge pull request #5633 from mshabunin:doc-mser
Alexander Alekhin [Mon, 30 Nov 2015 09:48:39 +0000 (09:48 +0000)]
Merge pull request #5633 from mshabunin:doc-mser

8 years agoMerge pull request #5714 from ajbernal:OCL_HOG_Fix
Alexander Alekhin [Mon, 30 Nov 2015 09:44:37 +0000 (09:44 +0000)]
Merge pull request #5714 from ajbernal:OCL_HOG_Fix

8 years agoBuild fix for QNX 6.6 neitrino.
Alexander Smorkalov [Mon, 30 Nov 2015 07:28:04 +0000 (10:28 +0300)]
Build fix for QNX 6.6 neitrino.

8 years agodisable sanity tests for AlphaComp and PyrLKOpticalFlowDense
Vladislav Vinogradov [Fri, 27 Nov 2015 13:46:47 +0000 (16:46 +0300)]
disable sanity tests for AlphaComp and PyrLKOpticalFlowDense

8 years agoincrease epsilons in some tests:
Vladislav Vinogradov [Fri, 27 Nov 2015 13:46:20 +0000 (16:46 +0300)]
increase epsilons in some tests:

* MulSpectrums
* StereoConstantSpaceBP
* BruteForceNonLocalMeans

8 years agofix BORDER_WRAP processing on Maxwell generation
Vladislav Vinogradov [Fri, 27 Nov 2015 13:45:26 +0000 (16:45 +0300)]
fix BORDER_WRAP processing on Maxwell generation

8 years agoMerge pull request #5713 from ilya-lavrenov:lintian
Alexander Smorkalov [Thu, 26 Nov 2015 08:20:12 +0000 (08:20 +0000)]
Merge pull request #5713 from ilya-lavrenov:lintian

8 years agoFix for #5710. OpenCL HOG Object detect assigns the wrong SIMD size.
Ariel Bernal [Thu, 26 Nov 2015 00:20:04 +0000 (16:20 -0800)]
Fix for #5710. OpenCL HOG Object detect assigns the wrong SIMD size.

In oder to guarantee SIMDness between the two compilation steps we choose the
highest SIMD size that is optimized in the kernel for the first step.

8 years agoadded suppression for python-script-but-no-python-dep
Ilya Lavrenov [Wed, 25 Nov 2015 20:38:33 +0000 (23:38 +0300)]
added suppression for python-script-but-no-python-dep

8 years agoMerge pull request #4110 from LaurentBerger:Bug4370
Alexander Alekhin [Tue, 24 Nov 2015 20:03:49 +0000 (20:03 +0000)]
Merge pull request #4110 from LaurentBerger:Bug4370

8 years ago32bit BITFIELDS compresion codec support #5707 Fixed
comdiv [Tue, 24 Nov 2015 19:03:35 +0000 (00:03 +0500)]
32bit BITFIELDS compresion codec support #5707 Fixed

wsfixed

8 years agofixed #5005: stitching_detailed.cpp
LaurentBerger [Mon, 23 Nov 2015 20:55:59 +0000 (21:55 +0100)]
fixed #5005: stitching_detailed.cpp

8 years agoremoving code duplicates and replace unsigned long by uint32_t
askourik [Mon, 23 Nov 2015 20:47:23 +0000 (23:47 +0300)]
removing code duplicates and replace unsigned long by uint32_t

8 years agoremoved code duplication for non-intel platforms
askourik [Mon, 23 Nov 2015 19:41:35 +0000 (22:41 +0300)]
removed code duplication for non-intel platforms

8 years agoAdded new function definition in AGAST module header for tree-optimized version
askourik [Mon, 23 Nov 2015 19:11:01 +0000 (22:11 +0300)]
Added new function definition in AGAST module header for tree-optimized version

8 years agoMerge pull request #5400 from dtmoodie:thrust_tutorial
Vadim Pisarevsky [Mon, 23 Nov 2015 18:36:41 +0000 (18:36 +0000)]
Merge pull request #5400 from dtmoodie:thrust_tutorial

8 years agoMerge pull request #5620 from paroj:calibratecpp
Vadim Pisarevsky [Mon, 23 Nov 2015 18:35:25 +0000 (18:35 +0000)]
Merge pull request #5620 from paroj:calibratecpp

8 years agoMerge pull request #5661 from mbarann:fix_msmf_write_vertically_flipped_video
Vadim Pisarevsky [Mon, 23 Nov 2015 18:34:30 +0000 (18:34 +0000)]
Merge pull request #5661 from mbarann:fix_msmf_write_vertically_flipped_video

8 years agoMerge pull request #5698 from lupustr3:pvlasov/ipp9_fixes
Alexander Alekhin [Mon, 23 Nov 2015 16:28:03 +0000 (16:28 +0000)]
Merge pull request #5698 from lupustr3:pvlasov/ipp9_fixes

8 years agoMerge pull request #5644 from hoangviet1985:splitError
Vadim Pisarevsky [Mon, 23 Nov 2015 13:43:38 +0000 (13:43 +0000)]
Merge pull request #5644 from hoangviet1985:splitError

8 years agoMerge pull request #5390 from StevenPuttemans:add_markers_2.4
Vadim Pisarevsky [Mon, 23 Nov 2015 13:40:00 +0000 (13:40 +0000)]
Merge pull request #5390 from StevenPuttemans:add_markers_2.4