platform/upstream/opencv.git
6 years agopython: 'cv2.' -> 'cv.' via 'import cv2 as cv'
Alexander Alekhin [Mon, 11 Dec 2017 09:55:03 +0000 (12:55 +0300)]
python: 'cv2.' -> 'cv.' via 'import cv2 as cv'

6 years agoMerge pull request #10112 from haritha1313:bugfix_doc1
Alexander Alekhin [Sun, 10 Dec 2017 20:54:29 +0000 (20:54 +0000)]
Merge pull request #10112 from haritha1313:bugfix_doc1

6 years agocrop parameter usage in blobFromImage() calls
Haritha [Thu, 7 Dec 2017 06:42:29 +0000 (12:12 +0530)]
crop parameter usage in blobFromImage() calls

6 years agoMerge pull request #10260 from native-api:ffmpeg_load_from_package
Alexander Alekhin [Fri, 8 Dec 2017 20:58:16 +0000 (20:58 +0000)]
Merge pull request #10260 from native-api:ffmpeg_load_from_package

6 years agoMerge pull request #10266 from ChristofKaufmann:warp_documentation
Vadim Pisarevsky [Fri, 8 Dec 2017 18:48:48 +0000 (18:48 +0000)]
Merge pull request #10266 from ChristofKaufmann:warp_documentation

6 years agoMerge pull request #10268 from dkurt:fix_scale_layer
Vadim Pisarevsky [Fri, 8 Dec 2017 18:46:49 +0000 (18:46 +0000)]
Merge pull request #10268 from dkurt:fix_scale_layer

6 years agoGetModuleFileName() doesn't reset last error on success
Ivan Pozdeev [Thu, 7 Dec 2017 21:12:08 +0000 (00:12 +0300)]
GetModuleFileName() doesn't reset last error on success

6 years agoScale layer in case of 2D inputs
Dmitry Kurtaev [Fri, 8 Dec 2017 14:34:59 +0000 (17:34 +0300)]
Scale layer in case of 2D inputs

6 years agoMerge pull request #10172 from ElenaGvozdeva:eg/HAL_sobel
Elena Gvozdeva [Fri, 8 Dec 2017 13:36:24 +0000 (16:36 +0300)]
Merge pull request #10172 from ElenaGvozdeva:eg/HAL_sobel

* add HAL for SobelFilter
* add HAL for pyrDown
* add HAL for Scharr

6 years agoMerge pull request #10253 from alalek:cmake_disable_optimization
Alexander Alekhin [Fri, 8 Dec 2017 11:35:11 +0000 (11:35 +0000)]
Merge pull request #10253 from alalek:cmake_disable_optimization

6 years agodoc: Add type restriction note for geometric transformations
Christof Kaufmann [Fri, 8 Dec 2017 11:33:51 +0000 (12:33 +0100)]
doc: Add type restriction note for geometric transformations

This is added according to #7862.

6 years agoMerge pull request #10255 from dkurt:dnn_roi_pooling
Alexander Alekhin [Fri, 8 Dec 2017 11:20:07 +0000 (11:20 +0000)]
Merge pull request #10255 from dkurt:dnn_roi_pooling

6 years agoMerge pull request #10264 from terfendail:createsamples
Alexander Alekhin [Fri, 8 Dec 2017 11:02:49 +0000 (11:02 +0000)]
Merge pull request #10264 from terfendail:createsamples

6 years agoupdated createsamples app utility functions to new c++ API from old c
Vitaly Tuzov [Fri, 8 Dec 2017 09:23:44 +0000 (12:23 +0300)]
updated createsamples app utility functions to new c++ API from old c

6 years agoMerge pull request #10262 from Riyuzakii:10209
Alexander Alekhin [Fri, 8 Dec 2017 08:49:10 +0000 (08:49 +0000)]
Merge pull request #10262 from Riyuzakii:10209

6 years agoRemove typo/repeated code block
Riyuzakii [Fri, 8 Dec 2017 06:40:00 +0000 (12:10 +0530)]
Remove typo/repeated code block

6 years agoROIPooling layer
Dmitry Kurtaev [Mon, 4 Dec 2017 15:45:30 +0000 (18:45 +0300)]
ROIPooling layer

