Vadim Pisarevsky
00b3726082
Merge pull request #903 from alalek:contrib_update
3.2.0-rc
2016-12-19 14:14:13 +00:00
Alexander Alekhin
f89e99874c
Merge pull request #908 from alalek:fix_add_testdata
2016-12-19 13:47:47 +00:00
Alexander Alekhin
c028502f76
cmake: fix CMake error
...
"install DIRECTORY does not allow "COMPONENT" after PATTERN or REGEX"
2016-12-19 14:59:39 +03:00
Alexander Alekhin
fd054ea094
Merge pull request #906 from alalek:fix_build_freetype
2016-12-18 20:15:03 +00:00
Alexander Alekhin
af729bcf20
build(freetype): move 3rdparty include files from precomp.hpp
2016-12-18 18:56:45 +03:00
Alexander Alekhin
f82698b74e
Merge pull request #904 from alalek:unpack_into_binary
2016-12-17 12:23:54 +00:00
Alexander Alekhin
c82c887d10
cmake: unpack protobuf into binary directory
2016-12-16 18:57:25 +03:00
Alexander Alekhin
629d3910cc
misc: removed numeration in README to prevent excessive changes
2016-12-16 17:14:35 +03:00
Alexander Alekhin
eae4d78748
misc: minor fix in license header
2016-12-16 17:12:18 +03:00
Alexander Alekhin
88742e0ea7
Merge pull request #899 from mshabunin:pr718
2016-12-16 13:40:00 +00:00
Kumataro
cac3c9a221
Merge pull request #893 from Kumataro:freetype2
...
* Support freetype2
* Before call pkg_search_module() check it is available.
* If using libraries are unavailable, this module is shown in unavailable list.
* using ocv_define_modules() insted of target_link_libraries().
* Fix inner indentation in C++ namespaces
* Remove mImg from freetype2 and Create UserData class to refer in path drawing callbacks.
* to split interface and implementation details.
( and to avoid 3rd headers in public headers)
* PKG_CONFIG_FOUND is used instead of COMMAND okg_search_modules
* Update Document using Doxygen
* Add ocv_module_include_directories()
* Do no put pixels over image boundaries.
* Fix SIGSEGV (only valgrind) and missing text in top border line
* Fix trailing whitespace.
* Use Header File Macros
* Fix CMP0023 warning in cmake
* std::string to cv::String
* Fix trailing whitespace
* Change splitnumber from unsigned int to int to support python
* ocv_include_directories() should be define before ocv_define_module()
* Fix boundary problem in putTextBitmapBlend()
* Fix to draw an outline glyph which are on the boundary of image.
* Remove precomp.cpp
* Fix CMakeLists.txt to right order.
* Remove prototype definition of removed function.
* Add CV_Assert() where FreeType and Harfbuzz are called
* Add CV_Assert() to check InputOutputArray and line_type
2016-12-16 12:54:06 +02:00
Alexander Alekhin
cf82f5f812
Merge pull request #901 from spacetrain:fast_line_detector
2016-12-16 10:51:55 +00:00
Jinhan Lee
24b5aad400
Update ximgproc/README.md
2016-12-16 14:37:10 +09:00
Alexander Alekhin
db4250af75
Merge pull request #900 from alalek:icc
...
Build with ICC
2016-12-15 19:21:19 +02:00
Alexander Alekhin
1da7edcd19
cmake: disable ICC warnings from protobuf code
2016-12-15 17:08:44 +03:00
Alexander Alekhin
e40c23e985
saliency: disable for ICC
2016-12-15 17:08:35 +03:00
Vladimir
9d9c0f33b3
Added GOTURN tracker implementation and ALOV300++ dataset support
2016-12-15 16:07:14 +03:00
Maksim Shabunin
3d6f95abf7
Merge pull request #898 from paroj:aruco
2016-12-14 19:31:52 +00:00
Pavel Rojtberg
d07e70a48d
aruco: use Mat().copyTo idiom instead of for loops
2016-12-14 17:51:41 +01:00
Alexander Alekhin
92e59c7212
Merge pull request #897 from spacetrain:fast_line_detector
2016-12-14 02:45:18 +00:00
Jinhan Lee
4836a496c0
Add a group ximgproc_fast_line_detector
2016-12-13 15:16:59 +09:00
Alexander Alekhin
a2582d43b5
Merge pull request #892 from spacetrain:fast_line_detector
2016-12-12 19:25:31 +00:00
Alexander Alekhin
fa8839bbd5
Merge pull request #888 from catree:lucid
2016-12-12 12:17:28 +00:00
Alexander Alekhin
46f3b4d662
Merge pull request #884 from tucna:fuzzy_optimization
2016-12-12 12:12:19 +00:00
Jinhan Lee
a7dada153e
Fast line detector described in @Lee14.
...
This simple detector runs up to two times faster than LSD while achieving
competitive results. Please evaluate the algorithm with samples/fld_lines.cpp
2016-12-12 11:00:50 +09:00
Alexander Alekhin
da6ecd307a
Merge pull request #758 from TheDZhon:master
2016-12-09 15:26:52 +00:00
Pavel Vlasanek
e1f0f0c072
Fuzzy module optimization.
...
whitespace cleanup
test - possible fix
test update
2016-12-08 22:04:59 +01:00
Alexander Alekhin
e11951c1ac
Merge pull request #883 from sovrasov:structured_edge_det_rounding_fix
2016-12-08 15:08:00 +00:00
Eugene Mamin
8f04976f48
TLD accelerated with parallel_for_ helper
...
Using opencv/core/utility.hpp parallel primitives,
Intel TBB as backend is desirable.
2016-12-08 07:47:39 +03:00
catree
4820eff512
Add default value for LUCID feature. Add note about color image requirement.
...
Add CV_Assert for color image.
2016-12-07 11:47:59 +01:00
Alexander Alekhin
f427be6e93
Merge pull request #871 from paroj:cnn_3dobj
2016-12-07 09:21:34 +00:00
Vladislav Sovrasov
98f305e462
Fix codestyle in structured_edge_detection sample
2016-12-05 11:35:35 +03:00
Vladislav Sovrasov
50489dc0c8
Fix rounding in StructuredEdgeDetection
2016-12-05 11:35:30 +03:00
Alexander Alekhin
adff407368
Merge pull request #880 from alalek:text_test
2016-12-02 19:57:03 +00:00
Pavel Rojtberg
a7ad78b9be
cnn_3dobj: use ocv_add_testdata
2016-12-02 16:36:17 +01:00
Pavel Rojtberg
ba1973d2fe
update README
2016-12-02 13:53:04 +01:00
Pavel Rojtberg
eaee613af2
drop superficial demo_ prefix from sample filenames
2016-12-02 13:53:04 +01:00
Pavel Rojtberg
94552d9601
update test to actually available testdata.
...
note that reference was merely regenerated, not verified.
2016-12-02 13:53:04 +01:00
Pavel Rojtberg
7157e67497
drop cnn_3dobj_config.hpp. the HAVE_CAFFE check was pointless.
2016-12-02 13:53:04 +01:00
Pavel Rojtberg
cbd26a659d
cnn_3dobj: fix demo_sphereview_data
2016-12-02 13:53:04 +01:00
Pavel Rojtberg
4939973403
cnn_3dobj: fix include and allow compilation of samples
...
caffe/vision_layers.hpp is gone. also fix some warnings.
2016-12-02 12:24:47 +01:00
Alexander Alekhin
57648c2ca2
Merge pull request #876 from alalek:fix_contrib_872
2016-12-02 11:23:45 +00:00
Alexander Alekhin
bd619c55c1
Merge pull request #868 from sovrasov:line_descr_crash_fix
2016-12-02 06:52:00 +00:00
Alexander Alekhin
47fbdd0d66
Merge pull request #882 from alalek:fix_warnings
2016-12-01 16:43:04 +00:00
Alexander Alekhin
7cdf2191d0
win32 warnings
2016-12-01 17:22:41 +03:00
Alexander Alekhin
fde8a6abf9
Merge pull request #874 from StevenPuttemans:master
2016-11-30 18:18:16 +00:00
Alexander Alekhin
6f793bde8d
Merge pull request #861 from sovrasov:line_descr_matcher_fix_memleak
2016-11-30 12:03:56 +00:00
Alexander Alekhin
75adb698b0
Merge pull request #875 from sovrasov:fix_balance_white
2016-11-30 11:54:16 +00:00
StevenPuttemans
fb0cb3d3c4
added multiple thinning algorithms
...
added thinning sample
added thinning tests
2016-11-30 09:33:11 +01:00
Alexander Alekhin
e1f01bafa0
text: add simple test
2016-11-29 23:26:00 +03:00