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
Alexander Alekhin
22d2207d41
flann: fix build with MSVC /sdl option
2017-06-27 15:25:19 +03:00
Alexander Alekhin
9ee60dbff2
Merge pull request #8963 from likan999:fix-java-camera-view
2017-06-27 11:57:13 +00:00
dkurt
121789f78e
Fixed some bugs from Halide tests
2017-06-27 14:52:46 +03:00
Maksim Shabunin
32d4af36e2
Fixing some static analysis issues
2017-06-27 14:30:26 +03:00
Alexander Alekhin
b991665b5d
Merge pull request #9000 from alalek:fix_winpack_build
2017-06-27 11:10:46 +00:00
Alexander Alekhin
eff47b1260
Merge pull request #8997 from alalek:fix_build_warnings
2017-06-27 09:57:39 +00:00
Alexander Alekhin
04f8194327
Merge pull request #8996 from alalek:fix_viz_build
2017-06-27 09:57:20 +00:00
Alexander Alekhin
16d1bbf2ea
dnn: fix build
...
- winpack
- opencv_world
2017-06-27 09:07:01 +03:00
Alexander Alekhin
650830b9d6
build: eliminate warning
2017-06-27 08:16:40 +03:00
Alexander Alekhin
45cbc512bf
build: fix viz tests
...
removed test_precomp.cpp
2017-06-27 08:03:27 +03:00
Cartucho
fd91072990
Merge branch 'master' into compiling_java_code
2017-06-27 02:32:11 +01:00
tribta
3611396c0b
Compiling the Java tutorials codes using Apache Ant.
2017-06-27 02:30:22 +01:00
Vadim Pisarevsky
ef2e5a9f82
Merge pull request #8988 from sovrasov:repeat_src_eq_dst_fix
2017-06-26 21:58:26 +00:00
Vadim Pisarevsky
48924cd874
Merge pull request #8989 from alalek:move_dnn_module
2017-06-26 21:57:26 +00:00
Alexander Alekhin
986d27e49c
dnn: fix failed Torch tests
...
"Torch invalid argument 2: position must be smaller than LLONG_MAX"
These conditions are always true for "long position" argument.
2017-06-26 22:02:22 +03:00
Alexander Alekhin
b4f1102455
Merge pull request #8995 from savuor:fix/trace_ovx_build
2017-06-26 18:47:31 +00:00
Rostislav Vasilikhin
e63feba8e2
fixed typo
2017-06-26 20:19:18 +03:00
Alexander Alekhin
93091ba203
dnn: AVX2 fix invalid unaligned read
2017-06-26 19:48:42 +03:00
Alexander Alekhin
623de337e8
dnn: fix build warnings
2017-06-26 19:48:42 +03:00