6 years agoMerge pull request #8198 from mshabunin:cmakeex
Alexander Alekhin [Thu, 7 Dec 2017 15:02:41 +0000 (15:02 +0000)]
Merge pull request #8198 from mshabunin:cmakeex

6 years agocmake: CV_DISABLE_OPTIMIZATION disables IPP, OpenCL, Eigen and LAPACK too
Alexander Alekhin [Thu, 7 Dec 2017 14:54:37 +0000 (17:54 +0300)]
cmake: CV_DISABLE_OPTIMIZATION disables IPP, OpenCL, Eigen and LAPACK too

6 years agoMerge pull request #10243 from berak:dnn_fix_mobilenet_sample
Alexander Alekhin [Thu, 7 Dec 2017 09:54:18 +0000 (09:54 +0000)]
Merge pull request #10243 from berak:dnn_fix_mobilenet_sample

6 years agoMerge pull request #10244 from dkurt:issue_10239
Alexander Alekhin [Thu, 7 Dec 2017 09:43:16 +0000 (09:43 +0000)]
Merge pull request #10244 from dkurt:issue_10239

6 years agoFix conv/deconv/fc layers FLOPS computation
Dmitry Kurtaev [Wed, 6 Dec 2017 18:58:36 +0000 (21:58 +0300)]
Fix conv/deconv/fc layers FLOPS computation

6 years agoAdded option to disable gc-sections flag
Maksim Shabunin [Thu, 7 Dec 2017 07:28:58 +0000 (10:28 +0300)]
Added option to disable gc-sections flag

6 years agoHid symbols in static builds, added LTO flags, removed exports from ts
Pavel Rojtberg [Wed, 25 Jan 2017 11:20:57 +0000 (12:20 +0100)]
Hid symbols in static builds, added LTO flags, removed exports from ts

6 years agoMerge pull request #10241 from alalek:ios_fix_build_warnings
Alexander Alekhin [Wed, 6 Dec 2017 16:26:51 +0000 (16:26 +0000)]
Merge pull request #10241 from alalek:ios_fix_build_warnings

6 years agoMerge pull request #10228 from pengli:dnn_new
Alexander Alekhin [Wed, 6 Dec 2017 15:50:12 +0000 (15:50 +0000)]
Merge pull request #10228 from pengli:dnn_new

6 years agoMerge pull request #10240 from alalek:dnn_perf_ssd
Alexander Alekhin [Wed, 6 Dec 2017 15:41:18 +0000 (15:41 +0000)]
Merge pull request #10240 from alalek:dnn_perf_ssd

6 years agodetection_output layer ocl implementation
Li Peng [Thu, 30 Nov 2017 12:43:49 +0000 (20:43 +0800)]
detection_output layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoregion layer ocl implementation
Li Peng [Wed, 29 Nov 2017 14:35:02 +0000 (22:35 +0800)]
region layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoreorg layer ocl implementation
Li Peng [Wed, 29 Nov 2017 13:09:31 +0000 (21:09 +0800)]
reorg layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agosupport axis in concat layer ocl path
Li Peng [Tue, 28 Nov 2017 15:40:46 +0000 (23:40 +0800)]
support axis in concat layer ocl path

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoreshape layer ocl implementation
Li Peng [Tue, 5 Dec 2017 13:58:30 +0000 (21:58 +0800)]
reshape layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agodnn: add a check for webcam properties in ssd_mobilenet sample
berak [Wed, 6 Dec 2017 13:16:37 +0000 (14:16 +0100)]
dnn: add a check for webcam properties in ssd_mobilenet sample

6 years agoMerge pull request #10236 from alalek:ocl_skip_unstable_tests
Alexander Alekhin [Wed, 6 Dec 2017 13:48:51 +0000 (13:48 +0000)]
Merge pull request #10236 from alalek:ocl_skip_unstable_tests

6 years agodnn: SSD performance test
Alexander Alekhin [Wed, 6 Dec 2017 11:51:05 +0000 (14:51 +0300)]
dnn: SSD performance test

6 years agobuild: fix iOS warnings with armv7s, switch precommit armv7 -> armv7s
Alexander Alekhin [Wed, 6 Dec 2017 12:49:45 +0000 (15:49 +0300)]
build: fix iOS warnings with armv7s, switch precommit armv7 -> armv7s

6 years agoocl: skip unstable tests
Alexander Alekhin [Wed, 6 Dec 2017 09:58:13 +0000 (12:58 +0300)]
ocl: skip unstable tests

