platform/upstream/opencv.git
9 years agoImprove the performance of fast_nlmeans_denoising_opencl.
Yan Wang [Wed, 12 Nov 2014 10:47:48 +0000 (18:47 +0800)]
Improve the performance of fast_nlmeans_denoising_opencl.

1. Remove unnecessary barriers.
2. Adjust CTA_SIZE based on the following cases for Intel platform:
   a) OCL_Photo_DenoisingGrayscale.DenoisingGrayscale
   b) OCL_Photo_DenoisingColored.DenoisingColored

9 years agoMerge pull request #3410 from mgharbi:master
Vadim Pisarevsky [Wed, 12 Nov 2014 08:49:50 +0000 (08:49 +0000)]
Merge pull request #3410 from mgharbi:master

9 years agoFix Cuda -Wl linker options
Michae Gharbi [Tue, 11 Nov 2014 17:12:28 +0000 (12:12 -0500)]
Fix Cuda -Wl linker options

This line causes the following error when building custom projects that use OpenCV beta 3:
ld: warning: directory not found for option '-L/<project_root>/-Wl,/usr/local/cuda'

9 years agoMerge pull request #3408 from ilya-lavrenov:doc_fix
Vadim Pisarevsky [Tue, 11 Nov 2014 13:29:46 +0000 (13:29 +0000)]
Merge pull request #3408 from ilya-lavrenov:doc_fix

9 years agofixed doc
Ilya Lavrenov [Mon, 10 Nov 2014 13:19:27 +0000 (16:19 +0300)]
fixed doc

9 years agoMerge tag '3.0.0-beta'
Alexander Alekhin [Mon, 10 Nov 2014 11:42:47 +0000 (14:42 +0300)]
Merge tag '3.0.0-beta'

OpenCV 3.0.0 Beta

9 years agoMerge pull request #3405 from D-Alex:master
Vadim Pisarevsky [Mon, 10 Nov 2014 08:19:29 +0000 (08:19 +0000)]
Merge pull request #3405 from D-Alex:master

9 years agoMerge pull request #3404 from alalek:openni2_patch
Vadim Pisarevsky [Mon, 10 Nov 2014 08:09:45 +0000 (08:09 +0000)]
Merge pull request #3404 from alalek:openni2_patch

9 years agosolvePnPRansac: fix mask generation
Alexander Duda [Sun, 9 Nov 2014 22:10:43 +0000 (23:10 +0100)]
solvePnPRansac: fix mask generation

9 years agoPnPRansacCallback::computeError: fix count in case of Nx3 matrices
Alexander Duda [Sun, 9 Nov 2014 22:08:47 +0000 (23:08 +0100)]
PnPRansacCallback::computeError: fix count in case of Nx3 matrices

9 years agoopenni_capture sample: enable OpenNI2 if available
Alexander Alekhin [Fri, 7 Nov 2014 23:22:17 +0000 (02:22 +0300)]
openni_capture sample: enable OpenNI2 if available

Sample works with OpenNI2 with minimal code changes (CAP_OPENNI -> CAP_OPENNI2)

9 years agoOpenNI2: prevent failure of setVideoMode() call with invalid parameters
Alexander Alekhin [Fri, 7 Nov 2014 23:21:59 +0000 (02:21 +0300)]
OpenNI2: prevent failure of setVideoMode() call with invalid parameters

Not all parameters are specified for openni::VideoMode, so
"selected" mode can be unsupported for device.
Replace default VideoMode constructor to result of getVideoMode() call.

9 years agoSet status to beta
Alexander Alekhin [Fri, 7 Nov 2014 16:22:46 +0000 (19:22 +0300)]
Set status to beta

9 years agoMerge pull request #3403 from vpisarev:moved_partition
Vadim Pisarevsky [Fri, 7 Nov 2014 16:04:56 +0000 (16:04 +0000)]
Merge pull request #3403 from vpisarev:moved_partition

9 years agomoved cv::partition from private.hpp to operations.hpp, to expose the function to...
Vadim Pisarevsky [Fri, 7 Nov 2014 15:14:39 +0000 (18:14 +0300)]
moved cv::partition from private.hpp to operations.hpp, to expose the function to users

