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
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
alexandre benoit
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
2013-07-14 19:28:37 +02:00
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Vladislav Vinogradov
12ae11e2ff
refactored Separable Linear Filters
2013-06-14 17:25:56 +04:00
Sergei Nosov
982ef83f80
Fixes bug #3071 .
...
If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.
2013-06-13 11:51:45 +04:00
alexandre benoit
cdbbe0dfbe
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
2013-06-12 22:40:43 +02:00
Vladislav Vinogradov
76f4b02b06
refactored gpu::Stream (minor fixes)
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
alexandre benoit
9c26387ce0
updated sources to correct buildbot warnings
2013-04-30 17:32:47 +02:00
alexandre benoit
a659e287fb
minor error correction
2013-04-30 14:52:14 +02:00
alexandre benoit
72742f5316
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228
minor chnges for conflict removal
2013-04-29 15:12:44 +02:00
alexandre benoit
ea1a64477f
updated tutorial with new retina interface use
2013-04-27 22:39:28 +02:00
Andrey Kamaev
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d
, reversing
changes made to 02131ffb62
.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
5ee9d3111d
fixed gpu tutorial
2013-04-18 13:28:34 +04:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
5e048d1fa5
Move C API of opencv_objdetect to separate file
...
Also move cv::linemod to own header
2013-04-12 14:37:01 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
2013-04-03 11:55:19 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Vadim Pisarevsky
7661625c39
converter stereo correspondence algorithms to the new style
2013-03-22 01:05:30 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
alexandre benoit
3fb90abb76
added retina code tutorial
2012-10-30 15:06:13 +04:00
alexandre benoit
b5bd86b2a7
added retina code tutorial
2012-10-24 12:20:59 +02:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
83799d6bf4
Fix Mat indexing in TrackingMotion tutorial code (supersedes pull request #38 )
2012-10-12 12:59:50 +04:00
Vsevolod Glumov
69fbc6102c
Fixed an issue with 'how_to_scan_images.cpp' tutorial code. Issue #2259
2012-10-11 03:51:34 +04:00
Abhinav Gupta
c0638aa2e0
Update samples/cpp/tutorial_code/features2D/SURF_detector.cpp
...
Changes made for OpenCV 2.4.2 compatibility
2012-10-05 21:31:41 +04:00
Vladislav Vinogradov
c5e92c31ba
fixed Bug #2252
...
error in the tutorial Similarity check (PNSR and SSIM) on the GPU
2012-08-08 14:38:14 +04:00
marina.kolpakova
51f7a3ca81
fixed #2190
2012-07-25 08:32:14 +04:00
Kirill Kornyakov
58aac7ea98
fixes #2044
2012-06-15 07:07:29 +00:00
Vadim Pisarevsky
517fc5e2d2
fixed typo in the tutorial code (thanks to Abid Rahman; ticket #2016 )
2012-06-06 10:04:09 +00:00
Marina Kolpakova
577dabb8bc
fixed bug #1571
2012-03-20 09:44:40 +00:00
Alexander Shishkov
1494da339d
fixed #1507
2012-03-05 11:08:59 +00:00
Ana Huaman
d97a71f17d
Erasing two images from cpp/tutorial folder
2011-11-03 06:09:31 +00:00
Ana Huaman
8c04ae8c30
Added one sample in tutorial_code to use Stereo Block matching
2011-11-03 05:52:35 +00:00
Bernat Gabor
df49158863
Added the "Camera calibration With OpenCV" tutorial. Extended with a few global links the conf.py file. Corrected an error in the linux_install.rst and one in the cascade_classifier.rst file.
2011-08-22 12:15:31 +00:00
Ana Huaman
dd836f1bdd
Modified sample for object detection with LBP in tutorial_code
2011-08-14 22:32:41 +00:00
Ana Huaman
e228b5c70d
Added sample for object detection with LBP in tutorial_code
2011-08-14 20:20:35 +00:00
Bernat Gabor
fec995391f
Added to the tutorials the "Support Vector Machines for Non-Linearly Separable Data" contributed by Fernando Iglesias García. Corrected a mistake in the gpu-basics-similarity.rst file.
2011-08-14 19:58:20 +00:00
Ana Huaman
4c74b28ee3
Sample code simplified for object Detection
2011-08-14 18:44:46 +00:00
Bernat Gabor
695311d709
Added the "Similarity check (PNSR and SSIM) on the GPU" tutorial. Corrected an highgui TOC tree mistake.
2011-08-14 15:05:56 +00:00
Bernat Gabor
bdfc0201de
Added the How to create videos with OpenCV Tutorial. Made some corrections to the feature2d, to get rid of some documentation build errors.
2011-08-13 14:02:18 +00:00
Ana Huaman
6b88d7a898
Added base tutorial for using FlannBasedMatcher with SURF detector + descriptor in rst
2011-08-12 18:30:20 +00:00
Ana Huaman
f803fc259b
Added tutorial for features2d using homography to find a planar object (Based on the well known find_obj.cpp
2011-08-12 18:04:44 +00:00
Ana Huaman
ea971df8bf
Added SURF_Homography sample codee
2011-08-12 03:33:52 +00:00
Ana Huaman
9fba5e8d8c
Added code for SURF using FLANN Matcher and drawMatches options
2011-08-12 00:19:42 +00:00
Ana Huaman
04ebef1be2
Added two sample code for features 2D - SURF descriptor and detector
2011-08-11 20:30:25 +00:00
Bernat Gabor
a0a46b0d70
Added a video input tutorial with PSNR and SSIM.
2011-08-11 09:34:03 +00:00
Bernat Gabor
a5f38806ab
Small modifications to the scan tutorial and added the video-input-psnr-ssim sample file.
2011-08-09 05:43:58 +00:00
Bernat Gabor
ed801d3e65
Added the "Interoperability with OpenCV 1" tutorial.
2011-08-08 05:58:10 +00:00
Bernat Gabor
6b5ea5931d
Added the "Mask operations on matrices" tutorial (with its sample). Plus modified some other core tutorials.
2011-07-27 17:52:27 +00:00
Bernat Gabor
26bd6b3f5f
Added the File Input and Output using XML and YAML files tutorial.
2011-07-27 11:35:11 +00:00
Bernat Gabor
2d3606a58f
Finished the DFT tutorial for the core section.
2011-07-25 10:06:03 +00:00
Bernat Gabor
f25603112a
Added Fernandos first tutorial regarding SVMs. Extended the global links (conf.py). Corrected the author names. Minor modification to the dft tutorial.
2011-07-25 07:15:52 +00:00
Bernat Gabor
ffe7a658fb
Sample files for image scanning, basic Mat, file I/O. Added Victors removed tutorials back in the system. Some typo fixing.Expanded conf.py with new global links.
2011-07-22 15:11:59 +00:00
Bernat Gabor
a2975f337a
1) Converted all images to JPG to reduce size.
...
2) Added a raw Latex page break directive after each TOC tree. (For the PDF tutorial look).
3) Two finished tutorials:
a) one describing how the Mat data structure works and its output capabilities (format function) (demonstration YouTube video included).
b) one describing image scanning operations plus the LUT function (demonstration YouTube video included).
c) a basic filtering approach (plus multi row image scanning demonstration) in the work.
2011-07-19 22:08:54 +00:00
Ana Huaman
f098d98908
Added moments_demo.cpp
2011-07-13 03:28:23 +00:00
Ana Huaman
bbba2a0608
Added pointPolygonTest_demo code for tutorials
2011-07-13 02:43:02 +00:00
Ana Huaman
9aa5e5b000
Added generalContours_demo2.cpp
2011-07-12 21:06:36 +00:00
Ana Huaman
c21b747733
Added hull_demo.cpp code for tutorials
2011-07-12 20:28:50 +00:00
Ana Huaman
edc1bd4c8c
Added generalContours_demo1.cpp tutorial code
2011-07-12 19:51:23 +00:00
Ana Huaman
ea8e27961e
Added sample code for tutorial findContours_demo.cpp
2011-07-12 18:40:51 +00:00
Ana Huaman
7386269943
Added cornerDetector_Demo.cpp sample for tutorial of cornerMinEigenVal and cornerEigenValsAndVecs
2011-07-12 00:20:06 +00:00
Ana Huaman
442f6b4100
Added cornerSubPix_Demo.cpp tutorial sample code
2011-07-11 22:03:23 +00:00
Ana Huaman
6c9f4d6423
Added goodFeaturesToTrack_Demo.cpp code for tutorials
2011-07-11 21:08:35 +00:00
Ana Huaman
e2da35dc6e
Added Harris corner detection sample tutorial
2011-07-11 19:59:17 +00:00
Bernat Gabor
4168b75edc
Some tutorial extending of the Windows install and usage. Display Image retouching.
2011-07-08 19:43:29 +00:00
Ana Huaman
9c8aafba27
Fixed small inconsistency in sample code calcBackProject_Demo2.cpp
2011-07-06 14:48:46 +00:00
Bernat Gabor
e18de3c6ab
Added the OpenCV with Visual Studio tutorial. Enhanced, extended the Windows Installation one. Some minor CSS changes to avoid unnecessary large spaces inside enumerations in the tutorials.
2011-07-06 00:01:27 +00:00
Ana Huaman
20dd7b70c0
Added tutorial for BackProject in cpp (demo 2) - tutorial code
2011-07-05 18:08:46 +00:00
Ana Huaman
4f7a8f6fb0
Added calcBackProject_Demo1.cpp for tutorial sample code
2011-07-05 06:20:39 +00:00
Ana Huaman
cc2bfdec30
Added compareHist_demo.cpp code
2011-07-04 23:12:27 +00:00
Ana Huaman
4ae5de7f1e
Added MatchTemplate_Demo.cpp to tutorial sample code
2011-07-04 18:58:57 +00:00
Ana Huaman
6d549490fb
Added calcHist_Demo.cpp tutorial code
2011-07-04 03:22:16 +00:00
Ana Huaman
08724393f4
Added tutorial sample code: EqualizeHist_Demo.cpp
2011-07-03 18:55:47 +00:00
Ana Huaman
0a14f76731
Added 02 cpp sample files for tutorials: remap and Geometric Transformations (warpAffine and Rotation2D)
2011-06-29 17:39:12 +00:00
Ana Huaman
8f01f2cc9f
Added 02 tutorials for Hough Lines and Circle detection in tutorial_code -- based on code existent
2011-06-28 19:32:48 +00:00
Ana Huaman
832262e376
Added Laplace and Canny reST tutorials and corrected a small bug in Canny sample code
2011-06-27 17:06:54 +00:00
Ana Huaman
3a0d3ebdde
Added Laplace, Canny and Sobel samples in tutorial cpp code
2011-06-26 23:09:04 +00:00
Ana Huaman
65575cef7e
Added two new sample files for copyMakeBorder and filter2D
2011-06-26 18:36:59 +00:00
Ana Huaman
22e59e933b
Added Threshold.cpp in samples/cpp/tutorial_code/ImgProc
2011-06-21 23:50:02 +00:00
Ana Huaman
5df9da1576
Added Pyramids.cpp sample tutorial code
2011-06-21 20:33:35 +00:00
Ana Huaman
a8d37509fa
Added tutorial in reST for Morphology 2
2011-06-21 08:53:37 +00:00
Ana Huaman
2819438fe6
Reorganized code and added Morphology 2 cpp code
2011-06-21 05:06:25 +00:00
Ana Huaman
5006ba773f
Morphology code 1 added to tutorial-code/Image_Processing
2011-06-18 20:30:31 +00:00
Ana Huaman
52b3391067
Added Smoothing tutorial in reST and links to the code in samples/cpp/tutorial_code
2011-06-18 17:27:02 +00:00
Ana Huaman
3ca31dcdb6
New basic filter sample added
2011-06-17 20:13:53 +00:00
Ana Huaman
98e13cec87
Added sample code for tutorial - cpp
2011-06-17 15:57:00 +00:00