Roman Donchenko
|
d67b450741
|
Merge pull request #2378 from ngryman:progressive_jpeg
|
2014-03-26 12:12:02 +04:00 |
|
Alexander Karsakov
|
8c39b4e8b6
|
Fixed stereoBM for Intel CPU.
|
2014-03-26 11:53:36 +04:00 |
|
Nicolas Gryman
|
b211e1d989
|
added jpeg progressive support.
|
2014-03-25 15:27:24 -04:00 |
|
mlyashko
|
70fdfa0bdb
|
changed type of sanity check
|
2014-03-25 16:43:20 +04:00 |
|
Andrey Pavlenko
|
d63a8ba018
|
Merge pull request #2523 from ilya-lavrenov:tapi_filters
|
2014-03-25 16:23:02 +04:00 |
|
Alexander Alekhin
|
6bd7a444bc
|
UMat map-unmap synchronization test
|
2014-03-25 16:19:52 +04:00 |
|
Clemens Korner
|
f1c8b4b965
|
FEATURES2D: add DenseFeatureDetector Python wrapper
|
2014-03-25 12:07:01 +01:00 |
|
mlyashko
|
953aafbd3d
|
Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
|
2014-03-25 14:52:39 +04:00 |
|
mlyashko
|
f38fe76025
|
added perf test for CalcBackProj
|
2014-03-25 14:50:37 +04:00 |
|
Roman Donchenko
|
da7a605224
|
Merge pull request #2123 from white-pony:vkysenko/fix-mertens
|
2014-03-25 14:37:56 +04:00 |
|
Andrey Pavlenko
|
c1acbb02bc
|
disabling calls to SURF_OCL causing tests failures
|
2014-03-25 14:09:49 +04:00 |
|
Andrey Pavlenko
|
63a746c6ea
|
fixing conditional compilation
|
2014-03-25 13:16:42 +04:00 |
|
Andrey Pavlenko
|
7e03a8b279
|
fixing check_docs2.py issue
|
2014-03-25 13:15:56 +04:00 |
|
Andrey Pavlenko
|
c6199fc3c1
|
Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix
|
2014-03-25 12:59:10 +04:00 |
|
Roman Donchenko
|
5effebb5f5
|
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
|
2014-03-25 12:14:44 +04:00 |
|
Roman Donchenko
|
85cf2d9671
|
Merge pull request #2524 from SpecLad:merge-2.4
|
2014-03-25 12:13:04 +04:00 |
|
Konstantin Matskevich
|
67926fa028
|
ocl morphology fix
|
2014-03-25 10:39:50 +04:00 |
|
Andrey Pavlenko
|
9e1124d24a
|
Merge pull request #2525 from ilya-lavrenov:tapi_sep
|
2014-03-24 22:43:34 +04:00 |
|
Andrey Pavlenko
|
ba2eee9cbd
|
Merge pull request #2522 from ilya-lavrenov:tapi_canny
|
2014-03-24 19:31:26 +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 |
|
Roman Donchenko
|
8af175b81b
|
Merge pull request #2521 from atrebbi:#3620
|
2014-03-24 18:54:00 +04:00 |
|
Roman Donchenko
|
4d3f9228aa
|
Merge pull request #2516 from Daniil-Osokin:fix_docs
|
2014-03-24 18:52:49 +04:00 |
|
Andrey Pavlenko
|
9c5745383f
|
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
|
2014-03-24 18:46:01 +04:00 |
|
Daniil Osokin
|
ac19420907
|
Removed obsolete list from docs
|
2014-03-24 14:50:20 +01:00 |
|
Ilya Lavrenov
|
061a25447e
|
eliminated restriction delta == 0 from cv::sepFilter2D
|
2014-03-24 17:39:07 +04:00 |
|
Konstantin Matskevich
|
c2355d3a12
|
case-insensitivity
|
2014-03-24 15:20:00 +04:00 |
|
Ilya Lavrenov
|
e2c6ab0166
|
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
|
2014-03-24 14:42:51 +04:00 |
|
Ilya Lavrenov
|
b6833fdde7
|
added 3-channels support to cv::medianBlur
|
2014-03-24 14:32:31 +04:00 |
|
Ilya Lavrenov
|
a51ab99a79
|
added 3-channels support to cv::filter2D, cv::Laplacian
|
2014-03-24 14:32:31 +04:00 |
|
Ilya Lavrenov
|
e19c42dded
|
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
|
2014-03-24 14:31:42 +04:00 |
|
Ilya Lavrenov
|
8f5fd44fb2
|
added 3 channels support to cv::bilateralFilter
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
|
2014-03-24 14:31:41 +04:00 |
|
Roman Donchenko
|
f8a100f3e0
|
Merge pull request #2520 from vlkolesnikov:misprint_fix
|
2014-03-24 14:05:18 +04:00 |
|
Ilya Lavrenov
|
6ba60a1e22
|
added 3-channels support to cv::Canny
|
2014-03-24 13:02:54 +04:00 |
|
Daniil Osokin
|
04b1822cff
|
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
|
2014-03-24 12:53:30 +04:00 |
|
Roman Donchenko
|
bcb0ee3e4b
|
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
|
2014-03-24 12:26:57 +04:00 |
|
Roman Donchenko
|
9aa6528fd7
|
Merge pull request #2504 from asmorkalov:android_camera_locks_24
|
2014-03-24 12:06:51 +04:00 |
|
Roman Donchenko
|
7efb09fb8f
|
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
|
2014-03-24 12:03:27 +04:00 |
|
Roman Donchenko
|
623b1db8d1
|
Merge pull request #2515 from apavlenko:perf_default_strategy
|
2014-03-24 12:02:30 +04:00 |
|
Vladimir Kolesnikov
|
60803afe8f
|
Misprint fixed in table formatter
|
2014-03-24 11:04:49 +04:00 |
|
Andrey Pavlenko
|
d8c018289a
|
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
|
2014-03-24 10:37:15 +04:00 |
|
Andrey Pavlenko
|
157f35ef29
|
Merge pull request #2503 from mlyashko:optflow_dualtvl1
|
2014-03-24 10:35:51 +04:00 |
|
Andrey Pavlenko
|
ae89787984
|
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
|
2014-03-24 10:25:47 +04:00 |
|
Andrey Pavlenko
|
cf3a2e30cd
|
Merge pull request #2517 from ilya-lavrenov:fix
|
2014-03-24 10:25:04 +04:00 |
|
Andrey Pavlenko
|
259b9e093c
|
disabling failing tests
|
2014-03-24 10:12:02 +04:00 |
|
Andrey Pavlenko
|
5421d741bc
|
making OCL tests conform to the comon style
|
2014-03-24 10:08:44 +04:00 |
|
Alessandro Trebbi
|
c4a63f6a86
|
-
|
2014-03-23 22:00:16 +01:00 |
|
Ilya Lavrenov
|
20b6191842
|
doc fix
|
2014-03-23 16:20:00 +04:00 |
|
Alexander Smorkalov
|
64d679ecb4
|
Added guard to prevent from gpu module redefinition in OpenCV.mk
|
2014-03-22 05:41:29 +04:00 |
|
Kang Liu
|
9dc51a1aa4
|
Keep definitions of link aliases consistent
|
2014-03-21 22:28:48 +01:00 |
|
Daniil Osokin
|
2d3aa3861c
|
Fixed Load, Modify, and Save an Image tutorial
|
2014-03-21 16:58:50 +01:00 |
|