Andrey Pavlenko
43714b9d03
disabling java bindings for xfeatures2d module due to build errors
2014-09-08 18:30:03 +04:00
Alexander Alekhin
0b53ca2848
Merge pull request #3192 from jkua:master
2014-09-08 11:02:16 +00:00
Alexander Alekhin
eac4042ed5
Merge pull request #3195 from akarsakov:ocl_rm_mul24
2014-09-08 11:00:59 +00:00
Alexander Karsakov
c942c6539a
Remove mul24 since id can be larger 2^23
2014-09-08 13:11:58 +04:00
John Kua
fb0c0eaa7c
Fixed bad non-ASCII character in how_to_scan_images.cpp which causes a compile error
2014-09-04 16:36:36 -07:00
Vadim Pisarevsky
618c75fe3d
Merge pull request #3182 from berak:videowriter_docfix_30
2014-09-04 17:09:18 +00:00
Vadim Pisarevsky
26c284b225
Merge pull request #3167 from akarsakov:ocl_rm_clFinish
2014-09-04 17:00:10 +00:00
berak
5f9d5c483c
adding fourcc to VideoWriter docs
...
underline
2014-09-04 16:09:22 +02:00
Vadim Pisarevsky
ffd1df0cb5
Merge pull request #3186 from akarsakov:ocl_fixes
2014-09-04 08:54:24 +00:00
Vadim Pisarevsky
64a53de27d
Merge pull request #3185 from ElenaGvozdeva:ocl_norm
2014-09-04 08:53:47 +00:00
Elena Gvozdeva
9fe11db7e2
disabled IPP acceleration for 3-channel norms and for CV_8S only for APPLE
2014-09-04 10:38:45 +04:00
Alexander Karsakov
07d57db91c
Fixed calculation of l_stack_size
2014-09-03 17:40:17 +04:00
Alexander Alekhin
97ab91dcc9
Merge pull request #3187 from akarsakov:ocl_disabled_minmaxidx
2014-09-03 12:56:24 +00:00
Alexander Karsakov
7d91b8efcd
Removed redundant clFinish() after clEnqueueUnmapMemObject()
...
sss
2014-09-03 14:54:05 +04:00
Alexander Karsakov
f57a4bf87b
Disabled minMaxIdx for 32FC1 since it occasionally fails on AMD devices (e.g. A10-6800K)
2014-09-03 14:36:51 +04:00
Vadim Pisarevsky
0276cc90c2
Merge pull request #3184 from ilya-lavrenov:arm
2014-09-03 05:40:19 +00:00
Vadim Pisarevsky
0fd21baaa2
Merge pull request #3174 from rokm:samples-fix
2014-09-02 15:52:56 +00:00
Alexander Alekhin
7dd666e444
Merge pull request #3181 from akarsakov:ocl_mul_scale_test_fix
2014-09-02 13:46:46 +00:00
Alexander Karsakov
ec827bed8e
Changed check to NORM_RELATIVE for OCL.Mat_Scalar_Scale tests
2014-09-02 16:05:50 +04:00
Alexander Karsakov
a48c1c8248
Added workaround for Nvidia: take into account that 3-channel vector type takes 4*elem_size in local memory.
2014-09-02 12:38:02 +04:00
Alexander Karsakov
214dab39f6
Fixed BORDER_REFLECT and BORDER_REFLECT_101 extrapolation for case x > 2*maxV
2014-09-02 11:53:31 +04:00
Vadim Pisarevsky
a125cd6c6d
Merge pull request #3169 from znah:py_wrap
2014-09-01 18:01:12 +00:00
Vadim Pisarevsky
6c3dd4984c
Merge pull request #3179 from alekcac:update_in_youtube_url
2014-09-01 18:00:13 +00:00
Ilya Lavrenov
5d3a128cd3
NEON impl on cv::convertScaleAba CV_32f
2014-09-01 17:04:36 +00:00
Vadim Pisarevsky
3bafe64666
Merge pull request #3170 from ElenaGvozdeva:ocl_fix
2014-09-01 10:40:02 +00:00
Vadim Pisarevsky
3e574cd26a
Merge pull request #3173 from rokm:cuda-6.5
2014-09-01 10:38:43 +00:00
Vadim Pisarevsky
1f85ffa11b
Merge pull request #3166 from akarsakov:ocl_native_sqrt
2014-09-01 10:36:50 +00:00
Alexander Alekhin
6abce51481
Merge pull request #3176 from ilya-lavrenov:ipp_arm
2014-09-01 09:56:34 +00:00
Alexander Mordvintsev
c1032b6232
remove structured_edge_detection.hpp from blacklist
...
don't discard pure virtual methods in hdr_parser.py (was broken anyway)
2014-09-01 13:55:41 +04:00
Ilya Lavrenov
040ff7993f
don't use IPP on ARM
2014-09-01 12:30:49 +04:00
Alexander Shishkov
acc2efab50
updated links to the official OpenCV youtube channel
2014-09-01 11:28:43 +04:00
Vadim Pisarevsky
43c2c119e9
Merge pull request #3177 from PhilLab:patch-3
2014-09-01 06:16:29 +00:00
Philipp Hasper
e310added4
Fixing Matx ostream operator
...
cv::Matx could not be converted to c::Mat automatically
2014-08-31 14:37:43 +02:00
Rok Mandeljc
d9db950c0e
samples: gpu: performance: SURF is now part of opencv_xfeatures2d
2014-08-30 01:01:08 +02:00
Rok Mandeljc
db391fdfdd
samples: gpu: performance: BackgroundSubtractorMOG is now part of opencv_bgsegm module
2014-08-30 01:01:08 +02:00
Rok Mandeljc
fbf28bcc63
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
2014-08-30 01:01:08 +02:00
Rok Mandeljc
653bca8b74
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.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
f739990f4c
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.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
51311779b3
samples: gpu: performance: remove inclusion of opencv2/legacy.hpp header
...
The header is gone now, along with the opencv_legacy module.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
e0c8721830
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.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
8908b22c9d
samples: gpu: removed softcascade example
...
The example in question cannot be compiled anymore as the softcascade
module has been removed in 3858f2291d
.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
eb3cb77296
Fixes for compiling with CUDA 6.5
...
Based on commit feb74b125d
from 2.4.9 branch.
2014-08-29 23:09:02 +02:00
Alexander Alekhin
4d474d40e7
Merge pull request #3171 from akarsakov:amd_fft_fix
2014-08-29 16:28:31 +00:00
Alexander Alekhin
4c404cb4cc
Merge pull request #3172 from ilya-lavrenov:tapi_transpose_amd
2014-08-29 14:51:38 +00:00
Ilya Lavrenov
71ec6144bd
attempt to fix compilation of OpenCL cv::transpose for AMD
2014-08-29 16:59:30 +04:00
Alexander Karsakov
d4e6812be2
Added check AmdFft version to be sure that AmdFft binaries are available
2014-08-29 14:23:18 +04:00
Elena Gvozdeva
31ac73c315
fix for cv::memopTypeToStr
2014-08-29 14:18:52 +04:00
Alexander Alekhin
57fec2f2da
OCL: enable clAmdFftGetVersion
2014-08-29 13:45:04 +04:00
Vadim Pisarevsky
6ccb7e169d
Merge pull request #3163 from StevenPuttemans:fix_nonfree_items
2014-08-29 08:08:52 +00:00
Alexander Karsakov
491bf41356
Disabled native_sqrt for double, since it may be not implemented and gives compilation error.
2014-08-28 17:01:49 +04:00