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
Alexander Alekhin [Tue, 21 Jul 2015 15:57:47 +0000 (15:57 +0000)]
Merge pull request #4004 from paroj:camera-api
Alexander Alekhin [Tue, 21 Jul 2015 14:10:00 +0000 (14:10 +0000)]
Merge pull request #4192 from avershov:opencl-opengl-buffer
Vadim Pisarevsky [Tue, 21 Jul 2015 12:06:45 +0000 (12:06 +0000)]
Merge pull request #4181 from themightyoarfish:findEssMatDocTypoFix
Vadim Pisarevsky [Tue, 21 Jul 2015 11:56:46 +0000 (11:56 +0000)]
Merge pull request #4197 from themightyoarfish:projectPointsDocBugfix
Vadim Pisarevsky [Tue, 21 Jul 2015 11:55:21 +0000 (11:55 +0000)]
Merge pull request #4189 from vladimir-dudnik:update_dx_samples
Vadim Pisarevsky [Tue, 21 Jul 2015 11:49:51 +0000 (11:49 +0000)]
Merge pull request #4201 from sturkmen72:new_function_imread_reduced
Vadim Pisarevsky [Tue, 21 Jul 2015 11:48:14 +0000 (11:48 +0000)]
Merge pull request #4207 from alalek:fix_calib3d_test
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
Alexander Alekhin [Tue, 21 Jul 2015 09:25:11 +0000 (09:25 +0000)]
Merge pull request #4195 from wangyan42164:ocl_pyrlk
Vladimir Dudnik [Mon, 20 Jul 2015 22:27:27 +0000 (01:27 +0300)]
fix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov
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.
Alexander Alekhin [Mon, 20 Jul 2015 15:13:43 +0000 (15:13 +0000)]
Merge pull request #4202 from PhilLab:patch-5
Alexander Alekhin [Mon, 20 Jul 2015 15:13:17 +0000 (15:13 +0000)]
Merge pull request #4206 from sturkmen72:patch-2
Alexander Alekhin [Mon, 20 Jul 2015 14:05:25 +0000 (17:05 +0300)]
calib3d: normalize Rodrigues vector in perf test
Suleyman TURKMEN [Mon, 20 Jul 2015 13:35:00 +0000 (16:35 +0300)]
Update window_w32.cpp
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
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>
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
themightyoarfish [Fri, 17 Jul 2015 15:34:33 +0000 (17:34 +0200)]
Fixed documentation bug for projectPoints: Distortion coefficients cannot actually be NULL
Maksim Shabunin [Wed, 15 Jul 2015 14:43:09 +0000 (14:43 +0000)]
Merge pull request #4190 from sbokov:fixingStereoBMissue
Alexander Alekhin [Wed, 15 Jul 2015 10:12:07 +0000 (10:12 +0000)]
Merge pull request #4193 from jklontz:master
Josh Klontz [Wed, 15 Jul 2015 00:56:43 +0000 (20:56 -0400)]
fixed conditional compilation of RGB2Gray<ushort> template specialization
sbokov [Mon, 13 Jul 2015 21:05:30 +0000 (00:05 +0300)]
Fixing possible invalid memory access in validateDisparity
Maksim Shabunin [Tue, 14 Jul 2015 14:54:37 +0000 (14:54 +0000)]
Merge pull request #4147 from alalek:fix_world_cyclic_deps
Alexander Alekhin [Tue, 14 Jul 2015 10:32:06 +0000 (10:32 +0000)]
Merge pull request #4184 from alalek:fix_cmake_status
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)
Alexander Alekhin [Mon, 13 Jul 2015 11:39:51 +0000 (11:39 +0000)]
Merge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_flag_polarity
ultrafro [Sun, 12 Jul 2015 22:28:23 +0000 (18:28 -0400)]
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class
Alexander Alekhin [Fri, 10 Jul 2015 16:18:07 +0000 (19:18 +0300)]
fix wrong usage of status(), remove useless message in videoio
Alexander Alekhin [Fri, 10 Jul 2015 14:30:03 +0000 (14:30 +0000)]
Merge pull request #4182 from vladimir-dudnik:update_dx_samples
themightyoarfish [Fri, 10 Jul 2015 10:45:45 +0000 (12:45 +0200)]
Fixed typo in doc for findEssentialMat
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)
Alexander Alekhin [Wed, 8 Jul 2015 14:30:41 +0000 (14:30 +0000)]
Merge pull request #4169 from alalek:issue_4457
Alexander Alekhin [Thu, 2 Jul 2015 14:44:32 +0000 (17:44 +0300)]
workaround issue with MatExpr
Alexander Alekhin [Thu, 2 Jul 2015 12:10:12 +0000 (15:10 +0300)]
issue 4457
Vadim Pisarevsky [Wed, 8 Jul 2015 12:23:13 +0000 (12:23 +0000)]
Merge pull request #4154 from alalek:ffmpeg_update_via_binary_repo
Pavel Rojtberg [Fri, 26 Jun 2015 10:18:11 +0000 (12:18 +0200)]
use simplified API selection logic in cvCreateCameraCapture as well
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
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.
Vadim Pisarevsky [Wed, 8 Jul 2015 10:10:17 +0000 (10:10 +0000)]
Merge pull request #4171 from jet47:install-cudev-test
Vadim Pisarevsky [Wed, 8 Jul 2015 10:04:40 +0000 (10:04 +0000)]
Merge pull request #4174 from yangj1e:fix_svm_trainauto
Vadim Pisarevsky [Wed, 8 Jul 2015 10:00:46 +0000 (10:00 +0000)]
Merge pull request #4158 from alalek:fix-bigdata-copyto
Vadim Pisarevsky [Wed, 8 Jul 2015 09:19:01 +0000 (09:19 +0000)]
Merge pull request #4173 from kalistratovag:mjpeg_encoder_coverity_warnings
Alexander Alekhin [Mon, 6 Jul 2015 13:22:57 +0000 (13:22 +0000)]
Merge pull request #4159 from alalek:vector_processing
Vadim Pisarevsky [Mon, 6 Jul 2015 12:57:01 +0000 (12:57 +0000)]
Merge pull request #4172 from alalek:ocl_minmaxloc_unaligned
Alexander Alekhin [Fri, 3 Jul 2015 17:05:00 +0000 (20:05 +0300)]
ocl: fix unaligned memory access
http://code.opencv.org/issues/4462
kalistratovag [Fri, 3 Jul 2015 17:11:58 +0000 (20:11 +0300)]
Removing deadcode blocks, redudant variable & initializing all vars in constructor
Adding &31 to bit shift in order to silince coverity BAD_SHIFT defect
add default_stripes_count const
Jie Yang [Sun, 5 Jul 2015 13:22:10 +0000 (22:52 +0930)]
Fix SVM::trainAuto (Bug #4464)
Fix SVM::trainAuto (Bug #4464)
Alexander Alekhin [Fri, 5 Jun 2015 09:39:56 +0000 (12:39 +0300)]
update ffmpeg wrapper binaries
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.
FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
Vladislav Vinogradov [Fri, 3 Jul 2015 10:33:36 +0000 (13:33 +0300)]
add opencv_test_cudev to installation package
Alexander Alekhin [Thu, 2 Jul 2015 11:31:15 +0000 (11:31 +0000)]
Merge pull request #4168 from Dikay900:export_threadcontrol
Alexander Alekhin [Thu, 2 Jul 2015 11:24:10 +0000 (11:24 +0000)]
Merge pull request #4127 from avershov:opengl-opencl-sample
Alexander Alekhin [Wed, 1 Jul 2015 17:08:36 +0000 (20:08 +0300)]
fix copyTo memory corruption, but the main problem is still here
Dikay900 [Wed, 1 Jul 2015 20:55:12 +0000 (22:55 +0200)]
export thread control to python aswell
Vadim Pisarevsky [Wed, 1 Jul 2015 17:29:24 +0000 (17:29 +0000)]
Merge pull request #4167 from berak:patch-2
Alexander Alekhin [Fri, 26 Jun 2015 10:35:27 +0000 (13:35 +0300)]
test vector processing
Vadim Pisarevsky [Wed, 1 Jul 2015 14:15:51 +0000 (14:15 +0000)]
Merge pull request #4164 from kalistratovag:parallel_mjpeg
Alexander Alekhin [Thu, 18 Jun 2015 16:32:12 +0000 (19:32 +0300)]
remove legacy intermediate unused files
berak [Wed, 1 Jul 2015 13:32:37 +0000 (15:32 +0200)]
fix plausability check, #issue 4429
Vadim Pisarevsky [Wed, 1 Jul 2015 10:53:45 +0000 (10:53 +0000)]
Merge pull request #4117 from jaimefrio:relaxed_strides
Vadim Pisarevsky [Wed, 1 Jul 2015 10:47:44 +0000 (10:47 +0000)]
Merge pull request #4064 from MSOpenTech:test-contrib
Vadim Pisarevsky [Wed, 1 Jul 2015 10:27:21 +0000 (10:27 +0000)]
Merge pull request #4166 from sbokov:fixingStereoBMissue
Vadim Pisarevsky [Wed, 1 Jul 2015 10:22:36 +0000 (10:22 +0000)]
Merge pull request #4139 from swook:spatial_gradient
Vadim Pisarevsky [Wed, 1 Jul 2015 09:09:51 +0000 (09:09 +0000)]
Merge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340
Seon-Wook Park [Wed, 1 Jul 2015 00:34:27 +0000 (09:34 +0900)]
spatialGradient: Make kern args const&
Alexey Ershov [Tue, 30 Jun 2015 18:27:15 +0000 (21:27 +0300)]
eliminated unused function __OpenCLinitializeGL(), simplified query device logic
Seon-Wook Park [Tue, 30 Jun 2015 15:42:08 +0000 (00:42 +0900)]
spatialGradient: Add CV_SSE2 check
sbokov [Tue, 30 Jun 2015 15:16:56 +0000 (18:16 +0300)]
Fixing uninitialized memory access problem
Evgeny Agafonchikov [Mon, 18 May 2015 08:57:18 +0000 (11:57 +0300)]
Adding test support for WINRT
kalistratovag [Mon, 29 Jun 2015 17:08:08 +0000 (20:08 +0300)]
Implementing parallel mjpeg encoder.
Fixed errors in parallel_for based on pthreads
Fixing compiler errore & removing whitespaces
Fixing prallel_for_pthreads error and warnings on win
Youssef Kashef [Fri, 5 Jun 2015 09:46:16 +0000 (11:46 +0200)]
add unit test around Mat::push_back()
add template specialization Mat::push_back() for MatExpr paramters
extend push_back MatExpr to mat in unit test
cast to object instead of reference
test with multi-row MatExpr input
Seon-Wook Park [Tue, 30 Jun 2015 07:08:15 +0000 (16:08 +0900)]
spatialGradient: Remove 4 loads in inner loop
Vadim Pisarevsky [Tue, 30 Jun 2015 06:12:03 +0000 (06:12 +0000)]
Merge pull request #4153 from stefan-cornelius:master
Seon-Wook Park [Tue, 30 Jun 2015 01:51:10 +0000 (10:51 +0900)]
spatialGradient: Remove pointers caching
Alexander Alekhin [Mon, 29 Jun 2015 17:08:54 +0000 (17:08 +0000)]
Merge pull request #4150 from alalek:opencv_org_issue_4428
Seon-Wook Park [Mon, 29 Jun 2015 14:50:05 +0000 (23:50 +0900)]
spatialGradient: Change ordering of vector loads
Seon-Wook Park [Mon, 29 Jun 2015 14:12:33 +0000 (23:12 +0900)]
spatialGradient: L/R border handling outside. Kernelize.
Vadim Pisarevsky [Mon, 29 Jun 2015 12:44:16 +0000 (12:44 +0000)]
Merge pull request #4155 from MSOpenTech:highgui_contrib
Vadim Pisarevsky [Mon, 29 Jun 2015 12:32:35 +0000 (12:32 +0000)]
Merge pull request #4161 from alalek:restore_data_file
Alexey Ershov [Mon, 29 Jun 2015 08:46:31 +0000 (11:46 +0300)]
fixed cleanup, fixed unused context
Seon-Wook Park [Sat, 27 Jun 2015 08:01:47 +0000 (10:01 +0200)]
spatialGradient: Move vector decl into loop
Seon-Wook Park [Sat, 27 Jun 2015 07:53:42 +0000 (09:53 +0200)]
spatialGradient: Re-introduce 2-rows at a time
Seon-Wook Park [Fri, 26 Jun 2015 23:03:43 +0000 (01:03 +0200)]
spatialGradient: Suppress uninitialised j warnings
Maxim Kostin [Thu, 25 Jun 2015 15:22:46 +0000 (18:22 +0300)]
Updated sample to showcase highgui WinRT usage
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 26 Jun 2015 20:41:25 +0000 (23:41 +0300)]
Added support for highgui module on WinRT 8.1+
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Alexander Alekhin [Fri, 26 Jun 2015 16:10:58 +0000 (19:10 +0300)]
merge to resolve conflict
Conflicts:
samples/data/detect_blob.png
Alexander Alekhin [Fri, 26 Jun 2015 15:45:58 +0000 (18:45 +0300)]
replacement for #4160
Seon-Wook Park [Fri, 26 Jun 2015 15:35:17 +0000 (17:35 +0200)]
spatialGradient: Process 1 row at a time in SSE
Seon-Wook Park [Fri, 26 Jun 2015 15:26:21 +0000 (17:26 +0200)]
spatialGradient: Remove an unnecessary branch in nosse code
Seon-Wook Park [Fri, 26 Jun 2015 15:15:44 +0000 (17:15 +0200)]
spatialGradient: Don't dynamically alloc C array, use vector
Seon-Wook Park [Fri, 26 Jun 2015 15:13:23 +0000 (17:13 +0200)]
spatialGradient: Make nosse version faster
Seon-Wook Park [Fri, 26 Jun 2015 14:41:00 +0000 (16:41 +0200)]
spatialGradient: HAL-accelerated
TODO: Make nosse ver faster than Sobel
Make sse ver faster than Sobel for BORDER_REPLICATE
Seon-Wook Park [Fri, 26 Jun 2015 12:49:31 +0000 (14:49 +0200)]
Support non continuous, BORDER_REPLICATE
TODO: HAL-accelerated code
Alexey Ershov [Mon, 1 Jun 2015 15:16:22 +0000 (18:16 +0300)]
OpenGL OpenCL sample
057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D
5656e94 added autogenerated stuff for cl_gl.h
765f1fd resolved CL functions in opengl.cpp
9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D()
a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h)
51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D()
513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D()
475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp)
07af28f added building of CL-GL interop sample - Windows only
befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs)
551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument
4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR
9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH
6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH"
cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D()
063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX)
c392ae9 fixed trailing whitespace
85a80d0 fixed include files
ae23628 excluded samples/opengl from build case 2
9870ea5 added android EGL support
530b64c added doxygen documentation comments to CL-GL interop functions
Alexander Alekhin [Wed, 10 Jun 2015 11:15:34 +0000 (14:15 +0300)]
ocl: autogenerated files for cl_gl.h
Alexander Alekhin [Wed, 10 Jun 2015 11:09:24 +0000 (14:09 +0300)]
ocl: update generator scripts
scorneli [Wed, 24 Jun 2015 22:13:38 +0000 (00:13 +0200)]
Fix processing of SunRaster images with negative maplength
Alexander Alekhin [Thu, 25 Jun 2015 16:59:27 +0000 (19:59 +0300)]
copyTo: fix for big data (4Gb+)
Alexander Alekhin [Thu, 25 Jun 2015 17:52:14 +0000 (17:52 +0000)]
Merge pull request #4156 from mshabunin:fix-neon-intrin
projects / platform / upstream / opencv.git / log