Alexander Smorkalov
|
c6ab8cb6ee
|
Merge pull request #1471 from ozantonkal:master
|
2013-09-25 17:19:39 +04:00 |
|
Alexander Smorkalov
|
c8b97271cc
|
Merge pull request #1430 from nzjrs:add-brisk-to-demos
|
2013-09-23 16:34:19 +04:00 |
|
Alexander Smorkalov
|
298a1d50d2
|
Merge pull request #1299 from jet47:gpu-cuda-rename
|
2013-09-23 10:31:51 +04:00 |
|
John Stowers
|
4b19fda1d6
|
Add brisk features to python demos
|
2013-09-20 21:12:49 +02:00 |
|
lluis
|
2837bfd9fa
|
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
|
2013-09-19 10:30:25 +02:00 |
|
Ozan Tonkal
|
5780b418c9
|
delete duplicate bunny.ply, remove tabs and extra lines
|
2013-09-18 13:46:43 +01:00 |
|
Ozan Tonkal
|
8de46e1f81
|
removed trailing spaces
|
2013-09-18 12:50:55 +01:00 |
|
Ozan Tonkal
|
223fb39d94
|
include viz tutorials in the main tutorials file. ignore viz samples
|
2013-09-17 20:17:13 +02:00 |
|
Ozan Tonkal
|
a117400577
|
ignore viz tutorials when BUILD_opencv_viz is not set
|
2013-09-17 18:55:10 +02:00 |
|
Ozan Tonkal
|
e3e5fd5baa
|
Merge remote-tracking branch 'itseezstream/master'
|
2013-09-17 17:50:14 +02:00 |
|
Ozan Tonkal
|
3165b526f2
|
merge with Itseez/opencv
|
2013-09-15 17:51:27 +02:00 |
|
Ozan Tonkal
|
c31fb8ffff
|
rename widgets from *Widgets to W*
|
2013-09-15 16:26:53 +02:00 |
|
lluis
|
d25309f82e
|
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
|
2013-09-13 16:29:21 +02:00 |
|
Vladislav Vinogradov
|
6bbac2a7d9
|
Merge branch 'master' into gpu-cuda-rename
|
2013-09-11 09:41:23 +04:00 |
|
Roman Donchenko
|
242e4254f3
|
Merge pull request #1427 from SpecLad:merge-2.4
|
2013-09-10 18:28:20 +04:00 |
|
Roman Donchenko
|
95c2e8b51f
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
|
2013-09-10 11:30:19 +04:00 |
|
Roman Donchenko
|
3609bb41a7
|
Updated the native activity sample to master's API.
|
2013-09-09 18:17:02 +04:00 |
|
Roman Donchenko
|
84435ba741
|
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
|
2013-09-09 16:46:33 +04:00 |
|
Vladislav Vinogradov
|
1036ce807c
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-09 12:57:35 +04:00 |
|
Ozan Tonkal
|
56f9168ac1
|
support VTK 6.0.0: cmakelist.txt might need to be refactored
|
2013-09-08 19:07:15 +02:00 |
|
Ozan Tonkal
|
c773061457
|
updated documentation
|
2013-09-08 19:03:55 +02:00 |
|
Ozan Tonkal
|
2969ec0274
|
transformations tutorial rst
|
2013-09-08 19:03:54 +02:00 |
|
Ozan Tonkal
|
5307339f85
|
tutorial code for makeTransformToGlobal, makeCameraPose, minor fixes in widget_pose tutorial
|
2013-09-08 19:03:54 +02:00 |
|
Ozan Tonkal
|
7116e22b52
|
some of the tutorials
|
2013-09-08 19:03:54 +02:00 |
|
Ozan Tonkal
|
fdbf20c172
|
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
|
2013-09-08 19:03:54 +02:00 |
|
lluis
|
cd33ca0009
|
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
|
2013-09-06 19:10:53 +02:00 |
|
Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
lluis
|
b9a5e919e2
|
better parameter settings for the ERFilter sample
|
2013-09-06 12:31:49 +02:00 |
|
lluis
|
15511bff40
|
better classifiers performance by training them with a new dataset of "manually" selected regions
|
2013-09-06 12:31:49 +02:00 |
|
Ozan Tonkal
|
f99e874704
|
tutorial: creating_widgets code
|
2013-09-05 21:03:40 +02:00 |
|
Ozan Tonkal
|
b60894c1dd
|
launching viz tutorial
|
2013-09-05 21:03:40 +02:00 |
|
Roman Donchenko
|
62353b7980
|
Boring changes - samples.
|
2013-09-05 19:02:59 +04:00 |
|
Roman Donchenko
|
36e0891480
|
Fixed OCL samples' install path being inconsistent with the other samples.
|
2013-09-04 18:52:03 +04:00 |
|
Vladislav Vinogradov
|
1ad4592bfc
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-04 09:58:32 +04:00 |
|
Roman Donchenko
|
c42d61e464
|
Merge pull request #1283 from melody-rain:new_mog_mog2
|
2013-09-03 18:43:03 +04:00 |
|
Roman Donchenko
|
b3e73cf7d6
|
Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE
|
2013-09-03 18:30:15 +04:00 |
|
Roman Donchenko
|
e7f83619c5
|
Merge pull request #1378 from StevenPuttemans:bugfix_3115
|
2013-09-03 12:07:24 +04:00 |
|
yao
|
a70bdfc13f
|
a little fix to tests and sample
|
2013-09-03 15:02:18 +08:00 |
|
Roman Donchenko
|
9218f4976c
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
|
2013-09-02 19:44:51 +04:00 |
|
Roman Donchenko
|
ff2b12334d
|
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
|
2013-09-02 14:10:06 +04:00 |
|
Vladislav Vinogradov
|
12f50d7f67
|
fixed video_writer sample
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
a41006754e
|
fix documentation
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
ae94256edc
|
renmaed gpu module -> cuda
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
29386f1449
|
renamed gpubgsegm -> cudabgsegm
|
2013-09-02 14:00:43 +04:00 |
|
Vladislav Vinogradov
|
259ceb7eaa
|
renamed gpufeatures2d -> cudafeatures2d
|
2013-09-02 14:00:43 +04:00 |
|
Vladislav Vinogradov
|
5660d6a680
|
renamed gpuoptflow -> cudaoptflow
|
2013-09-02 14:00:43 +04:00 |
|
Vladislav Vinogradov
|
a0ae602bb7
|
renamed gpuimgproc -> cudaimgproc
|
2013-09-02 14:00:43 +04:00 |
|
Vladislav Vinogradov
|
219b662127
|
renamed gpufilters -> cudafilters
|
2013-09-02 14:00:43 +04:00 |
|