9 years agoMerge pull request #3402 from vpisarev:fixed_python_tests
Vadim Pisarevsky [Fri, 7 Nov 2014 14:34:14 +0000 (14:34 +0000)]
Merge pull request #3402 from vpisarev:fixed_python_tests

9 years agofixed path to the checkerboard image
Vadim Pisarevsky [Fri, 7 Nov 2014 12:57:42 +0000 (15:57 +0300)]
fixed path to the checkerboard image

9 years agoMerge pull request #3400 from vpisarev:fixed_umat_test_crash
Vadim Pisarevsky [Fri, 7 Nov 2014 12:50:26 +0000 (12:50 +0000)]
Merge pull request #3400 from vpisarev:fixed_umat_test_crash

9 years agoMerge pull request #3394 from akarsakov:ocl_canny
Alexander Alekhin [Fri, 7 Nov 2014 12:42:24 +0000 (12:42 +0000)]
Merge pull request #3394 from akarsakov:ocl_canny

9 years agoMerge pull request #3357 from briansp2020:master
Vadim Pisarevsky [Fri, 7 Nov 2014 12:02:53 +0000 (12:02 +0000)]
Merge pull request #3357 from briansp2020:master

9 years agoMerge pull request #3392 from wangyan42164:houghlines_bug_fix
Vadim Pisarevsky [Fri, 7 Nov 2014 11:52:58 +0000 (11:52 +0000)]
Merge pull request #3392 from wangyan42164:houghlines_bug_fix

9 years agoMerge pull request #3397 from ElenaGvozdeva:ocl_WarpAffine_test
Vadim Pisarevsky [Fri, 7 Nov 2014 11:52:35 +0000 (11:52 +0000)]
Merge pull request #3397 from ElenaGvozdeva:ocl_WarpAffine_test

9 years agofixed my_umat(roi).clone() test by disabling poorly aligned ROI's. Real fix of the...
Vadim Pisarevsky [Fri, 7 Nov 2014 11:49:48 +0000 (14:49 +0300)]
fixed my_umat(roi).clone() test by disabling poorly aligned ROI's. Real fix of the problem will require a separate branch in UMat::copyTo().

