Roman Donchenko
|
d6b54ff9d1
|
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
|
2014-03-28 12:17:16 +04:00 |
|
Koji Miyazato
|
1ab8060b62
|
corrected some style errors found by review.
|
2014-03-28 10:45:33 +09:00 |
|
JinoBetti
|
91511c1521
|
Update out.cpp
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row
see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
|
2014-03-27 16:28:40 +01:00 |
|
Alexander Alekhin
|
3488fdcb43
|
disable failed tests
|
2014-03-26 19:29:59 +04:00 |
|
Alexander Alekhin
|
569e1346f2
|
UMat: issue in OpenCLAllocator::unmap()
|
2014-03-26 19:29:41 +04:00 |
|
Andrey Pavlenko
|
04c857a4e8
|
Merge pull request #2505 from alalek:umat_unmap_synchronization_test
|
2014-03-26 19:08:15 +04:00 |
|
Ilya Lavrenov
|
f7d6d3cff5
|
improved cv::filter2D
|
2014-03-26 14:19:59 +04:00 |
|
Roman Donchenko
|
a7f9677378
|
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
|
2014-03-26 12:18:39 +04:00 |
|
Alexander Alekhin
|
6bd7a444bc
|
UMat map-unmap synchronization test
|
2014-03-25 16:19:52 +04:00 |
|
Roman Donchenko
|
85cf2d9671
|
Merge pull request #2524 from SpecLad:merge-2.4
|
2014-03-25 12:13:04 +04:00 |
|
Roman Donchenko
|
cc05493730
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
|
2014-03-24 19:02:16 +04:00 |
|
Andrey Pavlenko
|
9c5745383f
|
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
|
2014-03-24 18:46:01 +04:00 |
|
Konstantin Matskevich
|
c2355d3a12
|
case-insensitivity
|
2014-03-24 15:20:00 +04:00 |
|
Andrey Pavlenko
|
d8c018289a
|
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
|
2014-03-24 10:37:15 +04:00 |
|
Koji Miyazato
|
0a5d6e10b9
|
Added test code for I/O of user-defined types.
|
2014-03-22 00:32:44 +09:00 |
|
Konstantin Matskevich
|
79fc3a6203
|
added gpu type selection in OPENCV_OPENCL_DEVICE parser
|
2014-03-21 17:01:37 +04:00 |
|
Andrey Pavlenko
|
7193762d2d
|
Merge pull request #2495 from ilya-lavrenov:tapi_flip
|
2014-03-21 16:08:46 +04:00 |
|
Ilya Lavrenov
|
2875ce60ea
|
added 3-channels support to optimized version
|
2014-03-21 16:02:47 +04:00 |
|
Andrey Pavlenko
|
2299e2ed1b
|
Merge pull request #2494 from ilya-lavrenov:tapi_merge
|
2014-03-20 13:39:39 +04:00 |
|
Andrey Pavlenko
|
87ae0f9990
|
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
|
2014-03-20 13:39:17 +04:00 |
|
Ilya Lavrenov
|
eb8b4c58c7
|
fixed bug in cv::ocl::predictOptimalVectorWidth
|
2014-03-20 00:28:21 +04:00 |
|
Ilya Lavrenov
|
291458a859
|
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
|
2014-03-19 18:56:16 +04:00 |
|
Ilya Lavrenov
|
b73490f86c
|
eliminated restriction src[i].channels() == 1 in cv::merge
|
2014-03-19 13:56:31 +04:00 |
|
Konstantin Matskevich
|
f9f730c426
|
update error message
|
2014-03-19 12:14:48 +04:00 |
|
Ilya Lavrenov
|
04884ebf45
|
added 3-channels support to cv::setIdentity
|
2014-03-19 01:53:53 +04:00 |
|
Ilya Lavrenov
|
8d97d0d631
|
added 3-channels support to cv::flip
|
2014-03-18 19:31:37 +04:00 |
|
Koji Miyazato
|
a43ef9a6cd
|
WriteStructContext treats state of fs
|
2014-03-18 23:29:30 +09:00 |
|
Konstantin Matskevich
|
eebf92ba58
|
fix for incorrect opencl device selection
|
2014-03-18 15:47:35 +04:00 |
|
Roman Donchenko
|
d76226e21b
|
Merge pull request #2456 from kurodash:pr_use_cvAlloc
|
2014-03-18 14:39:40 +04:00 |
|
Roman Donchenko
|
ae2b0b0098
|
Merge pull request #2486 from SpecLad:merge-2.4
|
2014-03-18 13:55:57 +04:00 |
|
Ilya Lavrenov
|
82e6edfba2
|
optimized sep filter
|
2014-03-18 00:16:38 +04:00 |
|
yash
|
51cb6998ea
|
made the example consistent with the fuction definition and improved doc
made the example consistent with the fuction definition and improved doc
|
2014-03-17 18:44:02 +05:30 |
|
Roman Donchenko
|
40a740ff88
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
|
2014-03-17 14:14:07 +04:00 |
|
Andrey Pavlenko
|
dc28451b8a
|
Merge pull request #2479 from alalek:ocl_compare_scalar
|
2014-03-17 14:04:22 +04:00 |
|
Andrey Pavlenko
|
2a1d5c6d43
|
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
|
2014-03-17 13:10:34 +04:00 |
|
Alexander Alekhin
|
af062b7c42
|
ocl: compare: remove useless perf tests
|
2014-03-17 12:33:12 +04:00 |
|
Roman Donchenko
|
136e5eb804
|
Merge pull request #2484 from berak:mat_doc_24
|
2014-03-17 11:57:10 +04:00 |
|
berak
|
80708008a4
|
missing () on Mat::type()
|
2014-03-16 14:04:05 +01:00 |
|
Alexander Alekhin
|
7ce2ca2e0c
|
ocl: workaround for Pow accuracy test failure
|
2014-03-14 19:51:19 +04:00 |
|
Alexander Alekhin
|
9cafd50160
|
ocl: fixes
|
2014-03-14 19:51:19 +04:00 |
|
Alexander Alekhin
|
755ca4b7cf
|
ocl: compare with scalar
|
2014-03-14 19:51:19 +04:00 |
|
Ilya Lavrenov
|
6be7869ae8
|
fix for unsupported doubles
|
2014-03-14 16:54:52 +04:00 |
|
kuroda sho
|
f9484bae8a
|
fix: use "cvAlloc" wrapper function for malloc.
|
2014-03-14 17:09:08 +09:00 |
|
Andrey Pavlenko
|
0ce8f1d5dd
|
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
|
2014-03-13 18:55:28 +04:00 |
|
Andrey Pavlenko
|
c5bf1c108c
|
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
|
2014-03-13 18:42:01 +04:00 |
|
Andrey Pavlenko
|
a6c40abfb2
|
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
|
2014-03-13 16:56:01 +04:00 |
|
Andrey Pavlenko
|
0764a23eb2
|
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
|
2014-03-13 16:49:57 +04:00 |
|
Alexander Alekhin
|
48196ad10b
|
ocl: cleanup workarounds
|
2014-03-13 15:46:38 +04:00 |
|
Koji Miyazato
|
b96762a48f
|
Fix for bug #3599: cv::FileStorage does not work for std::vector of user-defined struct.
|
2014-03-13 19:41:13 +09:00 |
|
Ilya Lavrenov
|
9932cf41a4
|
3-channel reduction operations
|
2014-03-12 15:07:39 +04:00 |
|
Ilya Lavrenov
|
f138b613b7
|
cv::compare
|
2014-03-12 13:16:33 +04:00 |
|
Ilya Lavrenov
|
89b7c0dd93
|
3 channel support to cv::transpose
|
2014-03-12 00:17:11 +04:00 |
|
Ilya Lavrenov
|
2755ae5df9
|
experiments
|
2014-03-11 23:03:55 +04:00 |
|
Roman Donchenko
|
95a55453df
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
|
2014-03-11 17:20:01 +04:00 |
|
Andrey Pavlenko
|
702a2a6ff6
|
Merge pull request #2373 from mlyashko:optflow_dualtvl1
|
2014-03-11 16:00:22 +04:00 |
|
Andrey Pavlenko
|
90c5dde887
|
Merge pull request #2455 from ilya-lavrenov:tapi_fix
|
2014-03-11 15:58:32 +04:00 |
|
Alexander Alekhin
|
e4608229f0
|
ocl: copyMakeBorder 3-channel
|
2014-03-10 17:22:49 +04:00 |
|
kurodash
|
0eaeff0641
|
fix: use "cvAlloc" wrapper function for malloc.
|
2014-03-07 19:02:37 +09:00 |
|
Andrey Pavlenko
|
5dbe73f94d
|
Merge pull request #2438 from ilya-lavrenov:tapi_flip
|
2014-03-07 13:54:34 +04:00 |
|
Andrey Pavlenko
|
182d74d33f
|
Merge pull request #2441 from akarsakov:ocl_platform_vendor
|
2014-03-07 13:54:13 +04:00 |
|
Alexander Karsakov
|
8660588fe9
|
Pass vendor macro to opencl kernel
|
2014-03-07 12:57:29 +04:00 |
|
mlyashko
|
eb2e8a11fa
|
changed kernel.set to support unsuccssful set
|
2014-03-07 11:15:54 +04:00 |
|
Ilya Lavrenov
|
0e2cc5ef63
|
fix bitwise ops and mask support
|
2014-03-06 23:39:05 +04:00 |
|
Andrey Pavlenko
|
d1d451c952
|
Merge pull request #2431 from ilya-lavrenov:tapi_perf
|
2014-03-06 22:17:44 +04:00 |
|
Andrey Pavlenko
|
2f0fe5b87b
|
Merge pull request #2450 from ilya-lavrenov:tapi_test
|
2014-03-06 21:55:50 +04:00 |
|
Ilya Lavrenov
|
f404315368
|
test for clEnqueueReadBufferRect
|
2014-03-06 12:11:46 +04:00 |
|
mlyashko
|
66ed6a8a50
|
macro for normal return from thriveless kernel.set
|
2014-03-06 11:43:01 +04:00 |
|
Alexander Karsakov
|
c1dad2178c
|
Added Device:: isAMD,isIntel,isNvidia methods.
|
2014-03-05 14:43:11 +04:00 |
|
Andrey Pavlenko
|
0a3aca230c
|
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
|
2014-03-04 19:21:15 +04:00 |
|
Andrey Pavlenko
|
c00f0faf24
|
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
|
2014-03-04 18:37:26 +04:00 |
|
Ilya Lavrenov
|
099ea91823
|
typos
|
2014-03-04 12:47:40 +04:00 |
|
Ilya Lavrenov
|
050cca0422
|
improved performance of cv::flip (flip cols)
|
2014-03-03 19:04:32 +04:00 |
|
Ilya Lavrenov
|
be5b5a0471
|
fixed cv::dft
|
2014-03-03 14:32:38 +04:00 |
|
Roman Donchenko
|
db85c35e69
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
|
2014-03-03 13:45:22 +04:00 |
|
Roman Donchenko
|
af8aa8a2fa
|
Merge pull request #2433 from ilya-lavrenov:typos
|
2014-03-03 12:20:35 +04:00 |
|
Ilya Lavrenov
|
eedf86402d
|
typos
|
2014-03-02 21:04:17 +04:00 |
|
Ilya Lavrenov
|
68957b2757
|
added some new performance tests
|
2014-03-02 10:29:50 +04:00 |
|
Alexander Alekhin
|
b9d68ef061
|
core/ocl: OpenCL build log improvements
|
2014-02-27 13:16:07 +04:00 |
|
Roman Donchenko
|
bd5d8404c9
|
Merge pull request #2393 from ilya-lavrenov:coverity
|
2014-02-26 12:16:36 +04:00 |
|
Roman Donchenko
|
693129902d
|
Merge pull request #2399 from SpecLad:merge-2.4
|
2014-02-25 19:42:54 +04:00 |
|
Roman Donchenko
|
c9a4a82667
|
Merge pull request #2358 from rohitgirdhar:rotatedRect
|
2014-02-25 17:43:48 +04:00 |
|
Ilya Lavrenov
|
ce0557ebb8
|
fixed defects from Xcode
|
2014-02-25 17:33:12 +04:00 |
|
Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
Ilya Lavrenov
|
fe38aab84a
|
core tapi optimization
|
2014-02-25 14:14:42 +04:00 |
|
Andrey Pavlenko
|
3845b96f6c
|
Merge pull request #2388 from alalek:coverity_bug_fix
|
2014-02-24 16:54:44 +04:00 |
|
Andrey Pavlenko
|
52a339cba5
|
Merge pull request #2401 from akarsakov:fix_elem_size
|
2014-02-24 16:22:28 +04:00 |
|
Alexander Karsakov
|
6d83048ec3
|
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
|
2014-02-24 15:10:00 +04:00 |
|
Ilya Lavrenov
|
32eb38ec98
|
fixed defects from coverity.com
|
2014-02-23 20:21:08 +04:00 |
|
Ilya Lavrenov
|
0406898b9a
|
int2 -> ulong; to work properly with 3 channels
|
2014-02-23 15:12:38 +04:00 |
|
Rohit Girdhar
|
fd4461d543
|
addressed issues
|
2014-02-22 09:54:16 +05:30 |
|
Roman Donchenko
|
0a90d6dde6
|
Merge pull request #2266 from vpisarev:ipp_norm_fix
|
2014-02-21 19:11:57 +04:00 |
|
Vadim Pisarevsky
|
51dafc780b
|
fixed hint type declaration
|
2014-02-21 18:07:01 +04:00 |
|
Alexander Alekhin
|
9b3c76a3db
|
TAPI: coverity bug fix
|
2014-02-21 14:04:01 +04:00 |
|
Rohit Girdhar
|
347a3dc520
|
added randomized test
|
2014-02-21 12:47:01 +05:30 |
|
Rohit Girdhar
|
ea7b1bb3d2
|
added test, doc
|
2014-02-20 17:51:48 +05:30 |
|
Alexander Alekhin
|
79eba54a4f
|
some fixes in perf tests
|
2014-02-20 13:29:11 +04:00 |
|
Rohit Girdhar
|
b939b4ae3b
|
removed inline, changed interface
|
2014-02-19 20:58:40 +05:30 |
|
Roman Donchenko
|
3782c324c4
|
Merge pull request #2098 from pxli168:patch-1
|
2014-02-18 15:49:19 +04:00 |
|
Roman Donchenko
|
b7659c62f3
|
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
|
2014-02-18 13:47:46 +04:00 |
|
yash
|
394c74b349
|
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
|
2014-02-18 15:04:27 +05:30 |
|