Pavel Vlasov [Wed, 24 Jun 2015 06:21:35 +0000 (09:21 +0300)]
Proper IPP alignment;
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
Dikay900 [Sat, 20 Jun 2015 08:17:34 +0000 (10:17 +0200)]
fix one dict parameter in ffmpeg implementation (introduced while porting)
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
Alexander Alekhin [Thu, 18 Jun 2015 16:13:22 +0000 (16:13 +0000)]
Merge pull request #4132 from mshabunin:fix-java-package
Maksim Shabunin [Thu, 18 Jun 2015 11:41:13 +0000 (11:41 +0000)]
Merge pull request #4103 from mtamburrano:master
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.
Vadim Pisarevsky [Wed, 17 Jun 2015 11:59:33 +0000 (11:59 +0000)]
Merge pull request #4115 from themightyoarfish:MatToUIImage_transparency
Vadim Pisarevsky [Wed, 17 Jun 2015 11:58:40 +0000 (11:58 +0000)]
Merge pull request #4099 from sash-kan:fix.2822
Vadim Pisarevsky [Wed, 17 Jun 2015 11:55:07 +0000 (11:55 +0000)]
Merge pull request #4093 from mshabunin:python-bases
Vadim Pisarevsky [Wed, 17 Jun 2015 11:29:32 +0000 (11:29 +0000)]
Merge pull request #4100 from alalek:fix_ffmpeg
Vadim Pisarevsky [Wed, 17 Jun 2015 11:26:53 +0000 (11:26 +0000)]
Merge pull request #4114 from alalek:ocl_generator_error_processing
Vadim Pisarevsky [Wed, 17 Jun 2015 11:22:41 +0000 (11:22 +0000)]
Merge pull request #4090 from MSOpenTech:highgui_winrt
Vadim Pisarevsky [Wed, 17 Jun 2015 11:13:27 +0000 (11:13 +0000)]
Merge pull request #4122 from alalek:fix_issue_3891
Alexander Alekhin [Wed, 17 Jun 2015 10:11:50 +0000 (10:11 +0000)]
Merge pull request #4123 from rajithr:patch-1
themightyoarfish [Wed, 17 Jun 2015 10:08:34 +0000 (12:08 +0200)]
fixed copy-paste errors
rajithr [Wed, 17 Jun 2015 05:37:49 +0000 (11:07 +0530)]
Fixing resource leaks
Alexander Alekhin [Tue, 16 Jun 2015 14:56:00 +0000 (17:56 +0300)]
fix issue 3891
Vadim Pisarevsky [Tue, 16 Jun 2015 13:26:47 +0000 (13:26 +0000)]
Merge pull request #4108 from Reen:patch-1
Vadim Pisarevsky [Tue, 16 Jun 2015 13:06:36 +0000 (13:06 +0000)]
Merge pull request #4109 from alalek:fix_build_dbt_bindings
Vadim Pisarevsky [Tue, 16 Jun 2015 12:29:44 +0000 (12:29 +0000)]
Merge pull request #4119 from D-Alex:master
Vadim Pisarevsky [Tue, 16 Jun 2015 12:18:13 +0000 (12:18 +0000)]
Merge pull request #4112 from sturkmen72:patch-1
Vadim Pisarevsky [Tue, 16 Jun 2015 12:15:27 +0000 (12:15 +0000)]
Merge pull request #4121 from sbokov:addingAloeGT
Vadim Pisarevsky [Tue, 16 Jun 2015 12:08:42 +0000 (12:08 +0000)]
Merge pull request #4116 from alalek:fix-pthread-pf
Maxim Kostin [Tue, 2 Jun 2015 15:33:21 +0000 (18:33 +0300)]
Added dummy highgui WinRT implementation
sbokov [Sun, 14 Jun 2015 20:59:48 +0000 (23:59 +0300)]
Added ground-truth disparity map for 'aloe'
Alexander Duda [Fri, 12 Jun 2015 11:50:43 +0000 (13:50 +0200)]
cv::stereoRectify: fix segfault in case of empty distCoeffs
cvStereoRectify assumes that NULL is provided in case of no distCoeffs
Alexander Alekhin [Thu, 11 Jun 2015 13:53:07 +0000 (16:53 +0300)]
fix support for pthreads parallel_for
themightyoarfish [Thu, 11 Jun 2015 12:59:57 +0000 (14:59 +0200)]
Fixed alpha preservation when converting 4-channel Mat to UIImage
Alexander Alekhin [Thu, 11 Jun 2015 12:36:29 +0000 (15:36 +0300)]
ocl: added errors processing in OpenCL code generator, resolve space issue
Suleyman TURKMEN [Thu, 11 Jun 2015 08:46:42 +0000 (11:46 +0300)]
Update imgproc.hpp
Suleyman TURKMEN [Thu, 11 Jun 2015 08:03:14 +0000 (11:03 +0300)]
Update imgproc.hpp
Suleyman TURKMEN [Wed, 10 Jun 2015 10:18:40 +0000 (13:18 +0300)]
Update imgproc.hpp
Alexander Alekhin [Tue, 9 Jun 2015 13:58:58 +0000 (16:58 +0300)]
remove bindings generation for DetectionBasedTracker
René [Tue, 9 Jun 2015 15:23:22 +0000 (17:23 +0200)]
Fix bug in distanceATS_L1_8u and typos.
The inner loop of the backward scan got the wrong initial "a".
Alexander Alekhin [Mon, 8 Jun 2015 10:06:29 +0000 (13:06 +0300)]
videoio: fix some issues in ffmpeg error processing
Alexander Alekhin [Mon, 8 Jun 2015 09:58:02 +0000 (12:58 +0300)]
videoio: update ffmpeg backend
- fix compilation for old libraries
- update codec/tag selection logic
- add documentation note about MP4 container tags
Maksim Shabunin [Tue, 9 Jun 2015 10:59:48 +0000 (13:59 +0300)]
Fixed compilation of pthread-based parallel_for with gcc 4.4.3
alexander barakin (aka sash-kan) [Sat, 6 Jun 2015 11:41:00 +0000 (14:41 +0300)]
fix icvCloseCAM_V4L wrong order of code blocks
this patch fixes bug http://code.opencv.org/issues/2822 .
based on disussion (in russian):
http://ru.stackoverflow.com/a/428398/178576
Signed-off-by: alexander barakin (aka sash-kan) <alex@barak.in>
Alexander Alekhin [Fri, 5 Jun 2015 13:24:38 +0000 (16:24 +0300)]
fix tests build (win,shared,world)
Maksim Shabunin [Fri, 5 Jun 2015 09:41:23 +0000 (12:41 +0300)]
Python generator: moved base class handling to the generate step
Maksim Shabunin [Thu, 4 Jun 2015 11:54:50 +0000 (14:54 +0300)]
Merge tag '3.0.0'
OpenCV 3.0.0
* tag '3.0.0':
Version for 3.0.0 release
Maksim Shabunin [Wed, 3 Jun 2015 17:21:34 +0000 (20:21 +0300)]
Version for 3.0.0 release
Maksim Shabunin [Wed, 3 Jun 2015 17:17:36 +0000 (17:17 +0000)]
Merge pull request #4083 from mshabunin:java-engine
Maksim Shabunin [Wed, 3 Jun 2015 17:16:51 +0000 (17:16 +0000)]
Merge pull request #4089 from alalek:video_mp4
Maksim Shabunin [Wed, 3 Jun 2015 16:01:48 +0000 (19:01 +0300)]
AndroidMgr: fixed package build
Alexander Alekhin [Wed, 3 Jun 2015 14:01:45 +0000 (17:01 +0300)]
videoio: VideoWriter H264/.mp4 support via ffmpeg/libav
Maksim Shabunin [Wed, 3 Jun 2015 09:47:42 +0000 (12:47 +0300)]
AndroidMgr: fixed library version check
Maksim Shabunin [Wed, 3 Jun 2015 08:53:29 +0000 (11:53 +0300)]
AndroidMgr: fixed typos and package name
Vadim Pisarevsky [Wed, 3 Jun 2015 07:25:51 +0000 (07:25 +0000)]
Merge pull request #4084 from berak:patch-2
berak [Wed, 3 Jun 2015 05:44:46 +0000 (07:44 +0200)]
http://code.opencv.org/issues/4359, for master
Vadim Pisarevsky [Tue, 2 Jun 2015 19:11:54 +0000 (19:11 +0000)]
Merge pull request #4082 from diogorolo:patch-1
Maksim Shabunin [Tue, 2 Jun 2015 15:34:30 +0000 (18:34 +0300)]
AndroidMgr: Reversed file existence checking
Maksim Shabunin [Wed, 20 May 2015 14:59:42 +0000 (17:59 +0300)]
Updated Manager for Android
Diogo Rolo [Tue, 2 Jun 2015 13:34:15 +0000 (14:34 +0100)]
Update cuda.markdown
Small typo fix in the documentation.
It was written 'devie' instead of 'device' in: 'Switching active device can be done using cuda::setDevice() function'
Vadim Pisarevsky [Tue, 2 Jun 2015 08:36:03 +0000 (08:36 +0000)]
Merge pull request #4081 from vpisarev:30_small_fixes
Vadim Pisarevsky [Mon, 1 Jun 2015 22:30:00 +0000 (01:30 +0300)]
made improvements in ECC code (comments from https://github.com/Itseez/opencv/pull/3845), as well as minor tweak in pthread's based parallel for.
Vadim Pisarevsky [Mon, 1 Jun 2015 20:35:29 +0000 (20:35 +0000)]
Merge pull request #3845 from ellbur:findTransformECC-mask
Vadim Pisarevsky [Mon, 1 Jun 2015 16:53:49 +0000 (16:53 +0000)]
Merge pull request #4076 from kalistratovag:parallel_pthreads
kalistratovag [Fri, 29 May 2015 18:58:45 +0000 (21:58 +0300)]
parallel for on pthreads initial commit
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
Vadim Pisarevsky [Mon, 1 Jun 2015 11:42:18 +0000 (11:42 +0000)]
Merge pull request #4079 from Dikay900:2_4_to_master
Alexander Smorkalov [Tue, 19 May 2015 10:23:55 +0000 (13:23 +0300)]
Precise default CUDA version for Tegra X1 chips.
Vadim Pisarevsky [Fri, 29 May 2015 21:38:09 +0000 (21:38 +0000)]
Merge pull request #3998 from msandler:master
Vadim Pisarevsky [Fri, 29 May 2015 21:36:43 +0000 (21:36 +0000)]
Merge pull request #3984 from LaurentBerger:ExampleCppORB
Vadim Pisarevsky [Fri, 29 May 2015 13:23:23 +0000 (13:23 +0000)]
Merge pull request #4075 from MSOpenTech:backslash-upd
Evgeny Agafonchikov [Thu, 28 May 2015 13:16:24 +0000 (16:16 +0300)]
Adding backslash in macro-based paths
of WINRT samples
This removes requirement to add OPENCV_WINRT_INSTALL_DIR with backslash in the end
in case trailing slash is presented VS handles duplicated slashes w/o issues
Vadim Pisarevsky [Thu, 28 May 2015 19:43:51 +0000 (19:43 +0000)]
Merge pull request #4074 from vpisarev:objdetect_fixes
Vadim Pisarevsky [Thu, 28 May 2015 18:06:17 +0000 (18:06 +0000)]
Merge pull request #4070 from techfort:fixpythonsample
Vadim Pisarevsky [Thu, 28 May 2015 18:02:27 +0000 (21:02 +0300)]
clip the found objects in HOG as well (code.opencv.org/issues/3825); added test to check CascadeClassifier on small images (http://code.opencv.org/issues/3710)
Vadim Pisarevsky [Thu, 28 May 2015 17:15:22 +0000 (20:15 +0300)]
make sure the returned rectangles are inside the image (code.opencv.org/issues/3136)
Vadim Pisarevsky [Thu, 28 May 2015 16:33:21 +0000 (19:33 +0300)]
improvements in Haar CascadeClassifier: 1) use CV_32S instead of CV_32F for the integral of squares (which is more accurate and more efficient); 2) skip the window if its contrast is too low
Vadim Pisarevsky [Thu, 28 May 2015 16:01:56 +0000 (19:01 +0300)]
make facedetect.py work when the nested cascade is not specified
Vadim Pisarevsky [Thu, 28 May 2015 15:00:36 +0000 (15:00 +0000)]
Merge pull request #4022 from LaurentBerger:ExampleBLOB_MSER
Vadim Pisarevsky [Thu, 28 May 2015 15:00:07 +0000 (15:00 +0000)]
Merge pull request #4056 from apavlenko:java_memory_release
Vadim Pisarevsky [Thu, 28 May 2015 14:49:13 +0000 (14:49 +0000)]
Merge pull request #4063 from Dikay900:2_4_to_master
Vadim Pisarevsky [Thu, 28 May 2015 14:48:00 +0000 (14:48 +0000)]
Merge pull request #4069 from MSOpenTech:sample-face-contrib
Vadim Pisarevsky [Thu, 28 May 2015 14:44:36 +0000 (14:44 +0000)]
Merge pull request #4071 from sergarrido:fix_isContourConvex
Vadim Pisarevsky [Thu, 28 May 2015 14:41:40 +0000 (14:41 +0000)]
Merge pull request #4073 from MSOpenTech:video-sample-face
Vadim Pisarevsky [Thu, 28 May 2015 14:24:22 +0000 (17:24 +0300)]
report an error when trying to load HOG cascade
Joe Minichino [Thu, 28 May 2015 14:20:08 +0000 (15:20 +0100)]
fixed outdated params setting
Vadim Pisarevsky [Thu, 28 May 2015 14:05:43 +0000 (17:05 +0300)]
added simple HAL test; added RHO homography test
Maxim Kostin [Wed, 27 May 2015 11:29:05 +0000 (14:29 +0300)]
Added video face detection. Restructured code.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
S. Garrido [Wed, 27 May 2015 18:51:53 +0000 (20:51 +0200)]
fix isContourConvex