platform/upstream/opencv.git
9 years agoMerge pull request #4149 from LaurentBerger:ThreshGaussianFloat
Vadim Pisarevsky [Wed, 5 Aug 2015 17:25:01 +0000 (17:25 +0000)]
Merge pull request #4149 from LaurentBerger:ThreshGaussianFloat

9 years agoMerge pull request #5130 from alalek:issue_4380
Vadim Pisarevsky [Wed, 5 Aug 2015 17:19:55 +0000 (17:19 +0000)]
Merge pull request #5130 from alalek:issue_4380

9 years agotapi: add test from issue 4380 (#5010)
Alexander Alekhin [Wed, 5 Aug 2015 13:08:48 +0000 (16:08 +0300)]
tapi: add test from issue 4380 (#5010)

9 years agoremove test
LaurentBerger [Tue, 4 Aug 2015 20:58:22 +0000 (22:58 +0200)]
remove test

9 years agoMerge pull request #5118 from alalek:fix_viz_build
Alexander Alekhin [Tue, 4 Aug 2015 10:28:43 +0000 (10:28 +0000)]
Merge pull request #5118 from alalek:fix_viz_build

9 years agovtk: disable on cross-compilation
Alexander Alekhin [Mon, 3 Aug 2015 16:09:07 +0000 (19:09 +0300)]
vtk: disable on cross-compilation

9 years agoviz: fix precompiled headers definitions
Alexander Alekhin [Mon, 3 Aug 2015 11:36:58 +0000 (14:36 +0300)]
viz: fix precompiled headers definitions

9 years agoMerge pull request #5106 from vladimir-dudnik:opencl-opengl-upd
Alexander Alekhin [Mon, 3 Aug 2015 09:57:06 +0000 (09:57 +0000)]
Merge pull request #5106 from vladimir-dudnik:opencl-opengl-upd

9 years agoMerge pull request #5107 from vladimir-dudnik:d3d-interop-upd
Alexander Alekhin [Mon, 3 Aug 2015 09:56:37 +0000 (09:56 +0000)]
Merge pull request #5107 from vladimir-dudnik:d3d-interop-upd

9 years agoMerge pull request #4233 from alalek:fix_4006
Vadim Pisarevsky [Mon, 3 Aug 2015 05:46:29 +0000 (05:46 +0000)]
Merge pull request #4233 from alalek:fix_4006

9 years agoMerge pull request #5087 from alexst07:cuda_contrib
Vadim Pisarevsky [Mon, 3 Aug 2015 05:42:33 +0000 (05:42 +0000)]
Merge pull request #5087 from alexst07:cuda_contrib

9 years agoMerge pull request #5102 from nzjrs:fix-python-digits
Vadim Pisarevsky [Mon, 3 Aug 2015 05:40:23 +0000 (05:40 +0000)]
Merge pull request #5102 from nzjrs:fix-python-digits

9 years agofixed not initialized nv12_cpu_copy surface, remove odd code
Vladimir Dudnik [Fri, 31 Jul 2015 23:10:05 +0000 (02:10 +0300)]
fixed not initialized nv12_cpu_copy surface, remove odd code

9 years agoupdate opencl-opengl interop sample (remove odd no processing branch)
Vladimir Dudnik [Fri, 31 Jul 2015 22:16:06 +0000 (01:16 +0300)]
update opencl-opengl interop sample (remove odd no processing branch)

9 years agoMerge pull request #5097 from alalek:fix_build
Alexander Alekhin [Fri, 31 Jul 2015 15:35:42 +0000 (15:35 +0000)]
Merge pull request #5097 from alalek:fix_build

9 years agoremove picloud from digits_adjust
John Stowers [Fri, 31 Jul 2015 07:17:16 +0000 (09:17 +0200)]
remove picloud from digits_adjust

the service has been closed since 2013/2014

9 years agofix digits.py to not ignore model parameters
John Stowers [Fri, 31 Jul 2015 07:14:20 +0000 (09:14 +0200)]
fix digits.py to not ignore model parameters

otherwise model is only ever trained with default
parameters, and digits_adjust does nothing (for example)

9 years agofix build with Win7 SDK
Alexander Alekhin [Thu, 30 Jul 2015 17:03:03 +0000 (20:03 +0300)]
fix build with Win7 SDK

9 years agochange displaying of fps to time (ms)
Alexey Ershov [Thu, 30 Jul 2015 16:57:11 +0000 (19:57 +0300)]
change displaying of fps to time (ms)

9 years agotapi: enable some disabled tests
Alexander Alekhin [Thu, 30 Jul 2015 13:02:58 +0000 (16:02 +0300)]
tapi: enable some disabled tests

9 years agoMerge pull request #5081 from sbokov:Adding_HAL_v_extract
Maksim Shabunin [Thu, 30 Jul 2015 16:12:38 +0000 (16:12 +0000)]
Merge pull request #5081 from sbokov:Adding_HAL_v_extract

9 years agoMerge pull request #5093 from sturkmen72:patch-5
Maksim Shabunin [Thu, 30 Jul 2015 13:04:48 +0000 (13:04 +0000)]
Merge pull request #5093 from sturkmen72:patch-5

9 years agoMerge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop
Alexander Alekhin [Thu, 30 Jul 2015 10:36:25 +0000 (10:36 +0000)]
Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop

9 years agoUpdate how_to_scan_images.cpp
Suleyman TURKMEN [Thu, 30 Jul 2015 10:17:17 +0000 (13:17 +0300)]
Update how_to_scan_images.cpp

9 years agoFixes namespace error on cudaoptflow
Alex Torres [Tue, 28 Jul 2015 18:49:24 +0000 (15:49 -0300)]
Fixes namespace error on cudaoptflow

9 years agofinished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then...
Vladimir Dudnik [Wed, 29 Jul 2015 10:31:10 +0000 (14:31 +0400)]
finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat.

9 years agod3d11-nv12 interop
Vladimir Dudnik [Wed, 29 Jul 2015 16:52:03 +0000 (19:52 +0300)]
d3d11-nv12 interop

fixed issues with ocl nv12 cvt kernel

finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later)

an attempt to fix build issue

fix for non opencl build issue

fix typo

fix compilation warnings

fix compile issue for Mac (OpenCL)

add convertion from rgba to nv12 (still need to debug kernel)

remove empty line at the EOF

fixed compilation warning

9 years agoFixes compilation errors when BUILD_CUDA_STUBS is ON
Alex Torres [Tue, 28 Jul 2015 18:49:24 +0000 (15:49 -0300)]
Fixes compilation errors when BUILD_CUDA_STUBS is ON

9 years agoadded command line processing
Alexey Ershov [Wed, 29 Jul 2015 10:51:03 +0000 (13:51 +0300)]
added command line processing

9 years agofixed memory leaks
Alexey Ershov [Wed, 29 Jul 2015 08:07:11 +0000 (11:07 +0300)]
fixed memory leaks

9 years agotapi: datarace fixup for cvtColor
Alexander Alekhin [Tue, 28 Jul 2015 08:48:20 +0000 (11:48 +0300)]
tapi: datarace fixup for cvtColor

9 years agofixes
Alexander Alekhin [Mon, 27 Jul 2015 14:04:19 +0000 (17:04 +0300)]
fixes

9 years agoocl: add map tests
Alexander Alekhin [Mon, 27 Jul 2015 11:55:06 +0000 (14:55 +0300)]
ocl: add map tests

9 years agofix OpenCV code (bug 4006: #4862)
Alexander Alekhin [Fri, 24 Jul 2015 16:10:31 +0000 (19:10 +0300)]
fix OpenCV code (bug 4006: #4862)

9 years agoadd test for bug 4006: #4862
Vladimir Dudnik [Mon, 20 Jul 2015 12:22:23 +0000 (15:22 +0300)]
add test for bug 4006: #4862

9 years agoReplacing SSE with v_extract
sbokov [Mon, 27 Jul 2015 16:49:25 +0000 (19:49 +0300)]
Replacing SSE with v_extract

9 years agoMerge pull request #1 from Itseez/master
sbokov [Mon, 27 Jul 2015 15:39:58 +0000 (18:39 +0300)]
Merge pull request #1 from Itseez/master

Update

9 years agoMerge pull request #4213 from mshabunin:hal-vextq
Alexander Alekhin [Mon, 27 Jul 2015 15:08:29 +0000 (15:08 +0000)]
Merge pull request #4213 from mshabunin:hal-vextq

9 years agoMerge pull request #4210 from wangyan42164:ocl_umat_convert
Alexander Alekhin [Mon, 27 Jul 2015 15:05:57 +0000 (15:05 +0000)]
Merge pull request #4210 from wangyan42164:ocl_umat_convert

9 years agoMerge pull request #4232 from berak:patch-2
Maksim Shabunin [Mon, 27 Jul 2015 08:15:10 +0000 (08:15 +0000)]
Merge pull request #4232 from berak:patch-2

9 years agoUpdate ml.hpp
berak [Thu, 23 Jul 2015 16:38:18 +0000 (18:38 +0200)]
Update ml.hpp

misplaced CV_WRAP statement lead to not exposing EM::getCovs() to python/java/matlab wrappers

add a CV_OUT to return the covs properly

9 years agoMerge pull request #4179 from sbokov:improvingStereoSGBM
Maksim Shabunin [Fri, 24 Jul 2015 21:12:56 +0000 (21:12 +0000)]
Merge pull request #4179 from sbokov:improvingStereoSGBM

9 years agoMerge pull request #4196 from alalek:fix_python
Maksim Shabunin [Fri, 24 Jul 2015 11:43:00 +0000 (11:43 +0000)]
Merge pull request #4196 from alalek:fix_python

9 years agov_extract universal intrinsic
Maksim Shabunin [Tue, 21 Jul 2015 14:23:58 +0000 (17:23 +0300)]
v_extract universal intrinsic

9 years agoFixing StereoSGBM ROI
sbokov [Fri, 17 Jul 2015 14:12:01 +0000 (17:12 +0300)]
Fixing StereoSGBM ROI

Now StereoSGBM behaves similarly to StereoBM in terms of ROI handling.

9 years agoAdding new HAL-accelerated MODE_SGBM_3WAY
sbokov [Tue, 7 Jul 2015 20:23:51 +0000 (23:23 +0300)]
Adding new HAL-accelerated MODE_SGBM_3WAY

New mode is approximately 2-3 times faster than MODE_SGBM
with minimal degradation in quality and uses universal
HAL intrinsics. A performance test was added. The accuracy
test was updated to support the new mode.

9 years agoMerge pull request #4222 from mshabunin:fix-android-warnings
Alexander Alekhin [Thu, 23 Jul 2015 12:38:14 +0000 (12:38 +0000)]
Merge pull request #4222 from mshabunin:fix-android-warnings

9 years agoIt is unnecessary to use fma() if no scaling.
Yan Wang [Tue, 21 Jul 2015 08:20:15 +0000 (16:20 +0800)]
It is unnecessary to use fma() if no scaling.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoFixed loop check
Maksim Shabunin [Wed, 22 Jul 2015 14:54:42 +0000 (17:54 +0300)]
Fixed loop check

9 years agoFixing GCC 4.9 warnings
Maksim Shabunin [Wed, 22 Jul 2015 13:12:31 +0000 (16:12 +0300)]
Fixing GCC 4.9 warnings

9 years agoMerge pull request #4183 from paroj:8point
Vadim Pisarevsky [Wed, 22 Jul 2015 11:01:23 +0000 (11:01 +0000)]
Merge pull request #4183 from paroj:8point

9 years agoMerge pull request #4217 from wangyan42164:ocl_pyrlk_mul
Vadim Pisarevsky [Wed, 22 Jul 2015 11:00:00 +0000 (11:00 +0000)]
Merge pull request #4217 from wangyan42164:ocl_pyrlk_mul

9 years agoMerge pull request #4215 from renatoGarcia:master
Vadim Pisarevsky [Wed, 22 Jul 2015 10:55:23 +0000 (10:55 +0000)]
Merge pull request #4215 from renatoGarcia:master

9 years agoMove coefficient (32.0f) to the end of every iteration.
Yan Wang [Wed, 22 Jul 2015 03:25:18 +0000 (11:25 +0800)]
Move coefficient (32.0f) to the end of every iteration.

It could reduce 7 multiplications every iteration.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoRemove an unneeded semicolon.
Renato Florentino Garcia [Tue, 21 Jul 2015 17:54:06 +0000 (14:54 -0300)]
Remove an unneeded semicolon.

9 years agoMerge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample
Alexander Alekhin [Tue, 21 Jul 2015 15:58:20 +0000 (15:58 +0000)]
Merge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample

9 years agoMerge pull request #4004 from paroj:camera-api
Alexander Alekhin [Tue, 21 Jul 2015 15:57:47 +0000 (15:57 +0000)]
Merge pull request #4004 from paroj:camera-api

9 years agoMerge pull request #4192 from avershov:opencl-opengl-buffer
Alexander Alekhin [Tue, 21 Jul 2015 14:10:00 +0000 (14:10 +0000)]
Merge pull request #4192 from avershov:opencl-opengl-buffer

9 years agoMerge pull request #4181 from themightyoarfish:findEssMatDocTypoFix
Vadim Pisarevsky [Tue, 21 Jul 2015 12:06:45 +0000 (12:06 +0000)]
Merge pull request #4181 from themightyoarfish:findEssMatDocTypoFix

9 years agoMerge pull request #4197 from themightyoarfish:projectPointsDocBugfix
Vadim Pisarevsky [Tue, 21 Jul 2015 11:56:46 +0000 (11:56 +0000)]
Merge pull request #4197 from themightyoarfish:projectPointsDocBugfix

9 years agoMerge pull request #4189 from vladimir-dudnik:update_dx_samples
Vadim Pisarevsky [Tue, 21 Jul 2015 11:55:21 +0000 (11:55 +0000)]
Merge pull request #4189 from vladimir-dudnik:update_dx_samples

9 years agoMerge pull request #4201 from sturkmen72:new_function_imread_reduced
Vadim Pisarevsky [Tue, 21 Jul 2015 11:49:51 +0000 (11:49 +0000)]
Merge pull request #4201 from sturkmen72:new_function_imread_reduced

9 years agoMerge pull request #4207 from alalek:fix_calib3d_test
Vadim Pisarevsky [Tue, 21 Jul 2015 11:48:14 +0000 (11:48 +0000)]
Merge pull request #4207 from alalek:fix_calib3d_test

9 years agoadded convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop...
Alexey Ershov [Mon, 6 Jul 2015 14:46:18 +0000 (17:46 +0300)]
added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment

rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively

opengl sample: added buffer support

tested and fixed buffer support on Windows

change glFlush() call to glFinish()

added UMat::release() call; fixed functions' names

adopted & implemented API suggestion(s) from Alexander

fixed unreachable code warning

added more info to the mapGLBuffer/unmapGLBuffer description

9 years agoMerge pull request #4195 from wangyan42164:ocl_pyrlk
Alexander Alekhin [Tue, 21 Jul 2015 09:25:11 +0000 (09:25 +0000)]
Merge pull request #4195 from wangyan42164:ocl_pyrlk

9 years agofix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov
Vladimir Dudnik [Mon, 20 Jul 2015 22:27:27 +0000 (01:27 +0300)]
fix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov

9 years agochanged output from fps to time (in msec). Notes for dx10 and dx11: the first measure...
Vladimir Dudnik [Mon, 20 Jul 2015 16:05:05 +0000 (19:05 +0300)]
changed output from fps to time (in msec). Notes for dx10 and dx11: the first measure is wrong (zero), the followiing are correct; measured time includes output text to surface.

9 years agoMerge pull request #4202 from PhilLab:patch-5
Alexander Alekhin [Mon, 20 Jul 2015 15:13:43 +0000 (15:13 +0000)]
Merge pull request #4202 from PhilLab:patch-5

9 years agoMerge pull request #4206 from sturkmen72:patch-2
Alexander Alekhin [Mon, 20 Jul 2015 15:13:17 +0000 (15:13 +0000)]
Merge pull request #4206 from sturkmen72:patch-2

9 years agocalib3d: normalize Rodrigues vector in perf test
Alexander Alekhin [Mon, 20 Jul 2015 14:05:25 +0000 (17:05 +0300)]
calib3d: normalize Rodrigues vector in perf test

9 years agoUpdate window_w32.cpp
Suleyman TURKMEN [Mon, 20 Jul 2015 13:35:00 +0000 (16:35 +0300)]
Update window_w32.cpp

9 years agoFixed buffer overflow in string handling
Philipp Hasper [Mon, 20 Jul 2015 07:00:24 +0000 (09:00 +0200)]
Fixed buffer overflow in string handling

pos should never exceed strlen, else the overflow check 'if (!len)' will wrongfully pass

9 years agoOptimize pyrlk.
Yan Wang [Fri, 17 Jul 2015 08:22:49 +0000 (16:22 +0800)]
Optimize pyrlk.

1. Remove uncessary index calculation.
2. Use mad/mad24 as possible.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agonew function imread_reduced()
Suleyman TURKMEN [Sat, 27 Jun 2015 14:18:51 +0000 (17:18 +0300)]
new function imread_reduced()

by this new function we can set libjpeg "scale_denom" parameter and load jpeg images scaled 1/2 - 1/4 - 1/8
other image formats resized after loading

9 years agoFixed documentation bug for projectPoints: Distortion coefficients cannot actually...
themightyoarfish [Fri, 17 Jul 2015 15:34:33 +0000 (17:34 +0200)]
Fixed documentation bug for projectPoints: Distortion coefficients cannot actually be NULL

9 years agofix python cross-compilation
Alexander Alekhin [Fri, 17 Jul 2015 11:42:42 +0000 (14:42 +0300)]
fix python cross-compilation

9 years agoMerge pull request #4190 from sbokov:fixingStereoBMissue
Maksim Shabunin [Wed, 15 Jul 2015 14:43:09 +0000 (14:43 +0000)]
Merge pull request #4190 from sbokov:fixingStereoBMissue

9 years agoMerge pull request #4193 from jklontz:master
Alexander Alekhin [Wed, 15 Jul 2015 10:12:07 +0000 (10:12 +0000)]
Merge pull request #4193 from jklontz:master

9 years agofixed conditional compilation of RGB2Gray<ushort> template specialization
Josh Klontz [Wed, 15 Jul 2015 00:56:43 +0000 (20:56 -0400)]
fixed conditional compilation of RGB2Gray<ushort> template specialization

9 years agoFixing possible invalid memory access in validateDisparity
sbokov [Mon, 13 Jul 2015 21:05:30 +0000 (00:05 +0300)]
Fixing possible invalid memory access in validateDisparity

9 years agoMerge pull request #4147 from alalek:fix_world_cyclic_deps
Maksim Shabunin [Tue, 14 Jul 2015 14:54:37 +0000 (14:54 +0000)]
Merge pull request #4147 from alalek:fix_world_cyclic_deps

9 years agoMerge pull request #4184 from alalek:fix_cmake_status
Alexander Alekhin [Tue, 14 Jul 2015 10:32:06 +0000 (10:32 +0000)]
Merge pull request #4184 from alalek:fix_cmake_status

9 years agocompute fps changed (now only interop counts). fixed d3d10 and d3d11 print info metho...
Vladimir Dudnik [Mon, 13 Jul 2015 20:40:45 +0000 (23:40 +0300)]
compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping)

9 years agosimplify 8point algorithm using Matx classes
Pavel Rojtberg [Thu, 9 Jul 2015 13:02:25 +0000 (15:02 +0200)]
simplify 8point algorithm using Matx classes

9 years agoMerge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_fla...
Alexander Alekhin [Mon, 13 Jul 2015 11:39:51 +0000 (11:39 +0000)]
Merge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_flag_polarity

9 years agoFixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of...
ultrafro [Sun, 12 Jul 2015 22:28:23 +0000 (18:28 -0400)]
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class

9 years agofix wrong usage of status(), remove useless message in videoio
Alexander Alekhin [Fri, 10 Jul 2015 16:18:07 +0000 (19:18 +0300)]
fix wrong usage of status(), remove useless message in videoio

9 years agoMerge pull request #4182 from vladimir-dudnik:update_dx_samples
Alexander Alekhin [Fri, 10 Jul 2015 14:30:03 +0000 (14:30 +0000)]
Merge pull request #4182 from vladimir-dudnik:update_dx_samples

9 years agoFixed typo in doc for findEssentialMat
themightyoarfish [Fri, 10 Jul 2015 10:45:45 +0000 (12:45 +0200)]
Fixed typo in doc for findEssentialMat

9 years agosimplified sample's interface (remove odd "no processing" branch, add print to screen...
Vladimir Dudnik [Thu, 9 Jul 2015 19:41:05 +0000 (22:41 +0300)]
simplified sample's interface (remove odd "no processing" branch, add print to screen for processing mode)

9 years agoMerge pull request #4169 from alalek:issue_4457
Alexander Alekhin [Wed, 8 Jul 2015 14:30:41 +0000 (14:30 +0000)]
Merge pull request #4169 from alalek:issue_4457

9 years agoworkaround issue with MatExpr
Alexander Alekhin [Thu, 2 Jul 2015 14:44:32 +0000 (17:44 +0300)]
workaround issue with MatExpr

9 years agoissue 4457
Alexander Alekhin [Thu, 2 Jul 2015 12:10:12 +0000 (15:10 +0300)]
issue 4457

9 years agoMerge pull request #4154 from alalek:ffmpeg_update_via_binary_repo
Vadim Pisarevsky [Wed, 8 Jul 2015 12:23:13 +0000 (12:23 +0000)]
Merge pull request #4154 from alalek:ffmpeg_update_via_binary_repo

9 years agouse simplified API selection logic in cvCreateCameraCapture as well
Pavel Rojtberg [Fri, 26 Jun 2015 10:18:11 +0000 (12:18 +0200)]
use simplified API selection logic in cvCreateCameraCapture as well

9 years agodeny any other interfaces if someone is specified as preference
Pavel Rojtberg [Fri, 26 Jun 2015 10:04:56 +0000 (12:04 +0200)]
deny any other interfaces if someone is specified as preference

it provides more expectable results to end-users.
based on feedback by Alexander Alekhin

9 years agoallow specifying apiPreference in VideoCapture when opening a file. Add
Pavel Rojtberg [Tue, 12 May 2015 15:43:28 +0000 (17:43 +0200)]
allow specifying apiPreference in VideoCapture when opening a file. Add
a separate function instead of an overload not to change the ABI.

rename VideoCapture paramter 'device' to 'index' in CPP to reflect that
it allows specifying the API.
update comments to explain how to specify the API.

9 years agoMerge pull request #4171 from jet47:install-cudev-test
Vadim Pisarevsky [Wed, 8 Jul 2015 10:10:17 +0000 (10:10 +0000)]
Merge pull request #4171 from jet47:install-cudev-test

9 years agoMerge pull request #4174 from yangj1e:fix_svm_trainauto
Vadim Pisarevsky [Wed, 8 Jul 2015 10:04:40 +0000 (10:04 +0000)]
Merge pull request #4174 from yangj1e:fix_svm_trainauto

9 years agoMerge pull request #4158 from alalek:fix-bigdata-copyto
Vadim Pisarevsky [Wed, 8 Jul 2015 10:00:46 +0000 (10:00 +0000)]
Merge pull request #4158 from alalek:fix-bigdata-copyto