generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
opencv/modules
History
edgarriba 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
..
androidcamera
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-24 19:02:16 +04:00
calib3d
Merge remote-tracking branch 'upstream/master'
2014-08-05 12:59:47 +02:00
core
Merge pull request #2879 from alalek:ocl_runtime_flags
2014-08-04 16:43:01 +00:00
cuda
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
cudaarithm
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
cudabgsegm
fix cudabgsegm module compilation
2014-07-31 17:55:59 +04:00
cudacodec
fix cudacodec module dependecies
2014-07-28 12:13:52 +04:00
cudafeatures2d
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
cudafilters
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
cudaimgproc
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
cudalegacy
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-02-03 13:23:59 +04:00
cudaoptflow
Removed OpticalFlowBM test from cudaoptflow module
2014-08-01 09:28:19 +02:00
cudastereo
And remove final vestiges.
2014-07-17 09:43:21 -07:00
cudawarping
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
cudev
Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs
2014-07-21 15:10:41 +04:00
features2d
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
flann
Merge pull request #2669 from Adil-Ibragimov:flann_distance_fix
2014-07-07 13:35:09 +00:00
highgui
Merge pull request #2179 from adishavit:feature-SupportClipboardCopyOnWindows
2014-07-28 11:52:27 +00:00
imgcodecs
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
2014-07-30 12:48:41 +00:00
imgproc
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
java
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:31 +04:00
matlab
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
ml
hopefully fixed test failure on Linux
2014-08-04 01:16:45 +04:00
nonfree
Merge branch 'master' of https://github.com/Itseez/opencv
2014-07-23 14:21:45 +02:00
objdetect
fixed doc builder warnings
2014-07-28 17:18:28 +04:00
optim
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
photo
Merge pull request #2608 from Siddharthk:master
2014-08-01 09:13:32 +00:00
python
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
shape
double to float cast warning fix
2014-07-27 18:25:42 +04:00
stitching
Merge pull request #2987 from anishp:master
2014-07-28 21:15:39 +00:00
superres
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
ts
trying to make the tests pass
2014-07-31 14:24:21 +04:00
video
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
videoio
Merge pull request #3009 from vpisarev:ios_experiments
2014-07-31 18:20:07 +00:00
videostab
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
viz
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-04-14 16:08:02 +04:00
world
Fix cmake to build OpenCV framework on OSX
2014-07-01 22:31:57 +03:00
CMakeLists.txt
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-06-10 18:18:01 +04:00
refman.rst.in
…