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
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
Vadim Pisarevsky [Tue, 30 Jun 2015 06:12:03 +0000 (06:12 +0000)]
Merge pull request #4153 from stefan-cornelius:master
Alexander Alekhin [Mon, 29 Jun 2015 17:08:54 +0000 (17:08 +0000)]
Merge pull request #4150 from alalek:opencv_org_issue_4428
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
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
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)
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
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.
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
Ruslan Baratov [Wed, 17 Jun 2015 10:11:11 +0000 (12:11 +0200)]
Fix `cmake -E touch classes.jar' step
`-E touch` command doesn't create intermediate directories. We have to do it
manually using `file(MAKE_DIRECTORY ...)` command.
themightyoarfish [Wed, 17 Jun 2015 10:08:34 +0000 (12:08 +0200)]
fixed copy-paste errors
Maksim Shabunin [Wed, 17 Jun 2015 09:07:57 +0000 (12:07 +0300)]
NumpyAllocator: check reference count before actual release, revert flann changes
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
Maksim Shabunin [Wed, 10 Jun 2015 10:00:36 +0000 (13:00 +0300)]
Trying to fix flann python wrapper issue
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
jayceelock [Tue, 9 Jun 2015 09:35:48 +0000 (11:35 +0200)]
Changed to allow for ISO page size selection, checkerboard pattern now centres itself properly in middle of the page
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