ozantonkal
5bb95c4110
remove widget implementation
2013-07-04 18:36:26 +03:00
ozantonkal
ecdd8513fd
coordinate system widget implementation, update pose fix
2013-07-04 18:19:06 +03:00
ozantonkal
03cc439b08
cube widget implementation
2013-07-04 17:59:11 +03:00
Alexander Smorkalov
c2e6668414
Bug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed.
...
Downgrade TBB to 4.1u2 for all platforms, except WinRT.
2013-07-04 18:52:52 +04:00
ozantonkal
f07486b563
cylinder widget implementation
2013-07-04 17:44:41 +03:00
Roman Donchenko
4d45b3e7f9
Merge pull request #1089 from SpecLad:contract-violations
2013-07-04 18:25:39 +04:00
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
Roman Donchenko
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
2013-07-04 18:03:03 +04:00
ozantonkal
f97c3c8b06
circle widget and arrow widget implementation
2013-07-04 16:54:46 +03:00
Alexander Mordvintsev
3677a66403
line realign
2013-07-04 17:43:38 +04:00
Alexey Spizhevoy
406f342dc3
updated docs
2013-07-04 17:41:39 +04:00
ozantonkal
d80a965f97
sphere widget implementation
2013-07-04 16:32:06 +03:00
Alexey Spizhevoy
027065a5a1
removed trailing whitespaces causing warnings
2013-07-04 17:31:12 +04:00
Roman Donchenko
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
2013-07-04 17:24:21 +04:00
Roman Donchenko
4d569732b9
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
2013-07-04 17:23:53 +04:00
Alexey Spizhevoy
cc85e86ee7
fixed Windows build
2013-07-04 17:22:36 +04:00
ozantonkal
3d3e3fd470
plane widget implementation
2013-07-04 16:15:20 +03:00
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
2013-07-04 17:09:29 +04:00
Roman Donchenko
4692d4b36e
Fix bug: cv::String would break if assigned to itself.
2013-07-04 17:06:00 +04:00
ozantonkal
ba89a6a34a
line widget set/get line width
2013-07-04 16:05:05 +03:00
ozantonkal
158ed299c1
reference counting in widget
2013-07-04 15:57:49 +03:00
Alexey Spizhevoy
438a599288
added 'cmath' include
2013-07-04 16:57:20 +04:00
Fedor Morozov
a5e11079d7
Fixes, missing files, tests
2013-07-04 16:51:39 +04:00
Anatoly Baksheev
141cfd562c
widget_accessor.hpp - minimize dependencies
2013-07-04 15:16:48 +04:00
Anatoly Baksheev
efa7f09048
slight refactoring of widget system code
2013-07-04 13:54:00 +04:00
Jin Ma
97e620b8f3
Fix oclMat constructor when roi is provided.
2013-07-04 16:14:55 +08:00
yao
f2333e90f6
optimize stereoBP kernel
2013-07-04 14:46:38 +08:00
hbristow
d126263983
implemented faster transpose with SEE auto vectorization
2013-07-03 23:34:02 -07:00
Alexander Pacha
eaa29110e1
Fixed issue 3130 ( http://code.opencv.org/issues/3130 ), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
...
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
2013-07-04 16:36:29 +12:00
yao
c23510785b
remove the redundant function
2013-07-04 08:59:42 +08:00
ozantonkal
daa2a205a4
remove redundant methods, implement assignment operator for widget
2013-07-03 22:27:09 +03:00
Alexander Mordvintsev
8045093cfb
GFTT wrapped to python
2013-07-03 22:26:18 +04:00
Vladislav Vinogradov
b4d95b1406
fixed warnings in gpu modules from VS 2012
2013-07-03 22:21:10 +04:00
ozantonkal
c8d2b5ff44
fix vtkActor to vtkLODActor, initial implementation LineWidget, showWidget
2013-07-03 20:53:03 +03:00
Vladislav Vinogradov
31d55af9c1
CUDA Device Layer:
...
header only library for CUDA programming
2013-07-03 21:32:15 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
ozantonkal
54c7dfab83
initial base widget implementation
2013-07-03 18:48:11 +03:00
Heinz Hofbauer
a26c4fa2a2
Bugfix for an overlapping size of image and template for matchTemplate.
...
Example: img of size 10x10 and templ of size 11x9.
In subsequent code this will results in either width or height of
corrSize to be zero (0).
Line 261 will call crossCorr which will then have a zero size of either
blocksize.width or blocksize.height resulting in a division by zero
crach in lines 137 or 138.
2013-07-03 14:58:40 +02:00
Alexey Spizhevoy
37ea872204
added handling of camera parameters estimation errors ( #3122 )
2013-07-03 15:20:14 +04:00
Alex Leontiev
a4a5e98cc0
Non-optimized simplex algorithm.
...
This version is supposed to work on all problems (please, let me know if
this is not so), but is not optimized yet in terms of numerical
stability and performance. Bland's rule is implemented as well, so
algorithm is supposed to allow no cycling. Additional check for multiple
solutions is added (in case of multiple solutions algorithm returns an
appropriate return code of 1 and returns arbitrary optimal solution).
Finally, now we have 5 tests.
Before Thursday we have 4 directions that can be tackled in parallel:
*) Prepare the pull request!
*) Make the code more clear and readable (refactoring)
*) Wrap the core solveLP() procedure in OOP-style interface
*) Test solveLP on non-trivial tests (possibly test against
http://www.coin-or.org/Clp/ )
2013-07-03 13:54:23 +03:00
yao
8d8dc29ced
add kmeans
2013-07-03 13:13:04 +08:00
hbristow
baa946c390
Split MxArray out of bridge into standalone file. Does not depend on bridge. Working to make it API complete with respect to mxArray, but with better calling syntax
2013-07-02 16:42:37 -07:00
Philippe FOUBERT
639450efdc
PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4)
2013-07-03 00:19:22 +02:00
Frédéric Devernay
b524e275c1
allow QtKit capture in secondary threads
...
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
2013-07-02 18:08:12 +02:00
Andrey Pavlenko
70deda354a
Merge pull request #1047 from jet47:gpustream-remove-obsolete
2013-07-02 18:39:12 +04:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
Alexander Smorkalov
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
2013-07-02 12:58:59 +04:00
hbristow
504558c0be
Better C++11 and C++98 support/interop. Started writing map interface. Some core functions actually run
2013-07-01 16:33:55 -07:00
Anatoly Baksheev
e0b7e63787
getShapePose/setShapePose simplification
...
little code beautification, formatting
2013-07-02 00:07:05 +04:00
Anatoly Baksheev
2229d91c50
Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz
...
Conflicts:
modules/viz/test/test_viz3d.cpp
2013-07-01 21:39:04 +04:00