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
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
Vadim Pisarevsky [Wed, 1 Jul 2015 14:15:51 +0000 (14:15 +0000)]
Merge pull request #4164 from kalistratovag:parallel_mjpeg
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 17:52:14 +0000 (17:52 +0000)]
Merge pull request #4156 from mshabunin:fix-neon-intrin
Alexander Alekhin [Thu, 25 Jun 2015 17:16:04 +0000 (17:16 +0000)]
Merge pull request #4124 from ruslo:android.fix
Alexander Alekhin [Thu, 25 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge pull request #4105 from jayceelock:master
Maksim Shabunin [Thu, 25 Jun 2015 15:19:23 +0000 (18:19 +0300)]
Fixed transpose intrinsic prefix for NEON
Stefan Cornelius [Wed, 24 Jun 2015 22:17:49 +0000 (00:17 +0200)]
Fix processing of SunRaster images with negative maplength
Alexander Alekhin [Wed, 24 Jun 2015 16:45:13 +0000 (16:45 +0000)]
Merge pull request #4151 from lupustr3:pvlasov/ipp_alignment
Vadim Pisarevsky [Wed, 24 Jun 2015 16:18:54 +0000 (16:18 +0000)]
Merge pull request #4135 from lupustr3:ipp_code_refactoring
Maksim Shabunin [Wed, 24 Jun 2015 15:31:59 +0000 (15:31 +0000)]
Merge pull request #4152 from mshabunin:fix-cuda-build
Maksim Shabunin [Wed, 24 Jun 2015 13:05:08 +0000 (16:05 +0300)]
Fixed build with CUDA
Pavel Vlasov [Wed, 24 Jun 2015 11:55:45 +0000 (14:55 +0300)]
Accidentally removed tegra checks were returned;
Pavel Vlasov [Wed, 24 Jun 2015 11:34:20 +0000 (14:34 +0300)]
Warning fix;
Pavel Vlasov [Wed, 24 Jun 2015 10:50:17 +0000 (13:50 +0300)]
Imgproc_Hist_MinMaxVal.accuracy fix;
Some code style corrections;
Pavel Vlasov [Wed, 24 Jun 2015 06:21:35 +0000 (09:21 +0300)]
Proper IPP alignment;
Alexander Alekhin [Tue, 23 Jun 2015 11:31:01 +0000 (14:31 +0300)]
implement singleton lazy initialization
Vadim Pisarevsky [Tue, 23 Jun 2015 11:19:39 +0000 (11:19 +0000)]
Merge pull request #4146 from LaurentBerger:MvDetectBlobPNG
LaurentBerger [Mon, 22 Jun 2015 15:51:01 +0000 (17:51 +0200)]
move data/detect_blob.png in samples/data
Vadim Pisarevsky [Mon, 22 Jun 2015 11:53:32 +0000 (11:53 +0000)]
Merge pull request #4111 from mshabunin:fix-flann-access
Vadim Pisarevsky [Mon, 22 Jun 2015 11:51:39 +0000 (11:51 +0000)]
Merge pull request #4142 from sturkmen72:patch-2
Vadim Pisarevsky [Mon, 22 Jun 2015 11:49:36 +0000 (11:49 +0000)]
Merge pull request #4136 from alalek:fix_matallocator_destruction
jayceelock [Mon, 22 Jun 2015 06:41:44 +0000 (08:41 +0200)]
Fixed gen_pattern.py file permission back to 755
Alexander Alekhin [Sat, 20 Jun 2015 14:20:54 +0000 (14:20 +0000)]
Merge pull request #4140 from mshabunin:fix-java-package
Alexander Alekhin [Sat, 20 Jun 2015 14:19:51 +0000 (14:19 +0000)]
Merge pull request #4143 from Dikay900:ffmpeg_dict
Suleyman TURKMEN [Sat, 20 Jun 2015 08:18:47 +0000 (11:18 +0300)]
Update mat.hpp
spelling corrections
Dikay900 [Sat, 20 Jun 2015 08:17:34 +0000 (10:17 +0200)]
fix one dict parameter in ffmpeg implementation (introduced while porting)
Seon-Wook Park [Fri, 19 Jun 2015 03:30:05 +0000 (05:30 +0200)]
spatialGradient: Per row in outer loop
Maksim Shabunin [Fri, 19 Jun 2015 15:53:45 +0000 (18:53 +0300)]
Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms
Alexander Alekhin [Fri, 19 Jun 2015 10:36:40 +0000 (13:36 +0300)]
Merge pull request #4072 from vladimir-dudnik:opencl-opencv-interop
Vladimir Dudnik [Wed, 27 May 2015 20:22:33 +0000 (23:22 +0300)]
OpenCV-OpenCL interop (PR #4072):
Commits:
added new function, cv::ocl::attachContext(String& platformName, void* platformID, void* context, void* deviceID) which allow to attach externally created OpenCL context to OpenCV.
add definitions of clRetainDevice, clRetainContext funcs
removed definitions for clRetainContext, clRetainDevice
fixed build issue under Linux
fixed uninitialized vars, replace dbgassert in error handling
remove function which is not ready yet
add new function, cv::ocl::convertFromBuffer(int rows, int cols, int type, void* cl_mem_obj, UMat& dst, UMatUsageFlags usageFlags = cv::USAGE_DEFAULT) which attaches user allocated OpenCL clBuffer to UMat
uncommented clGetMemObjectInfo definition (otherwise prevent opencv build)
fixed build issue on linux and android
add step parameter to cv::ocl::convertFromBuffer func
suppress compile-time warning
added sample opencl-opencv interoperability (showcase for cv::ocl::convertFromBuffer func)
CMakeLists.txt modified to not create sample build script if OpenCL SDK not found in system
fixed build issue (apple opencl include dir and spaces in CMake file)
added call to clRetainContext for attachContext func and call to clRetainMemObject for convertFromBuffer func
uncommented clRetainMemObject definition
added comments and cleanup
add local path to cmake modules search dirs (instead of replacing)
remove REQUIRED for find_package call (sample build together with opencv). need to try standalone sample build
opencl-interop sample moved to standalone build
set minimum version requirement for sample's cmake to 3.1
put cmake_minimum_required under condition, so do not check if samples not builded
remove code dups for setSize, updateContinuityFlag, and finalizeHdr
commented out cmake_minimum_required(VERSION 3.1)
add safety check for cmake version
add convertFromImage func and update opencl-interop sample
uncommented clGetImageInfo defs
uncommented clEnqueueCopyImageToBuffer defs
fixed clEnqueueCopyImageToBuffer defs
add doxygen comments
remove doxygen @fn tag
try to restart buildbot
add doxygen comments to directx interop funcs
remove internal header, use fwd declarations in affected compile units instead
Seon-Wook Park [Fri, 19 Jun 2015 02:57:01 +0000 (04:57 +0200)]
spatialGradient: Doc, fix dangling newline error
Seon-Wook Park [Fri, 19 Jun 2015 02:46:17 +0000 (04:46 +0200)]
spatialGradient: Remove unnecessary index calculation
Seon-Wook Park [Fri, 19 Jun 2015 02:29:28 +0000 (04:29 +0200)]
spatialGradient: Add basic perf test
Seon-Wook Park [Fri, 19 Jun 2015 02:29:07 +0000 (04:29 +0200)]
spatialGradient: Reduce temporary vectors
Seon-Wook Park [Fri, 19 Jun 2015 02:07:18 +0000 (04:07 +0200)]
spatialGradient: Less vector loads
Seon-Wook Park [Fri, 19 Jun 2015 01:36:49 +0000 (03:36 +0200)]
spatialGradient: Vectorise inner area
Seon-Wook Park [Fri, 19 Jun 2015 00:56:51 +0000 (02:56 +0200)]
spatialGradient: Add non-SSE version
Seon-Wook Park [Thu, 18 Jun 2015 23:23:01 +0000 (01:23 +0200)]
spatialGradient: Add asserts
Alexander Alekhin [Thu, 18 Jun 2015 16:13:22 +0000 (16:13 +0000)]
Merge pull request #4132 from mshabunin:fix-java-package
Seon-Wook Park [Thu, 18 Jun 2015 15:42:32 +0000 (17:42 +0200)]
spatialGradient: Add test class and Sobel proxy method
Maksim Shabunin [Thu, 18 Jun 2015 11:41:13 +0000 (11:41 +0000)]
Merge pull request #4103 from mtamburrano:master
Alexander Alekhin [Thu, 18 Jun 2015 11:02:01 +0000 (14:02 +0300)]
fix MatAllocator creation/destruction issues
Dmitry Budnikov [Fri, 15 May 2015 08:15:00 +0000 (11:15 +0300)]
ipp_countNonZero build fix;
Removed IPP port for tiny arithm.cpp functions
Additional warnings fix on various platforms.
Build without OPENCL and GCC warnings fixed
Fixed warnings, trailing spaces and removed unused secure_cpy.
IPP code refactored.
IPP code path implemented as separate static functions to simplify future work with IPP code and make it more readable.
manuele [Thu, 18 Jun 2015 09:19:46 +0000 (11:19 +0200)]
Enable NEON optimization for cvRound on newer devices
Maksim Shabunin [Thu, 18 Jun 2015 08:40:56 +0000 (08:40 +0000)]
Merge pull request #4133 from ruslo:interface.sample
Maksim Shabunin [Thu, 18 Jun 2015 08:36:55 +0000 (08:36 +0000)]
Merge pull request #4134 from alalek:fix_get_target_property
Maksim Shabunin [Thu, 18 Jun 2015 08:32:31 +0000 (08:32 +0000)]
Merge pull request #4128 from alalek:fix_noipp_build
Alexander Alekhin [Wed, 17 Jun 2015 17:07:56 +0000 (20:07 +0300)]
fix "non target" warning for "world" build
Alexander Alekhin [Wed, 17 Jun 2015 16:04:46 +0000 (16:04 +0000)]
Merge pull request #4125 from ruslo:interface.include.dirs
Ruslan Baratov [Wed, 17 Jun 2015 15:53:05 +0000 (17:53 +0200)]
Update samples/cpp/example_cmake: no need to use `include_directories`
Maksim Shabunin [Tue, 16 Jun 2015 14:19:16 +0000 (17:19 +0300)]
Updated android manager readme file
Maksim Shabunin [Tue, 16 Jun 2015 14:07:32 +0000 (17:07 +0300)]
Increase android samples versions
Maksim Shabunin [Tue, 16 Jun 2015 13:40:18 +0000 (16:40 +0300)]
Added interface libraries for android opencv_java
Maksim Shabunin [Mon, 15 Jun 2015 13:01:08 +0000 (16:01 +0300)]
Updated android toolchain
Maksim Shabunin [Mon, 15 Jun 2015 13:00:49 +0000 (16:00 +0300)]
Separate OpenCV.mk files for different ABIs
Maksim Shabunin [Wed, 17 Jun 2015 14:35:40 +0000 (14:35 +0000)]
Merge pull request #4095 from alalek:hal_unresolved_symbols
Alexander Alekhin [Wed, 17 Jun 2015 14:23:56 +0000 (17:23 +0300)]
fix build without IPP (and empty 3rdparty)
Ruslan Baratov [Wed, 17 Jun 2015 11:44:11 +0000 (13:44 +0200)]
Add OpenCV_INCLUDE_DIRS to INTERFACE_INCLUDE_DIRECTORIES target property
With this fix there is no need to add includes by using
`include_directories(${OpenCV_INCLUDE_DIRS})`. Directory will be added by
command `target_link_libraries(... ${OpenCV_LIBS})` automatically.