Alexander Alekhin
1d9808e5d5
TAPI: stitching, replaced Mat->UMat/_Array
2014-04-11 13:01:06 +04:00
Alexander Alekhin
03773cb117
remove ippasync samples from build without IPP-A
2014-04-09 18:58:53 +04:00
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
Elena Gvozdeva
f9c5289483
fixed
2014-04-07 18:53:07 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +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
Martin Jul
73042b32e1
Fixed typos in "matching"
2014-03-26 23:29:48 +01: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
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +04:00
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
Roman Donchenko
a489d86e5f
Merge pull request #2460 from berak:b_3598_24
2014-03-17 15:52:56 +04:00
berak
5f94a205d1
fixed h / s ranges in histogram_calculation tutorial
...
literalinclude
literalinclude, dropped :lines:
2014-03-17 11:01:02 +01: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
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +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
Arun JVS
31fb7c4fec
Fixed Bug #3568 : Build fails with WITH_OPENGL=ON
2014-02-25 14:34:32 +05:30
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Roman Donchenko
a0bb74a086
Merge pull request #2337 from pmoulon:master
2014-02-17 12:24:48 +04:00
Pierre Moulon
f3f8b843b6
Fix a typo error
2014-02-14 12:21:35 +01:00
Roman Donchenko
a1de9e9ad5
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
2014-02-14 14:38:37 +04:00
Roman Donchenko
88f993dbda
Deleted an assignment to a variable that doesn't exist.
2014-02-14 14:37:56 +04:00
Ilya Lavrenov
b92a46c130
some more fixes
2014-02-13 23:47:18 +04:00
Alexander Smorkalov
7da3e98dfd
Application pause/resume fix for Android sample NativeActivity.
2014-02-13 16:47:02 +04:00
Ilya Lavrenov
879c0196d4
enabled OpenGL on MacOSX
2014-02-13 00:17:15 +04:00
Sven Wehner
f7041bacc0
grabcut.py sample: Allow drawing rect from bottom/right
...
The grabcut sample script isn't able to create rectangles correctly that are
drawn from e.g. bottom-right to top-left.
This small commit uses four min() calls to determine the correct
top-left point of the rectangle.
It also removes some unnecessary white spaces before colons.
2014-02-10 16:53:17 +01:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Roman Donchenko
721d0145e0
Merge pull request #2002 from abak:stereo_calibrate
2014-02-05 17:47:27 +04:00
Ilya Lavrenov
2e8579fe9b
cleaned up super_resolution sample from old OCL
2014-02-05 00:28:10 +04:00
Ilya Lavrenov
c7fe162829
renamed **2 -> **
2014-02-04 19:55:11 +04:00
Andrey Pavlenko
92c8b94ba9
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
2014-02-04 00:39:09 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Vadim Pisarevsky
30593ee55e
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
2014-02-03 15:12:27 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Vladislav Vinogradov
214cbabc40
update stitching sample
2014-02-03 12:55:03 +04:00
Ilya Lavrenov
f8dd9960af
one more ocl deletion
2014-02-01 21:50:14 +04:00
Ilya Lavrenov
0f168936a0
OCL module 2 trash
2014-01-31 13:19:16 +04:00
Roman Donchenko
afa62c4161
Merge pull request #2212 from SpecLad:hog-sample-const-mat
2014-01-29 17:20:25 +04:00
Alexander Smorkalov
39201e68e2
Code review notes fixed.
...
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
2014-01-27 18:47:09 +04:00
Roman Donchenko
6a511755b2
Fixed build for samples/cpp/train_HOG.cpp.
...
get_hogdescriptor_visu is passed img->clone(), which is not usable
as a non-const reference (and it doesn't modify the argument, anyway).
2014-01-27 17:39:33 +04:00
Alexander Smorkalov
f332cba14b
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
2014-01-27 15:49:24 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Konstantin Matskevich
07778e1760
fixes
2014-01-24 13:37:19 +04:00
Konstantin Matskevich
450ea3131f
samples
2014-01-24 12:59:19 +04:00
Andrey Pavlenko
1400f53436
Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib
2014-01-21 23:27:16 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Andrey Pavlenko
c8afe7efc6
Merge pull request #1320 from mbarnach:svm_hog
2014-01-21 19:23:04 +04:00
Ilya Lavrenov
5d206059a8
moved bioinspired to opencv_contrib
2014-01-21 18:02:53 +04:00
Anatoly Baksheev
130914d9f4
fixed documentation warnings
2014-01-21 02:15:37 +04:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
Roman Donchenko
a13e32f5ab
Merge pull request #2115 from nghiaho12:kmeans_sample
2014-01-09 16:58:29 +04:00
Nghia Ho
bf4994554d
Removed unecessary initialisation of Mat centers.
2014-01-09 21:04:17 +11:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Nghia Ho
601b7d1dd3
Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.
2014-01-06 20:19:07 +11:00
Ilya Lavrenov
c4c913ff13
converted CPU-based example to T-API (Mat 2 UMat, etc)
2013-12-30 03:19:17 +04:00
Ilya Lavrenov
63e4af8536
added the first T-API example - CamShift tracking
2013-12-29 14:36:59 +04:00
Alexander Smorkalov
cea9a97434
CUDA support check added.
2013-12-26 14:52:41 +04:00
Alexander Smorkalov
b3eee49451
New sample for CUDA on Android added.
2013-12-26 14:52:41 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Roman Donchenko
b633c73c46
Merge pull request #1994 from StevenPuttemans:bugfix_3431
2013-12-20 11:57:30 +04:00
Alexander Smorkalov
529bd41751
Build fixes for case where HAVE_CUDA==OFF.
2013-12-20 11:37:15 +04:00
Vadim Pisarevsky
a1784b7320
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
2013-12-19 14:48:42 +04:00
Vadim Pisarevsky
ec3f22cee2
renamed OpenCL kernel filename; made some final changes
2013-12-19 14:29:28 +04:00
Andrey Pavlenko
8c60498673
adding timing for multi-threaded case
2013-12-18 17:02:39 +04:00
Vladimir Bystricky
dd71bef6f5
Fix errors in example (samples/cpp/intelperc_capture.cpp)
2013-12-18 09:59:24 +04:00
Andrey Pavlenko
e719bee2b8
minor refactoring, no functional changes
2013-12-18 00:15:02 +04:00
Vladimir Bystricky
63ae0eeba5
Fix build errors
2013-12-17 18:39:52 +04:00
Andrey Pavlenko
bd91b39593
Merge pull request #1917 from alalek:ocl_d3d
2013-12-17 16:44:27 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
Roman Donchenko
e49b8dee40
Merge pull request #1881 from pentschev:defaultNorm_master
2013-12-17 13:53:59 +04:00
Roman Donchenko
52a785e95a
Merge pull request #1996 from SpecLad:merge-2.4
2013-12-17 13:21:48 +04:00
Vladimir Bystricky
4088013251
Add set/get depth generator properties by default. Add documentation
2013-12-17 12:00:40 +04:00
Adrien BAK
c5c3fd4443
modify signature of stereoCalibrate for consistency
2013-12-17 14:53:44 +09:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
StevenPuttemans
12c25b9310
Fixed suggestion of bugfix 3431
...
Seems correct to me and builds fine
2013-12-16 11:05:53 +01:00
StevenPuttemans
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
Alexander Alekhin
11b9d5bf4d
core: added DirectX interop implementation (OpenCL) with samples
2013-12-13 19:02:41 +04:00
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
2013-12-13 17:25:16 +04:00
Mimmmo Cosenza
f07e9e7c5f
add clojure sample
2013-12-11 13:26:47 +01:00
Ilya Lavrenov
1015c5c24d
fixed facedetect sample
2013-12-11 15:08:49 +04:00
Vadim Pisarevsky
302a5adcc2
converted Haar cascades to the new format; now they are handled with C++ code.
2013-12-10 22:54:37 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Peter Andreas Entschev
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
2013-12-09 09:54:42 -02:00
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
2013-12-09 10:55:44 +00:00
Ilya Lavrenov
926cab2baa
fixed warnings
2013-12-06 15:20:29 +04:00
Andrey Pavlenko
894724eaf0
minor improvements
2013-12-06 14:49:36 +04:00
Konstantin Matskevich
7a78559708
some fixes
2013-12-06 12:12:24 +04:00
Konstantin Matskevich
0a1ff0d42d
multithreading facedetector
2013-12-05 09:47:36 +04:00
Konstantin Matskevich
e38ba1999b
facedetect
2013-12-05 09:20:36 +04:00
Baichuan Su
632b21e090
Modify default setting, using ocl method when have ocl module
2013-12-04 18:26:54 +04:00
Baichuan Su
2cf16db683
Add Macro to decide using ocl method or not.
2013-12-04 18:26:54 +04:00
Baichuan Su
00300baa53
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
2013-12-04 18:26:54 +04:00
siddharth
778edff9e1
Added comment in demo file
2013-12-04 19:18:00 +05:30
siddharth
33e6c07485
Removed build errors and removed test images
...
Removed conflict
Error fix 1
Error fix 2
Error fix 3
Error fix 3
Error fix 4
Error fix 5
Error fix 6
Error fix 7
Error fix 8
Error fix 9
Error fix 10
Error fix 11
Error fix 12
Errors fixed
Removed opencv_extra folder inside opencv folder
2013-12-04 19:18:00 +05:30
siddharth
f85a615f3f
whitespaces removed and other minor changes to fix build error
...
Update 1
update 2
Update 3
Update 4
Update 5
update 6
Update 7
Update 8
Update 9
Update 10
Update 11
Update 12
Update 13
Update 14
Update 15
Update 16
Update 17
Update 18
Update 19
Update 20
Update 21
Update 22
Removed Headers
Update 23
Update 24
Update 25
Update 26
Update 27
Update 28
2013-12-04 19:17:59 +05:30
siddharth
05c7c9325a
cloning_gui.cpp updated
2013-12-04 19:17:59 +05:30
siddharth
75b76554bf
errors in samples/cpp removed
2013-12-04 19:17:59 +05:30
siddharth
01e1ccfa88
cloning_demo error removed
2013-12-04 19:17:59 +05:30
siddharth
f8b00e5269
renamed
2013-12-04 19:17:59 +05:30
siddharth
7ab43585aa
remove cloning_example.cpp
2013-12-04 19:17:58 +05:30
siddharth
50c19423f9
cloning demo added
2013-12-04 19:17:58 +05:30
siddharth
56ab1c18e6
new filters added and all the 3 modules updated
...
All 3 modules Updated
2013-12-04 19:17:58 +05:30
siddharth
1ed0e44090
added keyboard control
2013-12-04 19:17:58 +05:30
siddharth
e170115ad0
new interface added. decolor and cloning module added.
...
Both modules added
2013-12-04 19:17:58 +05:30
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
2013-12-02 12:27:51 +04:00
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
2013-11-29 23:08:20 +04:00
Vladislav Vinogradov
fc1d38ced8
fixed compilation of gpu-basics-similarity tutorial:
...
initialize TIMES variable with some default value (10)
2013-11-29 14:53:33 +04:00
Alexander Smorkalov
6b09345232
Filter selection and several filters implemented for WinRT sample.
2013-11-29 09:47:25 +04:00
Roman Donchenko
19b88a17bf
Merge pull request #1873 from abak:hough_24
2013-11-28 12:11:24 +04:00
Alexander Smorkalov
2cfd635e9e
Image processing sample for WinRT added.
2013-11-27 21:54:11 -08:00
Adrien BAK
38904c9a11
fix exception being thrown when no arguments are passed
2013-11-28 12:09:17 +09:00
Adrien BAK
094d7c4926
build fix
2013-11-28 11:42:44 +09:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Adrien BAK
dda3b534ad
fix indent
2013-11-26 16:09:59 +09:00
Adrien BAK
1c025be068
fix typos
2013-11-26 16:09:42 +09:00
Adrien BAK
514f1fae95
improved error handling
2013-11-26 16:09:29 +09:00
Adrien BAK
8a2de2ecca
modified HoughCircleDemo to introduce variable params via trackbars
...
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
2013-11-26 16:09:04 +09:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
StevenPuttemans
1b0297d92b
Added fixes mentioned in bugreport 3306
...
- Added author provided fixes
- Added code example
- Added documentation fixes
2013-11-25 09:35:23 +01:00
Roman Donchenko
684ff70308
Merge pull request #1864 from berak:mouse_and_match
2013-11-25 12:15:52 +04:00
Mathieu Barnachon
089b8e2f4a
Suppress a space!
2013-11-24 17:10:06 +01:00
berak
10639d63f5
mouse_and_match.py missing import cv2
2013-11-24 15:58:13 +01:00
Mathieu Barnachon
e015691b41
Fix warnings as errors.
2013-11-24 15:32:52 +01:00
Mathieu Barnachon
63c23cce65
Merge remote-tracking branch 'upstream/master' into svm_hog
2013-11-24 13:24:39 +01:00
Mathieu Barnachon
e1955759af
Fix some warning.
...
Adding missing credit for a function.
2013-11-24 13:22:10 +01:00
StevenPuttemans
2427c03625
Wrong example at the visual studio tutorial. Fixed link, fixed sample
...
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
2013-11-22 10:41:17 +01:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
Roman Donchenko
b8283edfca
Fix the Qt sample, broken after #1722 .
2013-11-20 14:57:21 +04:00
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
Vadim Pisarevsky
8c44995ea6
another attempt to fix compile errors
2013-11-18 22:15:04 -05:00
Vadim Pisarevsky
241002384c
fixed some more compile errors
2013-11-18 14:26:19 -05:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Roman Donchenko
7703b63cae
Merge pull request #1722 from StevenPuttemans:feature_1631_second
2013-11-18 15:48:27 +04:00
StevenPuttemans
2b106db02f
Applied all fixes related to translating C to C++ code
...
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
2013-11-17 20:34:50 +01:00
moodoki
b8de81749c
Slight modification to example code for FLANN matcher with comment on #3344
2013-11-14 00:22:20 +08:00
Mathieu Barnachon
a4ceb7b6ee
Fix compilation issues.
2013-11-11 19:29:39 +01:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Roman Donchenko
c970d4bf6e
Merge pull request #1742 from pengx17:master_ocl_retina_sample
2013-11-08 17:17:20 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Peng Xiao
7a2a810de5
Update retina_ocl.cpp
2013-11-06 17:00:27 +08:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
peng xiao
8adebcbc00
Add ocl retina sample.
2013-11-05 14:48:29 +08:00
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
2013-11-05 10:40:27 +08:00
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
2013-10-30 14:07:34 +04:00
Peng Xiao
252f13f53e
Fix a typo
2013-10-30 10:36:28 +08:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Ilya Lavrenov
ee8f0a3f36
ocl example typo
2013-10-28 14:09:30 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 19:47:38 +04:00
Roman Donchenko
6dda2652cd
Merge pull request #1659 from ilya-lavrenov:ocl_examples
2013-10-23 14:50:56 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Ilya Lavrenov
4d86e2140d
OpenCL examples refactoring
2013-10-21 23:50:54 +04:00
peng xiao
7285341083
1. Let btvRegWeights to be constant per process
call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
2013-10-21 10:21:37 +08:00
Vladislav Vinogradov
5673e7e435
fix bug in gpu bgsegm sample
...
create `d_fgimg` matrix before cleaning.
2013-10-19 12:40:10 +04:00
Roman Donchenko
bfdbc9cefd
Merge pull request #1375 from jet47:gpu-examples-build
2013-10-16 13:22:26 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
74329ee416
cmake: revert CRT linkage option for MSVS
2013-10-09 17:49:11 +04:00
ilya-lavrenov
7a53910495
fixed warning on windows
2013-10-09 17:49:10 +04:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Roman Donchenko
dfb698dc64
Merge pull request #1581 from SpecLad:merge-2.4
2013-10-09 12:33:50 +04:00
Roman Donchenko
f07769e9d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-08 17:57:23 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Alexander Smorkalov
fdc1a06397
Invalid copy-passed exception messages in FaceDetect sample for Android fixed.
2013-10-08 10:28:24 +04:00
Alexander Alekhin
69c2ef5ed2
ocl: update ocl samples
2013-10-03 23:26:06 +04:00
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
2013-10-03 11:54:41 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
2013-10-01 15:29:38 +04:00
John Stowers
51341738ba
Add cv::logPolar, cv::linearPolar, and a python example
2013-09-30 22:31:19 +02:00
Roman Donchenko
ada858e1c0
Merge pull request #1429 from nzjrs:fix-sketcher
2013-09-30 18:06:56 +04:00
Juan Manuel Perez
fe7bab499f
Corrections for compiling issues in Win, And and Doc
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
61c27ac81e
Shape module added
2013-09-30 14:39:17 +04:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Nghia Ho
b9e542e35e
Missing closedir with opendir
2013-09-28 21:46:48 +10:00
lluis
047b568f6d
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
...
Updated documentation and sample to use the new function API
2013-09-27 19:19:45 +02:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
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
John Stowers
42faaa8b39
Fix mouse handling in python demos
2013-09-20 21:04:07 +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
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04: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
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Mathieu Barnachon
0934344a3d
Update sample and code with external computation of HOG detector.
2013-09-12 18:38:49 +02:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01: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
Mathieu Barnachon
2fe340bf8a
adding sample to train HOG and compare it with default people detector.
2013-09-05 17:33:08 +12: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
Vladislav Vinogradov
71d61e07b1
renamed gpustereo -> cudastereo
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
6d216d78d9
renamed gpulegacy -> cudalegacy
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dbeb3e2968
renamed gpucodec -> cudacodec
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
5a85f1b6da
renamed gpucodec namespace -> cudacodec
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
StevenPuttemans
7e638cb0b5
Bugfix 3115: Added not to documentation for python version for
...
facerecognizer interface + white + whitespaces remove
2013-09-02 11:59:35 +02:00
dbloisi
20f932bd46
fixing trailing whitespaces
2013-09-01 22:13:49 +02:00
dbloisi
f0910466f9
fixing trailing whitespaces
2013-09-01 20:59:27 +02:00
dbloisi
a34f7b7714
fixing other white spaces
2013-09-01 19:05:07 +02:00
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
2013-08-30 09:49:24 -04:00
Vladislav Vinogradov
17e20b2c60
fix for bug #3219 (undefined reference in GPU samples)
2013-08-30 14:46:47 +04:00
zio dodo
5f7163bff2
Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial
...
Conflicts:
modules/stitching/src/motion_estimators.cpp
2013-08-29 20:12:12 +02:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08:00
Roman Donchenko
e958767a8b
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
2013-08-28 19:01:15 +04:00
Alexander Smorkalov
8d4cbf4deb
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
2013-08-28 15:08:13 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Vladislav Vinogradov
d87eb75904
rewrite gpu stereo multi gpu sample:
...
* use different approaches -> threads and streams
* clean up code
2013-08-28 12:41:41 +04:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
dd25f416a6
War on Whitespace, master edition: tabs.
2013-08-27 17:13:53 +04:00
Roman Donchenko
cd5b8af609
Restored one executable bit that was lost during the war on whitespace.
2013-08-27 14:39:43 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
657699a1da
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
2013-08-27 12:43:36 +04:00
Fedor Morozov
833f8d16fa
Robertson and tutorial
2013-08-26 15:23:37 +04:00
Roman Donchenko
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
2013-08-23 15:18:06 +04:00
Kirill Kornyakov
030fa5673e
bugfix-for-3231
2013-08-23 12:34:35 +04:00
Changlin Hsieh
723ba29660
Update cmake files by using CUDA_CUDA_LIBRARIES
2013-08-23 16:05:35 +08:00
berak
50288f1314
rebased commits
2013-08-22 18:40:30 +02:00
berak
926d6876d3
using VideoCapture instead of CvCapture* in cascade tutorial
...
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
2013-08-22 17:38:59 +02:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
zio dodo
449b4d8a65
Added the tutorial on background subtraction, in the video section
2013-08-21 12:06:48 +02:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Bahram Dahi
230bc03d97
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
2013-08-16 08:14:32 -07:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Jin Ma
8fb6b689c6
1. Added OpenCL version of superres to the sample.
...
2. Modified according to the feedback of the community.
2013-08-16 16:31:31 +08:00
Jin Ma
3fb0bf6e99
Added MOG and MOG2.
2013-08-16 14:19:46 +08:00
Roman Donchenko
73c5069f54
Merge pull request #1276 from nghiaho12:mushroom
2013-08-15 12:05:02 +04:00
Nghia Ho
21641d04a7
Fixed mismatching allocation and deallocation: el_ptr
2013-08-14 23:36:29 +10:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Changlin Hsieh
c1dd38cbff
Fix GPU example build failed with cuda 5.5
2013-08-14 16:16:03 +08:00
Roman Donchenko
339dd983ee
Adjusted the camera calibration sample to master API.
2013-08-13 14:55:27 +04:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Daniil Osokin
65c5c4df70
Fixed build of camera calibration android sample
2013-08-08 09:31:25 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00