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
93200922fd
Fix bug with indices
2013-06-14 13:12:35 +04:00
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
ee29b0454c
fix parenthesis
2013-05-22 13:57:43 +03:00
9c26387ce0
updated sources to correct buildbot warnings
2013-04-30 17:32:47 +02:00
80e65e08b5
updated doc and interface code to solve compile warnings and errors
2013-04-30 14:40:03 +02:00
1976b3d9b6
updated doc
2013-04-29 20:08:13 +02:00
72742f5316
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
2013-04-29 19:06:35 +02:00
9549949228
minor chnges for conflict removal
2013-04-29 15:12:44 +02:00
16dea7b90d
updated comments and new retina interface use
2013-04-27 23:18:47 +02:00
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
5163986e7d
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
2013-04-05 11:46:06 +04:00
87b84a4197
another update
2013-04-04 23:13:03 +05:30
d51d05fc44
Feature description tutorials made in sync with sample code
...
sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
Bug #2888
2013-04-04 23:12:18 +05:30
80fed87d53
Merge pull request #760 from alekcac:2.4
2013-04-04 18:44:35 +04:00
1e332d690f
OpenCV verison incremented
...
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
2013-04-04 15:50:36 +04:00
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
2be7d9b4d5
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-24 23:48:35 +04:00
221d610d55
calib3d model superscript should be subscript
2013-03-15 00:29:46 -03:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
de3767df0a
minor formatting
2013-03-06 12:59:38 +04:00
aaefd31844
more formatting
2013-03-05 19:03:36 +04:00
23fb570cbd
updating JNI lib location for Unix; formatting update
2013-03-05 18:42:14 +04:00
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
a706de2446
Merge pull request #601 from apavlenko:android_tutorial_update
2013-03-01 16:09:25 +04:00
07b1ccdeb0
removing redundant picture resize
2013-03-01 13:56:50 +04:00
978132edc1
minor Android tutorial fixes
2013-03-01 13:52:14 +04:00
af2552d72c
fixing issues from http://www.code.opencv.org/issues/2807
2013-02-28 19:11:24 +04:00
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
dddd285d3b
Merge branch 2.4
2013-02-24 20:16:53 +04:00
7249457771
Update doc/tutorials/core/adding_images/adding_images.rst
...
Quick fix for: http://code.opencv.org/issues/2803
2013-02-23 10:28:24 -05:00
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
dfbd5f6a02
Merge pull request #506 from asmorkalov:crosscompile_tutorial
2013-02-22 16:41:16 +04:00
11bd936f0b
Fix warnings from documentation build
2013-02-20 15:07:13 +04:00
637b48eec8
Tutorial for ARM Linux cross compilation added.
2013-02-20 12:48:30 +04:00
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
0570aa6494
Avoid problem of old sphinx reporting an error on lines starting from :
...
See http://sourceforge.net/tracker/?func=detail&aid=3484857&group_id=38414&atid=422030
2013-02-19 10:34:43 +04:00
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
7e5eee5bf1
Merge pull request #301 from emchristiansen:javasample2.4
2013-02-15 18:38:25 +04:00
edb15dee3d
review feed-back considered
2013-02-15 16:33:13 +04:00
a8c2fc6908
changing layout, adding ant and eclipse sections, more pictures
2013-02-14 17:54:37 +04:00
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
a370404d9c
Merge pull request #416 from asmaloney:mat-docs-cleanup
2013-02-11 18:51:03 +04:00
c7e7b77093
Tutorial for Android synchronized with actual application framework.
2013-02-08 16:53:06 +04:00
e7ea90f87f
Mat tutorial - grammar and spelling fixes
2013-02-01 23:39:40 -05:00
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Roman Donchenko