during pre-commit testing

6 years agoMerge pull request #10024 from iago-suarez:bugfix-lsd-multiple-imgs-issue#10023
Vadim Pisarevsky [Wed, 6 Dec 2017 09:01:37 +0000 (09:01 +0000)]
Merge pull request #10024 from iago-suarez:bugfix-lsd-multiple-imgs-issue#10023

6 years agoMerge pull request #10058 from ElenaGvozdeva:eg/HAL
Vadim Pisarevsky [Tue, 5 Dec 2017 20:56:24 +0000 (20:56 +0000)]
Merge pull request #10058 from ElenaGvozdeva:eg/HAL

6 years agoMerge pull request #10226 from vermashresth:bugfix
Vadim Pisarevsky [Tue, 5 Dec 2017 20:53:53 +0000 (20:53 +0000)]
Merge pull request #10226 from vermashresth:bugfix

6 years agoMerge pull request #10221 from dkurt:non_spatial_torch_layers
Vadim Pisarevsky [Tue, 5 Dec 2017 20:52:00 +0000 (20:52 +0000)]
Merge pull request #10221 from dkurt:non_spatial_torch_layers

6 years agoMerge pull request #10207 from cabelo:cabelo-opencv
Alexander Alekhin [Tue, 5 Dec 2017 18:23:23 +0000 (21:23 +0300)]
Merge pull request #10207 from cabelo:cabelo-opencv

Repair: incorrect display of class in DNN

6 years agofixed createsamples info message
Shresth Verma [Sun, 3 Dec 2017 21:46:22 +0000 (03:16 +0530)]
fixed createsamples info message

6 years agoMerge pull request #10218 from catree:fix_cuda_integral
Alexander Alekhin [Tue, 5 Dec 2017 15:10:00 +0000 (15:10 +0000)]
Merge pull request #10218 from catree:fix_cuda_integral

6 years agopermute layer ocl implementation
Li Peng [Tue, 5 Dec 2017 13:58:57 +0000 (21:58 +0800)]
permute layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10230 from vpisarev:macos_detect_lapack
Alexander Alekhin [Tue, 5 Dec 2017 13:48:23 +0000 (13:48 +0000)]
Merge pull request #10230 from vpisarev:macos_detect_lapack

