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
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
Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Alexander Shishkov
63235f51f0
fixed year in copyright
2014-02-17 17:56:12 +04:00
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
2013-10-01 15:29:38 +04:00
Roman Donchenko
160ab8415e
Merge pull request #1330 from lenlen:plantuml
2013-09-13 14:31:01 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
antonella
5b2d557502
Added plantuml extension
...
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
2013-09-12 10:41:21 +00:00
dbloisi
a34f7b7714
fixing other white spaces
2013-09-01 19:05:07 +02:00
dbloisi
582d5558cc
trying to solve with space errors
2013-09-01 15:55:06 +02:00
zio dodo
449b4d8a65
Added the tutorial on background subtraction, in the video section
2013-08-21 12:06:48 +02:00
Kirill Kornyakov
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
Kirill Kornyakov
0339dd51f1
Removed all references to trunk
2013-06-28 12:38:44 +04:00
Kirill Kornyakov
f065c46fbe
Completely get rid of opencv_group
2013-06-28 12:15:14 +04:00
Kirill Kornyakov
a78ebc1175
Updated a couple of more links
2013-06-28 12:12:53 +04:00
Kirill Kornyakov
2cacad9470
updated email address
2013-06-28 11:53:39 +04:00
Alexander Shishkov
a8db327574
changed contacts in tutorual
2013-06-28 11:44:09 +04:00
Alexander Smorkalov
20fef00a77
android -> plarforms/android
2013-05-27 11:10:38 +04:00
Roman Donchenko
57d4c86b2b
Fixed the shebang lines on the Python scripts.
...
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Marina Kolpakova
fb3d6ecb98
merged documentation and android service from trunk
2012-07-13 14:27:09 +00:00
Andrey Kamaev
81a5988015
Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)
2012-05-30 11:13:07 +00:00
Alexander Shishkov
409c5e04a1
change docs version
2012-04-28 20:10:16 +00:00
Alexander Shishkov
94bcaeb2e9
update theme for online docs (was incorrect in Firefox and Safari)
2012-04-16 10:16:19 +00:00
Alexander Shishkov
6fdf7b4d62
fixed document style for deprecated interfaces
...
added logo to the online docs
moved quick-search panel
added logo with white sign
2012-04-02 13:16:54 +00:00
Alexander Shishkov
cc881e6393
#1672
...
updated docs links in tutorials
2012-03-11 15:45:27 +00:00
Andrey Kamaev
aeaae8b057
Updated rst configuration to read OpenCV version from sources; fixed several sphinx' warnings
2012-03-02 20:59:13 +00:00
Alexander Shishkov
d069396546
fixed problem in rst files
...
changed OpenCV version to 2.3.2
2011-09-15 08:31:14 +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
Bernat Gabor
0451779d2c
Ticket #1240 resolved.
2011-08-19 10:12:33 +00:00
Ana Huaman
8b0092eaf5
Commit rst tutorial for Cascade Classifiers
2011-08-15 00:49:59 +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
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
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
07754b6309
Added Features2D descriptor tutorial + drawMatches in rst
2011-08-12 17:01:10 +00:00
Vadim Pisarevsky
6b162ea211
improved list formatting in opencv refman. Updated PDFs.
2011-08-12 10:52:06 +00:00
Bernat Gabor
a0a46b0d70
Added a video input tutorial with PSNR and SSIM.
2011-08-11 09:34:03 +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
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
Vadim Pisarevsky
d8417af086
fixed and improving formatting in opencv2refman.pdf. added support for n-channel mask in Mat::copyTo() and n-channel images in cv::compare(). fixed 2 compile warnings in opencv_python.
2011-07-24 10:34:14 +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
Vadim Pisarevsky
bddcc6ffcc
fixed xcolor warnings when building opencv_tutorials.pdf
2011-07-20 22:21:32 +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
