Maksim Shabunin [Mon, 8 Sep 2014 15:21:32 +0000 (19:21 +0400)]
Fixed android java test build
Maksim Shabunin [Mon, 8 Sep 2014 13:35:55 +0000 (17:35 +0400)]
Fixed java tests build
- disabled xfeature2d dependency for java wrappers
- fixed java wrappers build after cmake rerun
- disabled opencv_ml tests temporarily
- fixed Imgproc usage in java tests
Andrey Pavlenko [Thu, 4 Sep 2014 14:32:48 +0000 (18:32 +0400)]
disabling java bindings for xfeatures2d module due to build errors
Alexander Alekhin [Mon, 8 Sep 2014 11:02:16 +0000 (11:02 +0000)]
Merge pull request #3192 from jkua:master
Alexander Alekhin [Mon, 8 Sep 2014 11:00:59 +0000 (11:00 +0000)]
Merge pull request #3195 from akarsakov:ocl_rm_mul24
Alexander Karsakov [Mon, 8 Sep 2014 09:02:50 +0000 (13:02 +0400)]
Remove mul24 since id can be larger 2^23
John Kua [Thu, 4 Sep 2014 23:36:36 +0000 (16:36 -0700)]
Fixed bad non-ASCII character in how_to_scan_images.cpp which causes a compile error
Vadim Pisarevsky [Thu, 4 Sep 2014 17:09:18 +0000 (17:09 +0000)]
Merge pull request #3182 from berak:videowriter_docfix_30
Vadim Pisarevsky [Thu, 4 Sep 2014 17:00:10 +0000 (17:00 +0000)]
Merge pull request #3167 from akarsakov:ocl_rm_clFinish
berak [Thu, 4 Sep 2014 12:59:44 +0000 (14:59 +0200)]
adding fourcc to VideoWriter docs
underline
Vadim Pisarevsky [Thu, 4 Sep 2014 08:54:24 +0000 (08:54 +0000)]
Merge pull request #3186 from akarsakov:ocl_fixes
Vadim Pisarevsky [Thu, 4 Sep 2014 08:53:47 +0000 (08:53 +0000)]
Merge pull request #3185 from ElenaGvozdeva:ocl_norm
Elena Gvozdeva [Tue, 2 Sep 2014 11:44:07 +0000 (15:44 +0400)]
disabled IPP acceleration for 3-channel norms and for CV_8S only for APPLE
Alexander Karsakov [Tue, 2 Sep 2014 13:25:25 +0000 (17:25 +0400)]
Fixed calculation of l_stack_size
Alexander Alekhin [Wed, 3 Sep 2014 12:56:24 +0000 (12:56 +0000)]
Merge pull request #3187 from akarsakov:ocl_disabled_minmaxidx
Alexander Karsakov [Thu, 28 Aug 2014 14:30:05 +0000 (18:30 +0400)]
Removed redundant clFinish() after clEnqueueUnmapMemObject()
sss
Alexander Karsakov [Wed, 3 Sep 2014 07:40:20 +0000 (11:40 +0400)]
Disabled minMaxIdx for 32FC1 since it occasionally fails on AMD devices (e.g. A10-6800K)
Vadim Pisarevsky [Wed, 3 Sep 2014 05:40:19 +0000 (05:40 +0000)]
Merge pull request #3184 from ilya-lavrenov:arm
Vadim Pisarevsky [Tue, 2 Sep 2014 15:52:56 +0000 (15:52 +0000)]
Merge pull request #3174 from rokm:samples-fix
Alexander Alekhin [Tue, 2 Sep 2014 13:46:46 +0000 (13:46 +0000)]
Merge pull request #3181 from akarsakov:ocl_mul_scale_test_fix
Alexander Karsakov [Mon, 1 Sep 2014 13:21:13 +0000 (17:21 +0400)]
Changed check to NORM_RELATIVE for OCL.Mat_Scalar_Scale tests
Alexander Karsakov [Tue, 2 Sep 2014 08:38:02 +0000 (12:38 +0400)]
Added workaround for Nvidia: take into account that 3-channel vector type takes 4*elem_size in local memory.
Alexander Karsakov [Tue, 2 Sep 2014 07:53:31 +0000 (11:53 +0400)]
Fixed BORDER_REFLECT and BORDER_REFLECT_101 extrapolation for case x > 2*maxV
Vadim Pisarevsky [Mon, 1 Sep 2014 18:01:12 +0000 (18:01 +0000)]
Merge pull request #3169 from znah:py_wrap
Vadim Pisarevsky [Mon, 1 Sep 2014 18:00:13 +0000 (18:00 +0000)]
Merge pull request #3179 from alekcac:update_in_youtube_url
Ilya Lavrenov [Sun, 31 Aug 2014 10:54:12 +0000 (10:54 +0000)]
NEON impl on cv::convertScaleAba CV_32f
Vadim Pisarevsky [Mon, 1 Sep 2014 10:40:02 +0000 (10:40 +0000)]
Merge pull request #3170 from ElenaGvozdeva:ocl_fix
Vadim Pisarevsky [Mon, 1 Sep 2014 10:38:43 +0000 (10:38 +0000)]
Merge pull request #3173 from rokm:cuda-6.5
Vadim Pisarevsky [Mon, 1 Sep 2014 10:36:50 +0000 (10:36 +0000)]
Merge pull request #3166 from akarsakov:ocl_native_sqrt
Alexander Alekhin [Mon, 1 Sep 2014 09:56:34 +0000 (09:56 +0000)]
Merge pull request #3176 from ilya-lavrenov:ipp_arm
Alexander Mordvintsev [Thu, 28 Aug 2014 15:15:43 +0000 (19:15 +0400)]
remove structured_edge_detection.hpp from blacklist
don't discard pure virtual methods in hdr_parser.py (was broken anyway)
Ilya Lavrenov [Sun, 31 Aug 2014 10:54:12 +0000 (10:54 +0000)]
don't use IPP on ARM
Alexander Shishkov [Mon, 1 Sep 2014 07:28:43 +0000 (11:28 +0400)]
updated links to the official OpenCV youtube channel
Vadim Pisarevsky [Mon, 1 Sep 2014 06:16:29 +0000 (06:16 +0000)]
Merge pull request #3177 from PhilLab:patch-3
Philipp Hasper [Sun, 31 Aug 2014 12:37:43 +0000 (14:37 +0200)]
Fixing Matx ostream operator
cv::Matx could not be converted to c::Mat automatically
Rok Mandeljc [Fri, 29 Aug 2014 22:58:36 +0000 (00:58 +0200)]
samples: gpu: performance: SURF is now part of opencv_xfeatures2d
Rok Mandeljc [Fri, 29 Aug 2014 22:55:06 +0000 (00:55 +0200)]
samples: gpu: performance: BackgroundSubtractorMOG is now part of opencv_bgsegm module
Rok Mandeljc [Fri, 29 Aug 2014 22:49:56 +0000 (00:49 +0200)]
samples: gpu: performance: fix include path for opencv_xfeatures2d
As opencv_xfeatures2d is part of opencv-contrib and not opencv repository,
${OpenCV_SOURCE_DIR}/modules/modules/include is not a correct include
path - use ${opencv_xfeatures2d_SOURCE_DIR}/include instead
Rok Mandeljc [Fri, 29 Aug 2014 22:15:23 +0000 (00:15 +0200)]
samples: gpu: super_resolution: disable simple optical flow
The cv::superres::createOptFlow_Simple() function along with the
simple optical flow class implementation is currently commented out
in the superres module's code, so comment it out in the example as well.
Rok Mandeljc [Fri, 29 Aug 2014 22:05:52 +0000 (00:05 +0200)]
samples: gpu: performance: removed FGDStatModel performance comparison test
The FGD background subtraction model was part of opencv_legacy module;
as it is gone now, it makes little sense to benchmark the GPU version,
either, so the whole test is removed.
Rok Mandeljc [Fri, 29 Aug 2014 22:03:59 +0000 (00:03 +0200)]
samples: gpu: performance: remove inclusion of opencv2/legacy.hpp header
The header is gone now, along with the opencv_legacy module.
Rok Mandeljc [Fri, 29 Aug 2014 22:00:11 +0000 (00:00 +0200)]
samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header, re-introduced TickMeter class in a separate header
This patch removes inclusion of opencv2/contrib/contrib.hpp header,
which does not exist anymore due to removal of opencv_contrib module.
The samples including this header appear to be doing so in order to
use TickMeter class; therefore, the latter is now provided by tick_meter.hpp
header file, located in samples/gpu folder.
Rok Mandeljc [Fri, 29 Aug 2014 21:52:22 +0000 (23:52 +0200)]
samples: gpu: removed softcascade example
The example in question cannot be compiled anymore as the softcascade
module has been removed in
3858f2291d64652a82fea930ba5c598045633843.
Rok Mandeljc [Thu, 28 Aug 2014 20:05:15 +0000 (22:05 +0200)]
Fixes for compiling with CUDA 6.5
Based on commit
feb74b125d7923c0bc11054b66863e1e9f753141 from 2.4.9 branch.
Alexander Alekhin [Fri, 29 Aug 2014 16:28:31 +0000 (16:28 +0000)]
Merge pull request #3171 from akarsakov:amd_fft_fix
Alexander Alekhin [Fri, 29 Aug 2014 14:51:38 +0000 (14:51 +0000)]
Merge pull request #3172 from ilya-lavrenov:tapi_transpose_amd
Ilya Lavrenov [Fri, 29 Aug 2014 12:51:05 +0000 (16:51 +0400)]
attempt to fix compilation of OpenCL cv::transpose for AMD
Alexander Karsakov [Fri, 29 Aug 2014 10:23:18 +0000 (14:23 +0400)]
Added check AmdFft version to be sure that AmdFft binaries are available
Elena Gvozdeva [Fri, 29 Aug 2014 10:18:52 +0000 (14:18 +0400)]
fix for cv::memopTypeToStr
Alexander Alekhin [Fri, 29 Aug 2014 09:45:04 +0000 (13:45 +0400)]
OCL: enable clAmdFftGetVersion
Vadim Pisarevsky [Fri, 29 Aug 2014 08:08:52 +0000 (08:08 +0000)]
Merge pull request #3163 from StevenPuttemans:fix_nonfree_items
Alexander Karsakov [Thu, 28 Aug 2014 13:01:49 +0000 (17:01 +0400)]
Disabled native_sqrt for double, since it may be not implemented and gives compilation error.
StevenPuttemans [Wed, 27 Aug 2014 11:50:11 +0000 (13:50 +0200)]
continue fixing nonfree elements
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
Vadim Pisarevsky [Thu, 28 Aug 2014 10:41:11 +0000 (10:41 +0000)]
Merge pull request #3161 from ElenaGvozdeva:ocl_perf_gemm
Vadim Pisarevsky [Thu, 28 Aug 2014 10:39:52 +0000 (10:39 +0000)]
Merge pull request #3162 from alekcac:fix_in_py_tutor
Alexander Alekhin [Thu, 28 Aug 2014 09:08:51 +0000 (09:08 +0000)]
Merge pull request #2956 from ilya-lavrenov:tapi_accumulate
Vadim Pisarevsky [Wed, 27 Aug 2014 10:07:55 +0000 (10:07 +0000)]
Merge pull request #3117 from KruchDmitriy:canny_opt
Vadim Pisarevsky [Wed, 27 Aug 2014 10:06:34 +0000 (10:06 +0000)]
Merge pull request #3160 from akarsakov:ocl_dft_double_support
Alexander Shishkov [Wed, 27 Aug 2014 07:49:37 +0000 (11:49 +0400)]
Update py_setup_in_windows.rst
Alexander Karsakov [Tue, 26 Aug 2014 07:28:13 +0000 (11:28 +0400)]
Refactoring of OCL_FftPlan class
Vadim Pisarevsky [Tue, 26 Aug 2014 16:07:10 +0000 (16:07 +0000)]
Merge pull request #3158 from arielelkin:master
Vadim Pisarevsky [Tue, 26 Aug 2014 16:03:53 +0000 (16:03 +0000)]
Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes
Vadim Pisarevsky [Tue, 26 Aug 2014 16:02:46 +0000 (16:02 +0000)]
Merge pull request #3152 from PhilLab:VideoCaptureFix
Vadim Pisarevsky [Tue, 26 Aug 2014 16:01:44 +0000 (16:01 +0000)]
Merge pull request #3155 from vbystricky:ocloptLaplacian
Elena Gvozdeva [Tue, 26 Aug 2014 11:05:36 +0000 (15:05 +0400)]
changed perf test for ocl_gemm
VBystricky [Tue, 26 Aug 2014 09:29:56 +0000 (13:29 +0400)]
Fix issues
PhilLab [Tue, 26 Aug 2014 07:42:46 +0000 (09:42 +0200)]
VideoCapture did not detect an unopened camera
Alexander Alekhin [Tue, 26 Aug 2014 06:34:20 +0000 (06:34 +0000)]
Merge pull request #2921 from ilya-lavrenov:tapi_memop
StevenPuttemans [Fri, 22 Aug 2014 13:33:24 +0000 (15:33 +0200)]
adapted all nonfree header inclusion since it doesn't exist anymore as a module
Ariel Elkin [Mon, 25 Aug 2014 18:13:13 +0000 (15:13 -0300)]
Doc: update video processing tutorial code for OpenCV v2.4.9 and v3a
Vadim Pisarevsky [Mon, 25 Aug 2014 18:11:10 +0000 (18:11 +0000)]
Merge pull request #3157 from PhilLab:pnpFix
Vadim Pisarevsky [Mon, 25 Aug 2014 18:09:27 +0000 (18:09 +0000)]
Merge pull request #3154 from PhilLab:patch-4
Vadim Pisarevsky [Mon, 25 Aug 2014 17:10:45 +0000 (17:10 +0000)]
Merge pull request #3151 from PhilLab:orbNoKeypoints
PhilLab [Mon, 25 Aug 2014 15:06:17 +0000 (17:06 +0200)]
PnP solver: fixed element-wise access
Alexander Karsakov [Mon, 25 Aug 2014 14:08:43 +0000 (18:08 +0400)]
Added double support for OCL version of DFT
vbystricky [Mon, 30 Jun 2014 06:37:41 +0000 (10:37 +0400)]
Optimize OpenCL version of Laplacian filter for kernel size great than 3
Philipp Hasper [Mon, 25 Aug 2014 12:49:21 +0000 (14:49 +0200)]
CUDA optical flow stubs: missing parameter
Vadim Pisarevsky [Mon, 25 Aug 2014 11:29:42 +0000 (11:29 +0000)]
Merge pull request #3153 from PhilLab:patch-3
Ilya Lavrenov [Wed, 9 Jul 2014 16:06:54 +0000 (20:06 +0400)]
used new stratehy in cv::accumulate**
Ilya Lavrenov [Wed, 9 Jul 2014 15:57:27 +0000 (19:57 +0400)]
improved cv::ocl::predictOptimalVectorWidth
Ilya Lavrenov [Wed, 9 Jul 2014 15:00:33 +0000 (19:00 +0400)]
optimization of cv::accumulate**
Ilya Lavrenov [Tue, 1 Jul 2014 09:49:03 +0000 (13:49 +0400)]
changed base types for cv::memopTypeToStr
Philipp Hasper [Sat, 23 Aug 2014 17:07:14 +0000 (19:07 +0200)]
ORB.cl : fixed redefinition of val
PhilLab [Fri, 22 Aug 2014 19:00:41 +0000 (21:00 +0200)]
ORB crashed with no keypoints present
Vadim Pisarevsky [Fri, 22 Aug 2014 12:16:41 +0000 (12:16 +0000)]
Merge pull request #3139 from bmagyar:patch-2
Vadim Pisarevsky [Fri, 22 Aug 2014 12:14:06 +0000 (12:14 +0000)]
Merge pull request #3144 from ElenaGvozdeva:ocl_morphSmall
Vadim Pisarevsky [Fri, 22 Aug 2014 07:24:21 +0000 (07:24 +0000)]
Merge pull request #3142 from akarsakov:fix_cvtcolor_luv_rgb_master
U-KruchininD-ПК\KruchininD [Tue, 15 Jul 2014 13:04:50 +0000 (17:04 +0400)]
New optimization for canny
new hysteresis
delete whitespaces
fix problem with mad24
Dynamic work group size
dynamic work group size
Fix problem with warnings
Fix some problems with border
Another one fix
Delete trailing whitespaces
some changes
fix problem with warning
Vadim Pisarevsky [Fri, 22 Aug 2014 07:17:36 +0000 (07:17 +0000)]
Merge pull request #3140 from braindevices:master
Vadim Pisarevsky [Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)]
Merge pull request #3116 from shubhra:master
Vadim Pisarevsky [Fri, 22 Aug 2014 07:14:13 +0000 (07:14 +0000)]
Merge pull request #3127 from GravityJack:size-math-ops
Vadim Pisarevsky [Fri, 22 Aug 2014 07:12:31 +0000 (07:12 +0000)]
Merge pull request #3131 from znah:python_namespaces
Vadim Pisarevsky [Fri, 22 Aug 2014 07:04:43 +0000 (07:04 +0000)]
Merge pull request #3124 from f-morozov:optim_pr
Elena Gvozdeva [Fri, 22 Aug 2014 06:31:13 +0000 (10:31 +0400)]
fixed ocl_boxFilter
Marc Rollins [Thu, 21 Aug 2014 18:41:12 +0000 (11:41 -0700)]
Fixing uninitialized temporary.
Marc Rollins [Thu, 21 Aug 2014 17:37:36 +0000 (10:37 -0700)]
Reverting pass-by-value changes to arithmetic operators.
Alexander Alekhin [Thu, 21 Aug 2014 16:47:13 +0000 (16:47 +0000)]
Merge pull request #3146 from alalek:extra_for_pr3042
Alexander Alekhin [Thu, 21 Aug 2014 16:15:35 +0000 (20:15 +0400)]
dummy commit
Alexander Alekhin [Thu, 21 Aug 2014 15:48:10 +0000 (15:48 +0000)]
Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix
Alexander Mordvintsev [Thu, 21 Aug 2014 14:45:50 +0000 (18:45 +0400)]
blacklisted 'tracking' due to some linking problem