6 years agoFix pointPolygonTest for large coordinate values (#10222)
Juha Reunanen [Tue, 5 Dec 2017 12:49:44 +0000 (14:49 +0200)]
Fix pointPolygonTest for large coordinate values (#10222)

* Add test that fails

* Fix integer pointPolygonTest for large coordinate values

* Review fixes:
- change type from long long to int64
- move test code to test_contours.cpp, and make it C++98 compliant

* Hopefully fix compiler error by using push_back instead of emplace_back

6 years agofixed native Lapack detection script on Mac/iOS (where native Lapack is a part of...
Vadim Pisarevsky [Tue, 5 Dec 2017 12:45:37 +0000 (15:45 +0300)]
fixed native Lapack detection script on Mac/iOS (where native Lapack is a part of Accelerate framework)

6 years agoMerge pull request #10223 from vpisarev:ocl_mac_fixes
Vadim Pisarevsky [Tue, 5 Dec 2017 10:32:28 +0000 (13:32 +0300)]
Merge pull request #10223 from vpisarev:ocl_mac_fixes

* fixed OpenCL functions on Mac, so that the tests pass

* fixed compile warnings; temporarily disabled OCL branch of TV L1 optical flow on mac

* fixed other few warnings on macos

6 years agoRepair: incorrect display of class name
alessandro faria [Thu, 30 Nov 2017 22:14:40 +0000 (20:14 -0200)]
Repair: incorrect display of class name

6 years agoMerge pull request #10176 from sturkmen72:update_train_hog
Alexander Alekhin [Mon, 4 Dec 2017 16:24:41 +0000 (16:24 +0000)]
Merge pull request #10176 from sturkmen72:update_train_hog

6 years agoMerge pull request #10216 from dkurt:dnn_face_detector_extra_paddings
Vadim Pisarevsky [Mon, 4 Dec 2017 13:14:51 +0000 (13:14 +0000)]
Merge pull request #10216 from dkurt:dnn_face_detector_extra_paddings

6 years agonn.BatchNormalization and nn.Dropout layers from Torch
Dmitry Kurtaev [Mon, 4 Dec 2017 09:57:21 +0000 (12:57 +0300)]
nn.BatchNormalization and nn.Dropout layers from Torch

6 years agoFix CUDA integral.
catree [Mon, 4 Dec 2017 01:22:52 +0000 (02:22 +0100)]
Fix CUDA integral.

6 years agoUpdate train_HOG.cpp
Suleyman TURKMEN [Sat, 18 Nov 2017 22:41:24 +0000 (01:41 +0300)]
Update train_HOG.cpp

6 years agoExtra paddings for face detector layers
Dmitry Kurtaev [Sun, 3 Dec 2017 14:03:31 +0000 (17:03 +0300)]
Extra paddings for face detector layers

6 years agoMerge pull request #10212 from alalek:ocl_cache_with_address_bits
Alexander Alekhin [Fri, 1 Dec 2017 15:42:28 +0000 (15:42 +0000)]
Merge pull request #10212 from alalek:ocl_cache_with_address_bits

6 years agoMerge pull request #10199 from alalek:fix_calib3d_fisheye_rectify_test
Alexander Alekhin [Fri, 1 Dec 2017 15:26:50 +0000 (15:26 +0000)]
Merge pull request #10199 from alalek:fix_calib3d_fisheye_rectify_test

6 years agoremove matrix release
elenagvo [Tue, 28 Nov 2017 14:11:16 +0000 (17:11 +0300)]
remove matrix release

6 years agofix the parameters order
elenagvo [Thu, 23 Nov 2017 10:46:32 +0000 (13:46 +0300)]
fix the parameters order

6 years agofix accelerators order
elenagvo [Tue, 14 Nov 2017 09:57:02 +0000 (12:57 +0300)]
fix accelerators order

6 years agoremove complex data structs
elenagvo [Mon, 13 Nov 2017 14:43:32 +0000 (17:43 +0300)]
remove complex data structs

6 years agocall HAL for GaussianBlur is fixed
elenagvo [Fri, 10 Nov 2017 08:39:44 +0000 (11:39 +0300)]
call HAL for GaussianBlur is fixed

6 years agoadd perf test for boxFilter CV8U to CV16U
elenagvo [Thu, 9 Nov 2017 11:13:55 +0000 (14:13 +0300)]
add perf test for boxFilter CV8U to CV16U

6 years agoadd hal for GaussianBlur
elenagvo [Wed, 1 Nov 2017 13:45:07 +0000 (16:45 +0300)]
add hal for GaussianBlur

6 years agoadd HAL for BoxFilter
elenagvo [Wed, 1 Nov 2017 09:57:53 +0000 (12:57 +0300)]
add HAL for BoxFilter

6 years agoocl: fix usage of invalid OpenCL cache on mixed 64/32-bit platforms
Alexander Alekhin [Fri, 1 Dec 2017 11:02:20 +0000 (14:02 +0300)]
ocl: fix usage of invalid OpenCL cache on mixed 64/32-bit platforms

Observed during launch of 32/64-bit applications on Windows.
Added '32-bit' prefix for 32-bit OpenCL devices. No prefix on 64-bit configurations.

6 years agoMerge pull request #10060 from allnes:videoio_tests_backend
Maksim Shabunin [Fri, 1 Dec 2017 09:38:19 +0000 (09:38 +0000)]
Merge pull request #10060 from allnes:videoio_tests_backend

6 years agocalib3d: fix fisheye stereoRectify test
Alexander Alekhin [Wed, 29 Nov 2017 16:20:55 +0000 (19:20 +0300)]
calib3d: fix fisheye stereoRectify test

- don't write into testdata directory
- check matrices instead of result images

6 years agoRevert "Adapted estimateNewCameraMatrix to make it work with pincushion-like distortion."
Alexander Alekhin [Thu, 30 Nov 2017 12:38:01 +0000 (15:38 +0300)]
Revert "Adapted estimateNewCameraMatrix to make it work with pincushion-like distortion."

This reverts commit 5384a2205a01c413dfd2c1c86675f093885f9157.

6 years agoMerge pull request #10171 from ElenaGvozdeva:Threshold
Vadim Pisarevsky [Thu, 30 Nov 2017 10:02:47 +0000 (10:02 +0000)]
Merge pull request #10171 from ElenaGvozdeva:Threshold

6 years agoMerge pull request #10200 from alalek:cmake_fix_dependencies
Vadim Pisarevsky [Thu, 30 Nov 2017 10:00:51 +0000 (10:00 +0000)]
Merge pull request #10200 from alalek:cmake_fix_dependencies

6 years agoMerge pull request #10190 from seiko2plus:issue10189
Alexander Alekhin [Thu, 30 Nov 2017 07:16:12 +0000 (07:16 +0000)]
Merge pull request #10190 from seiko2plus:issue10189

6 years agocmake: fix WITH_VTK usage
Alexander Alekhin [Wed, 29 Nov 2017 13:52:42 +0000 (16:52 +0300)]
cmake: fix WITH_VTK usage

'WITH_' variables is intended to enable CMake scripts with some autodetection logic.
'WITH_' can be off, but components is really enabled via command-line options
with proper variables setup (including 'HAVE_').

6 years agocmake: update BUILD_DOCS / ENABLE_PYLINT options, add BUILD_JAVA
Alexander Alekhin [Wed, 29 Nov 2017 13:49:24 +0000 (16:49 +0300)]
cmake: update BUILD_DOCS / ENABLE_PYLINT options, add BUILD_JAVA

6 years agocmake: don't try to detect Python libraries for iOS builds
Alexander Alekhin [Wed, 29 Nov 2017 13:25:11 +0000 (16:25 +0300)]
cmake: don't try to detect Python libraries for iOS builds

Python executable is not used to generate code for iOS builds

6 years agocmake: don't use Eigen auto-detection in cross-compiling modes
Alexander Alekhin [Wed, 29 Nov 2017 13:21:00 +0000 (16:21 +0300)]
cmake: don't use Eigen auto-detection in cross-compiling modes

Sometimes it tries to use host '/usr/include' directory and garbages
compiler flags with invalid '-I /usr/include'

6 years agoMerge pull request #10184 from catree:solvePnP_iterative_guess_3_pts
Alexander Alekhin [Wed, 29 Nov 2017 18:24:04 +0000 (18:24 +0000)]
Merge pull request #10184 from catree:solvePnP_iterative_guess_3_pts

6 years agoMerge pull request #10194 from mshabunin:fix-gcc7-warnings
Alexander Alekhin [Wed, 29 Nov 2017 18:22:40 +0000 (18:22 +0000)]
Merge pull request #10194 from mshabunin:fix-gcc7-warnings

6 years agoMerge pull request #10193 from alalek:fix_ios_cmake_3.10
Alexander Alekhin [Wed, 29 Nov 2017 16:32:31 +0000 (16:32 +0000)]
Merge pull request #10193 from alalek:fix_ios_cmake_3.10

6 years agoFixed/disabled warnings produced by GCC 7
Maksim Shabunin [Wed, 29 Nov 2017 13:51:50 +0000 (16:51 +0300)]
Fixed/disabled warnings produced by GCC 7

6 years agocmake: fix iOS build with CMake 3.10
Alexander Alekhin [Wed, 29 Nov 2017 12:57:32 +0000 (15:57 +0300)]
cmake: fix iOS build with CMake 3.10

6 years agoMerge pull request #10164 from pengli:dnn
Alexander Alekhin [Wed, 29 Nov 2017 12:05:10 +0000 (12:05 +0000)]
Merge pull request #10164 from pengli:dnn

6 years agoMerge pull request #10180 from alalek:ocl_avoid_unnecessary_initialization
Vadim Pisarevsky [Wed, 29 Nov 2017 11:42:22 +0000 (11:42 +0000)]
Merge pull request #10180 from alalek:ocl_avoid_unnecessary_initialization

6 years agoMerge pull request #10182 from romanc:fix/divByZeroSimdDouble
Vadim Pisarevsky [Wed, 29 Nov 2017 10:01:58 +0000 (10:01 +0000)]
Merge pull request #10182 from romanc:fix/divByZeroSimdDouble

6 years agoMerge pull request #10170 from LaurentBerger:Issue10166
Vadim Pisarevsky [Wed, 29 Nov 2017 09:51:20 +0000 (09:51 +0000)]
Merge pull request #10170 from LaurentBerger:Issue10166

6 years agocore:ppc Fixed compilation with xlc, clang.
Sayed Adel [Wed, 29 Nov 2017 07:38:55 +0000 (07:38 +0000)]
core:ppc Fixed compilation with xlc, clang.

- Use EXPECT_TRUE instead of EXPECT_EQ for comparing NULL in xlc
- Added support for int64 to vec_promote in xlc, clang
- Fixed v_rotate_right in xlc

6 years agoMerge pull request #10185 from alalek:fix_build_xcode_9.1
Alexander Alekhin [Tue, 28 Nov 2017 18:42:17 +0000 (18:42 +0000)]
Merge pull request #10185 from alalek:fix_build_xcode_9.1

6 years agobuild: eliminate Xcode 9.1 warnings
Alexander Alekhin [Tue, 28 Nov 2017 14:03:40 +0000 (17:03 +0300)]
build: eliminate Xcode 9.1 warnings

- 3rdparty/libjasper/jas_getopt.c:129:25: warning: this function declaration is not a prototype [-Wstrict-prototypes]
- clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument]

6 years agofix threshold HAL
elenagvo [Tue, 28 Nov 2017 14:42:29 +0000 (17:42 +0300)]
fix threshold HAL

6 years agoAllow to use 3 points in SolvePnP if SOLVEPNP_ITERATIVE and useExtrinsicGuess==true...
catree [Tue, 28 Nov 2017 14:04:59 +0000 (15:04 +0100)]
Allow to use 3 points in SolvePnP if SOLVEPNP_ITERATIVE and useExtrinsicGuess==true. Add bibtex citations for P3P. Update SolvPnP tests.

6 years agoMerge pull request #9986 from terfendail:drawcontours_docfix
Vadim Pisarevsky [Tue, 28 Nov 2017 13:19:05 +0000 (13:19 +0000)]
Merge pull request #9986 from terfendail:drawcontours_docfix

6 years agoMerge pull request #10141 from LaurentBerger:MLP_ReLU
Vadim Pisarevsky [Tue, 28 Nov 2017 13:17:43 +0000 (13:17 +0000)]
Merge pull request #10141 from LaurentBerger:MLP_ReLU

6 years agoMerge pull request #10149 from mshabunin:fix-saturate-intrin
Vadim Pisarevsky [Tue, 28 Nov 2017 13:17:10 +0000 (13:17 +0000)]
Merge pull request #10149 from mshabunin:fix-saturate-intrin

6 years agodefine adaptiveMethod and thresholdType for HAL
elenagvo [Tue, 28 Nov 2017 12:55:58 +0000 (15:55 +0300)]
define adaptiveMethod and thresholdType for HAL

6 years agoFixes Issue #10181
Roman Cattaneo [Tue, 28 Nov 2017 12:48:40 +0000 (13:48 +0100)]
Fixes Issue #10181

This PR fixes incorrect division by zero handling in template
specialization of `Div_SIMD` for type `double`.

6 years agoocl: avoid unnecessary loading/initializing OpenCL subsystem
Alexander Alekhin [Fri, 24 Nov 2017 14:34:02 +0000 (17:34 +0300)]
ocl: avoid unnecessary loading/initializing OpenCL subsystem

If there are no OpenCL/UMat methods calls from application.

OpenCL subsystem is initialized:
- haveOpenCL() is called from application
- useOpenCL() is called from application
- access to OpenCL allocator: UMat is created (empty UMat is ignored) or UMat <-> Mat conversions are called

Don't call OpenCL functions if OPENCV_OPENCL_RUNTIME=disabled
(independent from OpenCL linkage type)

6 years agoMerge pull request #10124 from zhongwuzw:master
Vadim Pisarevsky [Tue, 28 Nov 2017 10:53:00 +0000 (10:53 +0000)]
Merge pull request #10124 from zhongwuzw:master

6 years agoMerge pull request #10173 from dkurt:update_priorbox_layer
Vadim Pisarevsky [Tue, 28 Nov 2017 10:51:06 +0000 (10:51 +0000)]
Merge pull request #10173 from dkurt:update_priorbox_layer

6 years agoMerge pull request #10152 from alalek:py_fix_isalgorithm
Vadim Pisarevsky [Tue, 28 Nov 2017 10:46:41 +0000 (10:46 +0000)]
Merge pull request #10152 from alalek:py_fix_isalgorithm