vbystricky
|
188c506237
|
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
|
2014-04-07 14:26:51 +04:00 |
|
vbystricky
|
ec6f977783
|
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
|
2014-04-07 14:26:50 +04:00 |
|
vbystricky
|
ad23ef2a42
|
Remove unused #include "ippverdion.h"
|
2014-04-07 14:26:49 +04:00 |
|
vbystricky
|
9d138b2bbe
|
Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test
|
2014-04-07 14:26:49 +04:00 |
|
vbystricky
|
9b6feee1a5
|
Change sanity check for perfomance test of dft
|
2014-04-07 14:26:47 +04:00 |
|
vbystricky
|
01a66a2938
|
Prepare codes for ippicv library
|
2014-04-07 14:24:05 +04:00 |
|
Andrey Pavlenko
|
c2f859569c
|
Merge pull request #2563 from alalek:ipp_builds
|
2014-04-07 13:03:11 +04:00 |
|
Andrey Pavlenko
|
5a3200d513
|
Merge pull request #2567 from apavlenko:fix_compare_scalar
|
2014-04-03 22:08:18 +04:00 |
|
Andrey Pavlenko
|
9a3895d842
|
Merge pull request #2556 from DeanF:master
|
2014-04-03 17:07:06 +04:00 |
|
Andrey Pavlenko
|
271f60ba7a
|
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
|
2014-04-03 16:21:04 +04:00 |
|
Alexander Alekhin
|
bfc546d23c
|
enable IPP ICV support
|
2014-04-03 15:05:38 +04:00 |
|
Roman Donchenko
|
c165f07319
|
Merge pull request #2550 from SpecLad:merge-2.4
|
2014-04-02 12:00:01 +04:00 |
|
DeanF
|
48df67a9c5
|
Fixed trailing whitespace
|
2014-04-01 22:04:58 +03:00 |
|
DeanF
|
bdc91c66c9
|
Fixed problem with compilation without HAVE_OPENCL
When compiling without OpenCL, some classes from its namespace are still used in code.
|
2014-04-01 21:20:13 +03:00 |
|
Ilya Lavrenov
|
322b15a459
|
compare with scalar (cn > 1)
|
2014-03-31 17:50:16 +04:00 |
|
Roman Donchenko
|
f77c68e0fa
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
|
2014-03-31 14:42:00 +04:00 |
|
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 |
|
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 |
|