8fe18fefdd
Merge pull request #3207 from jamoque:more-better-fixes
2014-09-14 18:41:06 +00:00
88aea1d52f
Stripped iCCP chunk from png files
2014-09-12 16:30:23 +04:00
56091bae1f
changing many instances of the same grammar error in documentation
2014-09-09 17:03:59 -05:00
acc2efab50
updated links to the official OpenCV youtube channel
2014-09-01 11:28:43 +04:00
9dc5c58f62
Update py_setup_in_windows.rst
2014-08-27 11:49:37 +04:00
d06c73861d
Doc: update video processing tutorial code for OpenCV v2.4.9 and v3a
2014-08-25 15:13:13 -03:00
1118a7d15a
Update tocDefinitions.rst
...
Second fix in docs needed for https://github.com/Itseez/opencv_contrib/pull/70
http://www.build.opencv.org/buildbot/builders/precommit-contrib_docs/builds/277
2014-08-20 15:32:05 +02:00
b2cd954f24
Merge pull request #3042 from edgarriba:master
2014-08-20 13:18:37 +00:00
a223479107
Merge pull request #3099 from f-morozov:akaze_tutorial
2014-08-19 22:22:23 +00:00
886319c81d
AKAZE fixes and tracking tutorial
2014-08-19 16:35:20 +04:00
7e2bb63378
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-18 22:30:00 +02:00
7f8e1f480a
Python bindings tutorial
2014-08-16 16:40:18 +05:30
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
3ed89a8879
Merge with master and fix conflicts
2014-08-13 18:24:11 +04:00
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
e2edfecb80
fixed white space
2014-08-09 21:08:46 +02:00
591355d2c8
remove whitespaces
2014-08-09 20:49:44 +02:00
9547110533
Update tutorial
2014-08-09 19:47:42 +02:00
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
2353436cb5
Removed whitespace
2014-08-05 16:53:30 +02:00
4447dbe265
Removed whitespace
2014-08-05 16:41:07 +02:00
e3afc32693
Removed whitespace
2014-08-05 16:16:05 +02:00
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
56704b5e95
Update tutorial
2014-07-31 11:47:59 +02:00
08e8f9ca45
Added some definitions
2014-07-31 11:47:26 +02:00
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
9a25cb012d
Update some text
2014-07-30 17:05:06 +02:00
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
0ac84755a0
Update tutorial
2014-07-30 12:10:29 +02:00
16a82b1747
Added an option to traincascade program to select the maximum number of threads to use during training
2014-07-23 22:47:51 +02:00
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
e395e03040
Real Time Pose tutorial
2014-07-08 16:34:49 +02:00
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07:00
cac1218eef
Build both Python 2 and Python 3 bindings
...
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process. Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.
The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python. Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3. Both are built from the same source. but for different
versions of Python.
2014-06-29 20:08:13 -04:00
3ece65ad62
Updates python feature matching tutorial
...
The given ORB parameter was misspelled
2014-06-24 11:35:22 +02:00
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
659d21332e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/spinimages.cpp
2014-06-09 18:03:03 +04:00
7c44a07810
fix typo in linux tutorial
2014-06-02 09:35:19 +02:00
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
6a93b43cae
Fix svm intro tutorial
2014-05-14 21:24:57 +04:00
0ebde64701
Merge pull request #2743 from StevenPuttemans:bugfix_3549
2014-05-14 19:49:27 +04:00
1d557e6702
adding bugfix 3549
2014-05-13 15:34:30 +02:00
6c59e39f7c
fix bug 3434
2014-05-12 16:41:22 +02:00
Vadim Pisarevsky