Maksim Shabunin
638a01a014
Merge pull request #9038 from mshabunin:fix-static-4
2017-06-30 10:39:36 +00:00
Maksim Shabunin
90d2f8b5fe
Merge pull request #9035 from alalek:dnn_fix_halide_tests
2017-06-30 10:29:13 +00:00
Alexander Alekhin
a6d88b4d1f
Merge pull request #9044 from neilsh-msft:WinRTBuild
2017-06-30 10:14:48 +00:00
Maksim Shabunin
e0393f8557
Fixed some issues found by static analysis (4th round)
2017-06-30 12:26:53 +03:00
Neil Shipp
3f72ff215e
Fix WinRT build breaks in highgui and videoio.
2017-06-29 17:56:09 -07:00
Alexander Alekhin
64b483c65b
Merge pull request #9033 from alalek:sgbm_disable_perf_in_debug
2017-06-29 16:16:55 +00:00
Alexander Alekhin
0c08094536
Merge pull request #9039 from arrybn:disable_caffe_parser_logs
2017-06-29 15:50:05 +00:00
Aleksandr Rybnikov
fab4f4b9d5
Disabled logging in caffe parser in release
2017-06-29 17:36:48 +03:00
Alexander Alekhin
72a765d766
dnn: fix compilation of Halide tests
2017-06-29 16:36:34 +03:00
Vadim Pisarevsky
2ac819018d
Merge pull request #9014 from sovrasov:compare_scalars_fix
2017-06-29 11:14:44 +00:00
Vadim Pisarevsky
5f1b6ee889
Merge pull request #9017 from sovrasov:parallel_for_cxx11
2017-06-29 11:12:57 +00:00
Vadim Pisarevsky
27c7ef28a7
Merge pull request #9020 from arrybn:fix_googlenet_python_sample
2017-06-29 11:10:46 +00:00
Vadim Pisarevsky
ac49a17a82
Merge pull request #9022 from dkurt:keep_conv_weights_for_halide
2017-06-29 11:09:17 +00:00
Vadim Pisarevsky
fb1dcdd17d
Merge pull request #9029 from alalek:dnn_cleanup_torch
2017-06-29 11:07:35 +00:00
Alexander Alekhin
b84cbeec8c
calib3d(perf): disable SGBM tests in debug mode
...
because they are too long (takes minutes)
2017-06-29 12:49:47 +03:00
Maksim Shabunin
f6a33c4826
Merge pull request #9031 from huangqinjin:gtk
2017-06-29 07:59:56 +00:00
Maksim Shabunin
f1a56cb4b7
Merge pull request #9028 from alalek:dnn_experimental_namespace
2017-06-29 07:37:04 +00:00
Maksim Shabunin
9087778b06
Merge pull request #8895 from lewisjb:python-docstrings
2017-06-29 07:35:33 +00:00
Maksim Shabunin
ace0701a46
Merge pull request #9019 from alalek:dnn_trace
2017-06-29 07:33:46 +00:00
Maksim Shabunin
ca9622145e
Merge pull request #9026 from alalek:remove_danger_define
2017-06-29 07:28:38 +00:00
Maksim Shabunin
9d4cd352af
Merge pull request #8903 from StevenPuttemans:fix_models
2017-06-29 07:27:49 +00:00
huangqinjin
aa75b6067c
gtk: check NULL before unref
2017-06-29 11:35:34 +08:00
Alexander Alekhin
511e50c19c
dnn: cleanup torch integration code
2017-06-28 21:49:37 +00:00
Alexander Alekhin
324851882a
Merge pull request #9025 from mshabunin:fix-static-3
2017-06-28 20:50:21 +00:00
Alexander Alekhin
da0960321b
dnn: added "hidden" experimental namespace
...
Main purpose of this namespace is to avoid using of incompatible
binaries that will cause applications crashes.
This additional namespace will not impact "Source code API".
This change allows to maintain ABI checks (with easy filtering out).
2017-06-28 20:36:57 +00:00
Alexander Alekhin
b9a2d7b600
build: remove #define to prevent unexpected impact on user applications
2017-06-28 18:50:55 +03:00
Maksim Shabunin
a769d69a9d
Fixed several issues found by static analysis
2017-06-28 18:06:18 +03:00
dkurt
b46f5b1b38
Align convolutional layer weights separately from origin ones
2017-06-28 17:05:56 +03:00
Vladislav Sovrasov
08db55fb62
core: add CV_CXX_11 flag to cvdef.h
2017-06-28 16:17:53 +03:00
Vladislav Sovrasov
3c748ccf10
core: add an ability to use cxx11 lambda as a parallel_for_ body
2017-06-28 16:16:05 +03:00
Alexander Alekhin
20f603a217
Merge pull request #8993 from Cartucho:compiling_java_code
2017-06-28 12:26:29 +00:00
Tong Ke
8088d6785a
Merge pull request #8585 from tonyke1993:ap3p
...
Enable p3p and ap3p in solvePnPRansac (#8585 )
* add paper info
* allow p3p and ap3p being RANSAC kernel
* keep previous code
* apply catrees comment
* fix getMat
* add comment
* add solvep3p test
* test return value
* fix warnings
2017-06-28 15:27:30 +03:00
Aleksandr Rybnikov
b8b8047448
Fixed python sample for googlenet in dnn
2017-06-28 15:07:56 +03:00
Vladislav Sovrasov
35a1ecef2a
core: fix infinite recursion in compare
2017-06-28 15:00:52 +03:00
Alexander Alekhin
ed10383359
dnn: added trace macros
2017-06-28 14:57:26 +03:00
Alexander Alekhin
dcf3d988d5
Merge pull request #8543 from csukuangfj:fix-String
2017-06-28 11:20:29 +00:00
Vadim Pisarevsky
7567eb8433
Merge pull request #8953 from mattmyne:cocoa_window_32_64_objc_fix
2017-06-28 10:56:21 +00:00
Vadim Pisarevsky
c5faa9aefa
Merge pull request #9013 from arrybn:ssd_last_layers_optim
2017-06-28 10:38:55 +00:00
tribta
98849151a2
formating style and making changes accordingly to review
2017-06-28 11:05:18 +01:00
Vadim Pisarevsky
bbb14d3746
Merge pull request #9003 from dkurt:halide_bug_fixes
2017-06-28 08:48:27 +00:00
Aleksandr Rybnikov
ec321e651f
Removed usage of std::map in DetectionOutput layer
2017-06-28 11:31:38 +03:00
Vadim Pisarevsky
2ae849091c
Merge pull request #9009 from alalek:fix_dnn_initialization
2017-06-28 08:26:29 +00:00
Vadim Pisarevsky
8b3d6603d5
another round of dnn optimization ( #9011 )
...
* another round of dnn optimization:
* increased malloc alignment across OpenCV from 16 to 64 bytes to make it AVX2 and even AVX-512 friendly
* improved SIMD optimization of pooling layer, optimized average pooling
* cleaned up convolution layer implementation
* made activation layer "attacheable" to all other layers, including fully connected and addition layer.
* fixed bug in the fusion algorithm: "LayerData::consumers" should not be cleared, because it desctibes the topology.
* greatly optimized permutation layer, which improved SSD performance
* parallelized element-wise binary/ternary/... ops (sum, prod, max)
* also, added missing copyrights to many of the layer implementation files
* temporarily disabled (again) the check for intermediate blobs consistency; fixed warnings from various builders
2017-06-28 11:15:22 +03:00
Alexander Alekhin
00dd433368
dnn: fix LayerFactory initialization
2017-06-27 23:19:53 +03:00
Alexander Alekhin
82ec76c123
Merge pull request #8990 from mshabunin:fix-static-2
2017-06-27 14:53:26 +00:00
Maksim Shabunin
1c4fb418cf
Merge pull request #9007 from alalek:issue_9001
2017-06-27 14:38:43 +00:00
Maksim Shabunin
58c5be0002
Merge pull request #9006 from alalek:videoio_synchronize_ffmpeg_open
2017-06-27 14:19:07 +00:00
Vadim Pisarevsky
9e9f57c139
Merge pull request #9004 from alalek:fix_build_flann_sdl
2017-06-27 14:05:23 +00:00
Alexander Alekhin
f8a75c4361
dispatch: added CV_TRY_${OPT} macro, fix dnn build
...
- 1: OPT is available directly or via dispatcher
- 0: optimization is not compiled at all
2017-06-27 17:05:15 +03:00
Alexander Alekhin
a87d6b098f
videoio: synchronize ffmpeg open() call
2017-06-27 16:32:32 +03:00