9 years agoFix HoughLines crashes (Bug #3959).
Yan Wang [Thu, 6 Nov 2014 04:46:04 +0000 (12:46 +0800)]
Fix HoughLines crashes (Bug #3959).

Avoid phi exceed PI/2 to get the negative value of cos(phi).

9 years agoCorrectly unrolled some cycles
Alexander Karsakov [Fri, 7 Nov 2014 08:19:34 +0000 (11:19 +0300)]
Correctly unrolled some cycles

9 years agoMerge pull request #3138 from alalek:icv_update
Alexander Alekhin [Thu, 6 Nov 2014 15:58:14 +0000 (15:58 +0000)]
Merge pull request #3138 from alalek:icv_update

9 years agoMerge pull request #3396 from akarsakov:ocl_pow_fix
Alexander Alekhin [Thu, 6 Nov 2014 15:49:42 +0000 (15:49 +0000)]
Merge pull request #3396 from akarsakov:ocl_pow_fix

9 years agofixed test for ocl WarpAffine
ElenaGvozdeva [Wed, 5 Nov 2014 13:28:43 +0000 (16:28 +0300)]
fixed test for ocl WarpAffine

9 years agoRemoved incorrect using of rootn() and powr() in ocl_pow
Alexander Karsakov [Thu, 6 Nov 2014 13:23:02 +0000 (16:23 +0300)]
Removed incorrect using of rootn() and powr() in ocl_pow

9 years agoMinor optimization for ocl_canny
Alexander Karsakov [Thu, 6 Nov 2014 10:07:33 +0000 (13:07 +0300)]
Minor optimization for ocl_canny

9 years agoMerge pull request #3372 from pokeefe:add-test-for-projection-decomposition
Vadim Pisarevsky [Thu, 6 Nov 2014 08:40:35 +0000 (08:40 +0000)]
Merge pull request #3372 from pokeefe:add-test-for-projection-decomposition

9 years agoMerge pull request #3391 from alalek:ocl_failure_messages
Vadim Pisarevsky [Thu, 6 Nov 2014 08:37:34 +0000 (08:37 +0000)]
Merge pull request #3391 from alalek:ocl_failure_messages

9 years agoMerge pull request #3360 from mirab:threshold_triangle
Vadim Pisarevsky [Thu, 6 Nov 2014 08:36:23 +0000 (08:36 +0000)]
Merge pull request #3360 from mirab:threshold_triangle

9 years agoremove the unnecessary header file
Brian Park [Thu, 6 Nov 2014 04:12:18 +0000 (20:12 -0800)]
remove the unnecessary header file

9 years agoocl: change processing of OpenCL failures
Alexander Alekhin [Wed, 5 Nov 2014 15:41:39 +0000 (18:41 +0300)]
ocl: change processing of OpenCL failures

disable "unwanted" messages

9 years agoMake Otsu and Triangle algorithms mutually exclusive
Miroslav Benes [Wed, 5 Nov 2014 15:04:26 +0000 (16:04 +0100)]
Make Otsu and Triangle algorithms mutually exclusive

Make Otsu and Triangle algorithms mutually exclusive in cv::threshold code.

Signed-off-by: Miroslav Benes <mbenes@suse.cz>
9 years agoMerge pull request #3389 from blackibiza84:master
Vadim Pisarevsky [Wed, 5 Nov 2014 14:58:27 +0000 (14:58 +0000)]
Merge pull request #3389 from blackibiza84:master

9 years agoMerge pull request #3217 from avdmitry:samples_cpp_data
Vadim Pisarevsky [Wed, 5 Nov 2014 14:57:45 +0000 (14:57 +0000)]
Merge pull request #3217 from avdmitry:samples_cpp_data

9 years agoMerge pull request #3377 from jlblancoc:master
Vadim Pisarevsky [Wed, 5 Nov 2014 14:56:22 +0000 (14:56 +0000)]
Merge pull request #3377 from jlblancoc:master

9 years agoMerge pull request #3387 from YusukeSuzuki:cap_v4l_rgb24fix
Vadim Pisarevsky [Wed, 5 Nov 2014 11:42:51 +0000 (11:42 +0000)]
Merge pull request #3387 from YusukeSuzuki:cap_v4l_rgb24fix

9 years agoMerge pull request #3390 from vbystricky:fix_houghlines
Vadim Pisarevsky [Wed, 5 Nov 2014 11:41:12 +0000 (11:41 +0000)]
Merge pull request #3390 from vbystricky:fix_houghlines

9 years agoMerge pull request #3384 from ilya-lavrenov:neon_new
Vadim Pisarevsky [Wed, 5 Nov 2014 11:26:52 +0000 (11:26 +0000)]
Merge pull request #3384 from ilya-lavrenov:neon_new

9 years agoMerge pull request #3373 from berak:patch-2
Vadim Pisarevsky [Wed, 5 Nov 2014 11:14:59 +0000 (11:14 +0000)]
Merge pull request #3373 from berak:patch-2

9 years agoMerge pull request #3388 from bartaandras:master
Vadim Pisarevsky [Wed, 5 Nov 2014 11:04:06 +0000 (11:04 +0000)]
Merge pull request #3388 from bartaandras:master

9 years agoUpdated test_features2d.cpp with latest API change
Michele Adduci [Wed, 5 Nov 2014 11:03:28 +0000 (12:03 +0100)]
Updated test_features2d.cpp with latest API change

9 years agoUpdated ORB test with parameters
Michele Adduci [Wed, 5 Nov 2014 11:00:31 +0000 (12:00 +0100)]
Updated ORB test with parameters

9 years agoMerge pull request #3315 from abak:seamless-refactor
Vadim Pisarevsky [Wed, 5 Nov 2014 10:41:32 +0000 (10:41 +0000)]
Merge pull request #3315 from abak:seamless-refactor

9 years agoFix OpenCL version of HoughLinesP function
vbystricky [Wed, 5 Nov 2014 10:31:06 +0000 (14:31 +0400)]
Fix OpenCL version of HoughLinesP function

9 years agoIPPICV: disable boxFilter 16SC1/16UC1 (performance)
Alexander Alekhin [Thu, 30 Oct 2014 11:53:22 +0000 (14:53 +0300)]
IPPICV: disable boxFilter 16SC1/16UC1 (performance)

9 years agoIPPICV: disable NormDiff_L1_16s_C1R for IPP/ICV 8.2/8.2.1
Alexander Alekhin [Thu, 30 Oct 2014 09:42:27 +0000 (12:42 +0300)]
IPPICV: disable NormDiff_L1_16s_C1R for IPP/ICV 8.2/8.2.1

9 years agoupdate IPPICV package
Alexander Alekhin [Wed, 20 Aug 2014 08:54:39 +0000 (12:54 +0400)]
update IPPICV package

9 years agoFix cudafeatures2d and cudastereo with new 3.0 APIs for ORB and StereoBM
Michele Adduci [Wed, 5 Nov 2014 09:42:02 +0000 (10:42 +0100)]
Fix cudafeatures2d and cudastereo with new 3.0 APIs for ORB and StereoBM

9 years agoFixed calc_output_scale with NO_OUTPUT_SCALE flag set.
bartaandras [Tue, 4 Nov 2014 10:35:45 +0000 (11:35 +0100)]
Fixed calc_output_scale with NO_OUTPUT_SCALE flag set.

9 years agoadd V4L2_PIX_FMT_RGB24 convert code
Yusuke Suzuki [Mon, 3 Nov 2014 08:48:10 +0000 (17:48 +0900)]
add V4L2_PIX_FMT_RGB24 convert code

9 years agocheck input paramter by checking the image size
Brian Park [Tue, 4 Nov 2014 05:38:15 +0000 (21:38 -0800)]
check input paramter by checking the image size

9 years agosupport older gcc versions
berak [Sun, 2 Nov 2014 07:16:29 +0000 (08:16 +0100)]
support older gcc versions

9 years agocv::convertMaps
Ilya Lavrenov [Sun, 12 Oct 2014 20:37:59 +0000 (13:37 -0700)]
cv::convertMaps

9 years agoremoved saturation from pyramids
Ilya Lavrenov [Sun, 12 Oct 2014 20:13:24 +0000 (13:13 -0700)]
removed saturation from pyramids

9 years agofixes for cv::warpAffine
Ilya Lavrenov [Sun, 12 Oct 2014 20:05:30 +0000 (13:05 -0700)]
fixes for cv::warpAffine

9 years agofixes in VResizeLinearVec_32s8u
Ilya Lavrenov [Sun, 12 Oct 2014 19:40:41 +0000 (12:40 -0700)]
fixes in VResizeLinearVec_32s8u

9 years agocv::resize (INTER_LANCZOS4)
Ilya Lavrenov [Sun, 12 Oct 2014 18:47:50 +0000 (11:47 -0700)]
cv::resize (INTER_LANCZOS4)

9 years agocv::resize (INTER_AREA CV_16S, CV_32F)
Ilya Lavrenov [Sun, 12 Oct 2014 17:45:46 +0000 (10:45 -0700)]
cv::resize (INTER_AREA CV_16S, CV_32F)

9 years agocv::compareHist (CV_COMP_INTERSECT)
Ilya Lavrenov [Sun, 12 Oct 2014 17:16:59 +0000 (10:16 -0700)]
cv::compareHist (CV_COMP_INTERSECT)

9 years agocv::pow (integer power)
Ilya Lavrenov [Sun, 12 Oct 2014 15:31:25 +0000 (08:31 -0700)]
cv::pow (integer power)

9 years agocv::polarToCart
Ilya Lavrenov [Sun, 12 Oct 2014 11:54:27 +0000 (04:54 -0700)]
cv::polarToCart

9 years agocv::magnitude; cv::corner**
Ilya Lavrenov [Sun, 12 Oct 2014 10:43:06 +0000 (03:43 -0700)]
cv::magnitude; cv::corner**

9 years agocv::phase; cv::cartToPolar
Ilya Lavrenov [Sun, 12 Oct 2014 10:04:03 +0000 (03:04 -0700)]
cv::phase; cv::cartToPolar

9 years agocv::pyrUp
Ilya Lavrenov [Sat, 11 Oct 2014 10:38:42 +0000 (03:38 -0700)]
cv::pyrUp

9 years agocv::warpAffine
Ilya Lavrenov [Sat, 11 Oct 2014 09:34:04 +0000 (02:34 -0700)]
cv::warpAffine

9 years agoVResizeLinearVec_32s8u
Ilya Lavrenov [Sat, 11 Oct 2014 08:51:20 +0000 (01:51 -0700)]
VResizeLinearVec_32s8u

9 years agoMerge pull request #3343 from mshabunin:doxygen-docs
Vadim Pisarevsky [Thu, 30 Oct 2014 10:45:02 +0000 (10:45 +0000)]
Merge pull request #3343 from mshabunin:doxygen-docs

9 years agoMerge pull request #3361 from mshabunin:fix-drawing
Vadim Pisarevsky [Thu, 30 Oct 2014 10:44:21 +0000 (10:44 +0000)]
Merge pull request #3361 from mshabunin:fix-drawing

9 years agoMerge remote-tracking branch 'upstream/master'
Brian Park [Thu, 30 Oct 2014 06:15:22 +0000 (23:15 -0700)]
Merge remote-tracking branch 'upstream/master'

9 years agoMerge pull request #3318 from akarsakov:ocl_cvtcolor
Alexander Alekhin [Wed, 29 Oct 2014 14:25:09 +0000 (14:25 +0000)]
Merge pull request #3318 from akarsakov:ocl_cvtcolor

9 years agoMerge pull request #3354 from vbystricky:oclopt_convertScaleAbs
Alexander Alekhin [Wed, 29 Oct 2014 13:53:56 +0000 (13:53 +0000)]
Merge pull request #3354 from vbystricky:oclopt_convertScaleAbs

9 years agoMerge pull request #3159 from ElenaGvozdeva:ocl_gemm
Alexander Alekhin [Wed, 29 Oct 2014 11:18:06 +0000 (11:18 +0000)]
Merge pull request #3159 from ElenaGvozdeva:ocl_gemm

9 years agoMerge pull request #3379 from akarsakov:gftt_empty_src
Alexander Alekhin [Tue, 28 Oct 2014 17:19:57 +0000 (17:19 +0000)]
Merge pull request #3379 from akarsakov:gftt_empty_src

9 years agoDon't process empty src image in GFTT
Alexander Karsakov [Tue, 28 Oct 2014 13:06:36 +0000 (16:06 +0300)]
Don't process empty src image in GFTT

9 years agouse LOCAL_SIZE+1
ElenaGvozdeva [Tue, 28 Oct 2014 12:18:31 +0000 (15:18 +0300)]
use LOCAL_SIZE+1

9 years agoAdded optimized loading to YUV2RGB_422 kernel
Alexander Karsakov [Tue, 28 Oct 2014 12:07:51 +0000 (15:07 +0300)]
Added optimized loading to YUV2RGB_422 kernel

9 years agoMerge pull request #3353 from Chuanbo-Weng:master
Alexander Alekhin [Tue, 28 Oct 2014 10:23:18 +0000 (10:23 +0000)]
Merge pull request #3353 from Chuanbo-Weng:master

9 years agoMerge pull request #3359 from akarsakov:ocl_buildMaps
Alexander Alekhin [Tue, 28 Oct 2014 09:18:31 +0000 (09:18 +0000)]
Merge pull request #3359 from akarsakov:ocl_buildMaps

9 years agoOpenCVConfig.cmake: Fix CMake CMP0012 warning
Jose-Luis Blanco-Claraco [Tue, 28 Oct 2014 08:46:18 +0000 (09:46 +0100)]
OpenCVConfig.cmake: Fix CMake CMP0012 warning

"TRUE"/"FALSE" should not be used as literals, as CMake has to decide
whether they are literals or variable names (sigh).
This patch should make it work with any version of CMake and with any
user-side decision on old vs. new policy behavior.

9 years agoAdded loading 4 pixels in line instead of 2 to RGB[A] -> YUV(420) kernel
Alexander Karsakov [Mon, 27 Oct 2014 11:52:17 +0000 (14:52 +0300)]
Added loading 4 pixels in line instead of 2 to RGB[A] -> YUV(420) kernel

9 years agoAdded checking that z is non zero to buildWarpPlaneMaps kernel
Alexander Karsakov [Mon, 27 Oct 2014 12:38:44 +0000 (15:38 +0300)]
Added checking that z is non zero to buildWarpPlaneMaps kernel

9 years agoOverload PlaneWarper::buildMaps method from base class
Alexander Karsakov [Fri, 24 Oct 2014 08:03:10 +0000 (11:03 +0300)]
Overload PlaneWarper::buildMaps method from base class

9 years agoSome small fixes
ElenaGvozdeva [Thu, 16 Oct 2014 07:24:44 +0000 (10:24 +0300)]
Some small fixes

9 years agouse vectors
Elena Gvozdeva [Thu, 4 Sep 2014 08:36:23 +0000 (12:36 +0400)]
use vectors

9 years agouse local memory
Elena Gvozdeva [Wed, 27 Aug 2014 10:58:01 +0000 (14:58 +0400)]
use local memory

9 years agonaive implementation
Elena Gvozdeva [Fri, 22 Aug 2014 11:05:29 +0000 (15:05 +0400)]
naive implementation

9 years agoMerge pull request #3369 from vbystricky:fix_scaleAdd
Alexander Alekhin [Mon, 27 Oct 2014 10:03:29 +0000 (10:03 +0000)]
Merge pull request #3369 from vbystricky:fix_scaleAdd

9 years agoAdd test for calib3d function decomposeProjectionMatrix(...)
Pat O'Keefe [Sun, 26 Oct 2014 01:11:02 +0000 (19:11 -0600)]
Add test for calib3d function decomposeProjectionMatrix(...)

9 years agoMerge pull request #3367 from akarsakov:ocl_image2d
Alexander Alekhin [Fri, 24 Oct 2014 16:01:21 +0000 (16:01 +0000)]
Merge pull request #3367 from akarsakov:ocl_image2d

9 years agoMerge pull request #3342 from alalek:perf_stability_check
Alexander Alekhin [Fri, 24 Oct 2014 16:00:20 +0000 (16:00 +0000)]
Merge pull request #3342 from alalek:perf_stability_check

9 years agoMove _dst.create() to the begining of scaleAdd function
vbystricky [Fri, 24 Oct 2014 10:05:39 +0000 (14:05 +0400)]
Move _dst.create() to the begining of scaleAdd function

9 years agoMerge pull request #3284 from vbystricky:oclopt_stereoBM
Alexander Alekhin [Fri, 24 Oct 2014 12:59:13 +0000 (12:59 +0000)]
Merge pull request #3284 from vbystricky:oclopt_stereoBM

9 years agoMerge pull request #3368 from alalek:amd_clfinish
Alexander Alekhin [Fri, 24 Oct 2014 12:58:21 +0000 (12:58 +0000)]
Merge pull request #3368 from alalek:amd_clfinish

9 years agoAdded extra checks to ocl::Image2D
Alexander Karsakov [Fri, 24 Oct 2014 10:55:16 +0000 (13:55 +0300)]
Added extra checks to ocl::Image2D

9 years agoocl: restore clFinish() in unmap() for AMD devices
Alexander Alekhin [Fri, 24 Oct 2014 10:29:38 +0000 (14:29 +0400)]
ocl: restore clFinish() in unmap() for AMD devices

This reverts commit 7d91b8efcd053304e5b0fb5afff06e151b2d4096.

9 years agoDisabled videoio_video_prop_fps test
Maksim Shabunin [Thu, 23 Oct 2014 14:43:24 +0000 (18:43 +0400)]
Disabled videoio_video_prop_fps test

This test does not return correct values with some software configurations.
Possible problem with ffmpeg on buildbot's linux-slave.