platform/upstream/opencv.git
6 years agojs: fix tests (qunit -> node-qunit)
Alexander Alekhin [Wed, 15 Nov 2017 20:46:38 +0000 (20:46 +0000)]
js: fix tests (qunit -> node-qunit)

6 years agoMerge pull request #10097 from wzw-intel:tuning_time
Alexander Alekhin [Thu, 16 Nov 2017 09:34:42 +0000 (09:34 +0000)]
Merge pull request #10097 from wzw-intel:tuning_time

6 years agodnn(ocl4dnn): Fix wrong measurement for tuning time
Wu Zhiwen [Thu, 16 Nov 2017 02:40:23 +0000 (10:40 +0800)]
dnn(ocl4dnn): Fix wrong measurement for tuning time

convolution kernel use default queue to run, so that ocl::Timer
, to measure the kernel run time, should use the default queue too.
Also remove useless parameter for convolve()

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
6 years agoMerge pull request #10083 from alalek:core_intrinsics_load_low
Alexander Alekhin [Wed, 15 Nov 2017 16:08:56 +0000 (16:08 +0000)]
Merge pull request #10083 from alalek:core_intrinsics_load_low

6 years agocore(intrinsics): v_load_low
Alexander Alekhin [Mon, 13 Nov 2017 11:14:08 +0000 (14:14 +0300)]
core(intrinsics): v_load_low

6 years agoMerge pull request #10056 from akhilesh-k:master
Akhilesh Kumar [Tue, 14 Nov 2017 10:44:01 +0000 (16:14 +0530)]
Merge pull request #10056 from akhilesh-k:master

Added Python setup docs for Ubuntu Machines (#10056)

6 years agoMerge pull request #10073 from alalek:cmake_fix_overiding_compile_options
Alexander Alekhin [Mon, 13 Nov 2017 11:26:13 +0000 (11:26 +0000)]
Merge pull request #10073 from alalek:cmake_fix_overiding_compile_options

6 years agoMerge pull request #10068 from paroj:fs_doc
Alexander Alekhin [Mon, 13 Nov 2017 09:18:42 +0000 (09:18 +0000)]
Merge pull request #10068 from paroj:fs_doc

6 years agocmake: drop amending of compilation options
Alexander Alekhin [Sun, 12 Nov 2017 08:12:27 +0000 (11:12 +0300)]
cmake: drop amending of compilation options

Allow to specify optimization level via CMake.

6 years agoMerge pull request #10072 from sturkmen72:upd_lsd_cpp
Alexander Alekhin [Sun, 12 Nov 2017 07:11:34 +0000 (07:11 +0000)]
Merge pull request #10072 from sturkmen72:upd_lsd_cpp

6 years agoUpdate lsd.cpp
Suleyman TURKMEN [Sat, 11 Nov 2017 08:59:55 +0000 (11:59 +0300)]
Update lsd.cpp

6 years agoMerge pull request #10050 from floe/android-studio-3.3.1
Florian Echtler [Fri, 10 Nov 2017 19:35:32 +0000 (20:35 +0100)]
Merge pull request #10050 from floe/android-studio-3.3.1

Add Android Mat constructor with support for native buffer (#10050)

6 years agoMerge pull request #10057 from LaurentBerger:ParaCalcError
Alexander Alekhin [Fri, 10 Nov 2017 19:04:36 +0000 (19:04 +0000)]
Merge pull request #10057 from LaurentBerger:ParaCalcError

6 years agoFileStorage: use copydoc to add base64 info to constructor
Pavel Rojtberg [Fri, 10 Nov 2017 12:06:36 +0000 (13:06 +0100)]
FileStorage: use copydoc to add base64 info to constructor

6 years agoMerge pull request #10061 from Sahloul:dnn_torch_fix
Alexander Alekhin [Fri, 10 Nov 2017 05:05:52 +0000 (05:05 +0000)]
Merge pull request #10061 from Sahloul:dnn_torch_fix

6 years agoMerge pull request #10062 from alalek:gtest_show_params
Alexander Alekhin [Fri, 10 Nov 2017 05:04:55 +0000 (05:04 +0000)]
Merge pull request #10062 from alalek:gtest_show_params

6 years agoParallel version of calcError in statmodel
LaurentBerger [Thu, 9 Nov 2017 11:19:04 +0000 (12:19 +0100)]
Parallel version of calcError in statmodel

6 years agoMerge pull request #9882 from pengli:ocl4dnn
Alexander Alekhin [Thu, 9 Nov 2017 18:54:43 +0000 (18:54 +0000)]
Merge pull request #9882 from pengli:ocl4dnn

6 years agots: dump test parameters value
Alexander Alekhin [Thu, 9 Nov 2017 16:09:46 +0000 (19:09 +0300)]
ts: dump test parameters value

6 years agoDNN Torch - workaround when torch importer is disabled
Hamdi Sahloul [Thu, 9 Nov 2017 15:44:06 +0000 (00:44 +0900)]
DNN Torch - workaround when torch importer is disabled

6 years agoMerge pull request #10053 from terfendail:intersectconvex_fix
Alexander Alekhin [Thu, 9 Nov 2017 11:05:56 +0000 (11:05 +0000)]
Merge pull request #10053 from terfendail:intersectconvex_fix

6 years agoAdd new layer forward interface
Li Peng [Thu, 9 Nov 2017 04:57:37 +0000 (12:57 +0800)]
Add new layer forward interface

Add layer forward interface with InputArrayOfArrays and
OutputArrayOfArrays parameters, it allows UMat buffer to be
processed and transferred in the layers.

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10048 from alalek:fix_macos_pkg_config
Alexander Alekhin [Wed, 8 Nov 2017 19:01:05 +0000 (19:01 +0000)]
Merge pull request #10048 from alalek:fix_macos_pkg_config

6 years agoFix for intersectConvexConvex nested contours check
Vitaly Tuzov [Wed, 8 Nov 2017 17:27:07 +0000 (20:27 +0300)]
Fix for intersectConvexConvex nested contours check

6 years agoMerge pull request #9979 from fakabbir:ImproveDoc
Fakabbir Amin [Wed, 8 Nov 2017 16:55:48 +0000 (22:25 +0530)]
Merge pull request #9979 from fakabbir:ImproveDoc

* Improve Documentation
Fixes Spelling Mistakes.

6 years agoMerge pull request #10051 from sturkmen72:upd_grfmt_gdal_cpp
Alexander Alekhin [Wed, 8 Nov 2017 16:48:04 +0000 (16:48 +0000)]
Merge pull request #10051 from sturkmen72:upd_grfmt_gdal_cpp

6 years agoupdate grfmt_gdal.cpp
Suleyman TURKMEN [Wed, 8 Nov 2017 14:47:43 +0000 (17:47 +0300)]
update grfmt_gdal.cpp

6 years agoMerge pull request #10047 from meganetaaan:master
Alexander Alekhin [Wed, 8 Nov 2017 14:13:23 +0000 (14:13 +0000)]
Merge pull request #10047 from meganetaaan:master

Fix sample code in js_tutorials

6 years agocmake: fix pkg-config generation for MacOSX
Alexander Alekhin [Wed, 8 Nov 2017 13:06:48 +0000 (16:06 +0300)]
cmake: fix pkg-config generation for MacOSX

6 years agoFix sample code in js_tutorials
Shinya Ishikawa [Wed, 8 Nov 2017 12:57:00 +0000 (21:57 +0900)]
Fix sample code in js_tutorials

6 years agoMerge pull request #10037 from alalek:update_gitignore
Alexander Alekhin [Tue, 7 Nov 2017 19:59:53 +0000 (19:59 +0000)]
Merge pull request #10037 from alalek:update_gitignore

git: .gitignore update

6 years agoMerge pull request #10036 from alalek:fix_ocl4dnn_invalid_kernel
Alexander Alekhin [Tue, 7 Nov 2017 19:17:20 +0000 (19:17 +0000)]
Merge pull request #10036 from alalek:fix_ocl4dnn_invalid_kernel

6 years agoMerge pull request #10003 from sturkmen72:documentation_updates
Alexander Alekhin [Tue, 7 Nov 2017 16:52:15 +0000 (16:52 +0000)]
Merge pull request #10003 from sturkmen72:documentation_updates

6 years agoupdates documentation and samples
Suleyman TURKMEN [Tue, 31 Oct 2017 20:10:29 +0000 (23:10 +0300)]
updates documentation and samples

6 years agogit: .gitignore update
Alexander Alekhin [Tue, 7 Nov 2017 14:24:19 +0000 (17:24 +0300)]
git: .gitignore update

ignore all "dot" files/directories by default.
'ignored' files can be added via 'git add -f' command if necessary.

6 years agodnn(ocl4dnn/conv): bailout on missing kernel configuration
Alexander Alekhin [Tue, 7 Nov 2017 14:02:17 +0000 (17:02 +0300)]
dnn(ocl4dnn/conv): bailout on missing kernel configuration

6 years agoMerge pull request #9999 from mshabunin:fix-gcc72-warnings
Alexander Alekhin [Tue, 7 Nov 2017 13:37:24 +0000 (13:37 +0000)]
Merge pull request #9999 from mshabunin:fix-gcc72-warnings

6 years agoMerge pull request #9970 from mshabunin:media-sdk-convert
Alexander Alekhin [Tue, 7 Nov 2017 13:37:07 +0000 (13:37 +0000)]
Merge pull request #9970 from mshabunin:media-sdk-convert

6 years agoMerge pull request #10002 from alalek:cmake_ios_disable_ipp
Alexander Alekhin [Tue, 7 Nov 2017 13:35:16 +0000 (13:35 +0000)]
Merge pull request #10002 from alalek:cmake_ios_disable_ipp

6 years agoMerge pull request #10001 from alalek:cmake_exclude_java_from_cpp_modules
Alexander Alekhin [Tue, 7 Nov 2017 13:35:00 +0000 (13:35 +0000)]
Merge pull request #10001 from alalek:cmake_exclude_java_from_cpp_modules

6 years agoMerge pull request #10025 from Mixaill:msvs-2017u5
Alexander Alekhin [Tue, 7 Nov 2017 13:26:04 +0000 (13:26 +0000)]
Merge pull request #10025 from Mixaill:msvs-2017u5

6 years agoMerge pull request #10031 from meganetaaan:doc-typo-js
Alexander Alekhin [Tue, 7 Nov 2017 11:00:47 +0000 (11:00 +0000)]
Merge pull request #10031 from meganetaaan:doc-typo-js

Fix typo in js_tutorials

6 years agocmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values
Alexander Alekhin [Tue, 7 Nov 2017 10:55:13 +0000 (13:55 +0300)]
cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values

6 years agocmake: MSVC_VERSION use pattern matching
Alexander Alekhin [Tue, 7 Nov 2017 10:52:06 +0000 (13:52 +0300)]
cmake: MSVC_VERSION use pattern matching

6 years agoFix typo in js_tutorials
Shinya Ishikawa [Mon, 6 Nov 2017 12:30:33 +0000 (21:30 +0900)]
Fix typo in js_tutorials

6 years agocmake: add support for MSVS 2017 update 5
Mikhail Paulyshka [Sat, 4 Nov 2017 20:52:37 +0000 (23:52 +0300)]
cmake: add support for MSVS 2017 update 5

7 years agoMerge pull request #9736 from Cartucho/const_and_class_to_json
Cartucho [Sat, 4 Nov 2017 03:38:18 +0000 (23:38 -0400)]
Merge pull request #9736 from Cartucho/const_and_class_to_json

* Adding constants to json file

* adding sub-module to constants name

* adding namespace to functions

* adding namespace to classes

* remove namespace from methods

* static methods

* python signatures generation

* python: more fixes for signatures generation

Python names existence can be checked via command:

    python -c "import cv2 as cv; print(repr(<py_name>))"

7 years agoFixed minor issues reported by GCC 7.2
Maksim Shabunin [Thu, 2 Nov 2017 14:16:30 +0000 (17:16 +0300)]
Fixed minor issues reported by GCC 7.2

7 years agoMerge pull request #9988 from alalek:ocl_verbose_api_errors
Alexander Alekhin [Fri, 3 Nov 2017 15:05:46 +0000 (15:05 +0000)]
Merge pull request #9988 from alalek:ocl_verbose_api_errors

7 years agoocl: drop CV_OclDbgAssert
Alexander Alekhin [Fri, 3 Nov 2017 09:23:18 +0000 (12:23 +0300)]
ocl: drop CV_OclDbgAssert

7 years agoocl: improve debug information
Alexander Alekhin [Wed, 1 Nov 2017 15:18:54 +0000 (18:18 +0300)]
ocl: improve debug information

7 years agoMerge pull request #9998 from alalek:ocl_fix_dnn_softmax_9991
Alexander Alekhin [Fri, 3 Nov 2017 09:16:38 +0000 (09:16 +0000)]
Merge pull request #9998 from alalek:ocl_fix_dnn_softmax_9991

7 years agoMerge pull request #10007 from alalek:videoio_gst_mjpeg_fix
Alexander Alekhin [Thu, 2 Nov 2017 18:27:00 +0000 (18:27 +0000)]
Merge pull request #10007 from alalek:videoio_gst_mjpeg_fix

7 years agovideoio: improve condition for MJPEG gstreamer sink
Alexander Alekhin [Thu, 2 Nov 2017 15:27:30 +0000 (18:27 +0300)]
videoio: improve condition for MJPEG gstreamer sink

7 years agocmake: disable IPP on iOS
Alexander Alekhin [Thu, 2 Nov 2017 14:36:53 +0000 (17:36 +0300)]
cmake: disable IPP on iOS

IPP is used on iPhoneSimulator only.

7 years agodnn(ocl): fix softmax global/local size consistency
Alexander Alekhin [Thu, 2 Nov 2017 12:01:07 +0000 (15:01 +0300)]
dnn(ocl): fix softmax global/local size consistency

7 years agocmake: exclude opencv_java (JNI) from OpenCV C++ modules list
Alexander Alekhin [Thu, 2 Nov 2017 14:01:22 +0000 (17:01 +0300)]
cmake: exclude opencv_java (JNI) from OpenCV C++ modules list

for non-ANDROID platforms

7 years agoMerge pull request #9983 from dkurt:fix_halide_copy_to_device
Alexander Alekhin [Thu, 2 Nov 2017 12:01:39 +0000 (12:01 +0000)]
Merge pull request #9983 from dkurt:fix_halide_copy_to_device

7 years agoMerge pull request #9995 from alalek:ocl_fix_moments_9990
Alexander Alekhin [Thu, 2 Nov 2017 11:45:09 +0000 (11:45 +0000)]
Merge pull request #9995 from alalek:ocl_fix_moments_9990

7 years agoMerge pull request #9993 from alalek:ocl_fix_gemm_9989
Alexander Alekhin [Thu, 2 Nov 2017 11:44:41 +0000 (11:44 +0000)]
Merge pull request #9993 from alalek:ocl_fix_gemm_9989

7 years agotest: extract OpenCL Moments tests, drop 'coi' parameter
Alexander Alekhin [Thu, 2 Nov 2017 10:36:04 +0000 (13:36 +0300)]
test: extract OpenCL Moments tests, drop 'coi' parameter

7 years agoocl: fix moments global_size (should be >= local_size)
Alexander Alekhin [Thu, 2 Nov 2017 10:35:28 +0000 (13:35 +0300)]
ocl: fix moments global_size (should be >= local_size)

7 years agocore(ocl): fix parameters for 'intelblas_gemm_buffer_NT' kernel
Alexander Alekhin [Thu, 2 Nov 2017 09:50:32 +0000 (12:50 +0300)]
core(ocl): fix parameters for 'intelblas_gemm_buffer_NT' kernel

7 years agoMerge tag '3.3.1-cvsdk'
Alexander Alekhin [Wed, 1 Nov 2017 13:06:00 +0000 (16:06 +0300)]
Merge tag '3.3.1-cvsdk'

7 years agoMediaSDK: fixed Linux build, improved BGR<->NV12 conversions
Maksim Shabunin [Thu, 26 Oct 2017 12:03:53 +0000 (15:03 +0300)]
MediaSDK: fixed Linux build, improved BGR<->NV12 conversions

7 years agoMerge pull request #9627 from dtmoodie:pyrlk_bugfix
Vadim Pisarevsky [Wed, 1 Nov 2017 11:03:08 +0000 (11:03 +0000)]
Merge pull request #9627 from dtmoodie:pyrlk_bugfix

7 years agoFixed Halide's copy_to_device invocation
Dmitry Kurtaev [Wed, 1 Nov 2017 11:01:54 +0000 (14:01 +0300)]
Fixed Halide's copy_to_device invocation

7 years agoMerge pull request #9963 from dkurt:fix_caffe_shrinker
Vadim Pisarevsky [Tue, 31 Oct 2017 12:27:18 +0000 (12:27 +0000)]
Merge pull request #9963 from dkurt:fix_caffe_shrinker

7 years agoMerge pull request #9971 from csukuangfj:fix-doc
Alexander Alekhin [Tue, 31 Oct 2017 10:03:54 +0000 (10:03 +0000)]
Merge pull request #9971 from csukuangfj:fix-doc

7 years agoSpecify layer types for Caffe FP32->FP16 weights converter
Dmitry Kurtaev [Mon, 30 Oct 2017 12:39:19 +0000 (15:39 +0300)]
Specify layer types for Caffe FP32->FP16 weights converter

7 years agoimprove doc.
KUANG Fangjun [Mon, 30 Oct 2017 16:13:59 +0000 (17:13 +0100)]
improve doc.

7 years agoMerge pull request #9854 from opalmirror:test_stereo_min_disparity_master
Vadim Pisarevsky [Tue, 31 Oct 2017 09:28:54 +0000 (09:28 +0000)]
Merge pull request #9854 from opalmirror:test_stereo_min_disparity_master

7 years agoMerge pull request #9959 from dkurt:reset_detection_outputs
Vadim Pisarevsky [Tue, 31 Oct 2017 09:26:42 +0000 (09:26 +0000)]
Merge pull request #9959 from dkurt:reset_detection_outputs

7 years agoMerge pull request #9969 from mshabunin:dispatch-vs-folders
Vadim Pisarevsky [Tue, 31 Oct 2017 09:20:52 +0000 (09:20 +0000)]
Merge pull request #9969 from mshabunin:dispatch-vs-folders

7 years agoMerge pull request #9864 from mapreri:multiarch
Alexander Alekhin [Mon, 30 Oct 2017 15:43:41 +0000 (15:43 +0000)]
Merge pull request #9864 from mapreri:multiarch

7 years agoMerge pull request #9877 from mapreri:non-linux
Alexander Alekhin [Mon, 30 Oct 2017 15:41:36 +0000 (15:41 +0000)]
Merge pull request #9877 from mapreri:non-linux

7 years agoMerge pull request #9968 from alalek:fix_9960
Alexander Alekhin [Mon, 30 Oct 2017 15:33:46 +0000 (15:33 +0000)]
Merge pull request #9968 from alalek:fix_9960

7 years agoVisualStudio: Added solution folders for dispatched optimization targets
Maksim Shabunin [Mon, 30 Oct 2017 15:30:20 +0000 (18:30 +0300)]
VisualStudio: Added solution folders for dispatched optimization targets

7 years agocore(ocl): workaround CL_OUT_OF_RESOURCES error
Alexander Alekhin [Mon, 30 Oct 2017 14:54:56 +0000 (17:54 +0300)]
core(ocl): workaround CL_OUT_OF_RESOURCES error

Flush deallocation queue before calling map/unmap

7 years agoMerge pull request #9961 from pushkalkatara:patch-1
Alexander Alekhin [Mon, 30 Oct 2017 14:15:19 +0000 (14:15 +0000)]
Merge pull request #9961 from pushkalkatara:patch-1

7 years agoDocumentation Update
Pushkal Katara [Mon, 30 Oct 2017 12:25:40 +0000 (17:55 +0530)]
Documentation Update

Resolves - https://github.com/opencv/opencv/issues/9928

7 years agoMerge pull request #9703 from Ajacmac:patch1
Vadim Pisarevsky [Mon, 30 Oct 2017 10:03:02 +0000 (10:03 +0000)]
Merge pull request #9703 from Ajacmac:patch1

7 years agoError in the documentation for cv::getRectSubPix. #9788 (#9871)
Fakabbir Amin [Mon, 30 Oct 2017 10:04:20 +0000 (15:34 +0530)]
Error in the documentation for cv::getRectSubPix. #9788 (#9871)

* Error in the documentation for cv::getRectSubPix. #9788
The function name is corrected to GetRectSubPix since, it uses the notation
of src, dst and center. Also added the number of channel assertion criteria.

* Error in the documentation for cv::getRectSubPix. #9788
Replace dst with patch in the formula, reverted function name to
getRectSubPix, removed BorderTypes comment line due to no explicit call
to the function found.

* Error in the documentation for cv::getRectSubPix. #9788
Replace dst with patch in the formula, reverted function name to
getRectSubPix, removed BorderTypes comment line due to no explicit call
to the function found.

7 years agoMerge pull request #9955 from alalek:cmake_openblas_support
Vadim Pisarevsky [Mon, 30 Oct 2017 09:59:12 +0000 (09:59 +0000)]
Merge pull request #9955 from alalek:cmake_openblas_support

7 years agoMerge pull request #9941 from catree:improve_dnn_samples
Vadim Pisarevsky [Mon, 30 Oct 2017 09:58:18 +0000 (09:58 +0000)]
Merge pull request #9941 from catree:improve_dnn_samples

7 years agoMerge pull request #9865 from ryanfox:patch-4
Vadim Pisarevsky [Mon, 30 Oct 2017 09:54:48 +0000 (09:54 +0000)]
Merge pull request #9865 from ryanfox:patch-4

7 years agoSet zero confidences in case of no detections
Dmitry Kurtaev [Mon, 30 Oct 2017 07:17:57 +0000 (10:17 +0300)]
Set zero confidences in case of no detections

7 years agocmake: update OpenBLAS support
Alexander Alekhin [Fri, 27 Oct 2017 23:22:21 +0000 (02:22 +0300)]
cmake: update OpenBLAS support

- reorder path HINTS to avoid conflicts with other LAPACK libraries
- add extern "C" { } to avoid generation of C++ symbols

7 years agoMerge pull request #9951 from alalek:fix_bilateral_f32_simd
Alexander Alekhin [Fri, 27 Oct 2017 16:43:20 +0000 (16:43 +0000)]
Merge pull request #9951 from alalek:fix_bilateral_f32_simd

7 years agoMerge pull request #9847 from wzw-intel:ocl4dnn_fusion
Vadim Pisarevsky [Fri, 27 Oct 2017 13:59:46 +0000 (13:59 +0000)]
Merge pull request #9847 from wzw-intel:ocl4dnn_fusion

7 years agoMerge pull request #9845 from dkurt:fast_neural_style_models
Vadim Pisarevsky [Fri, 27 Oct 2017 13:59:02 +0000 (13:59 +0000)]
Merge pull request #9845 from dkurt:fast_neural_style_models

7 years agoMerge pull request #9922 from alalek:ts_markdown_table
Alexander Alekhin [Fri, 27 Oct 2017 14:01:18 +0000 (17:01 +0300)]
Merge pull request #9922 from alalek:ts_markdown_table

ts(misc): support tables exporting in markdown format

7 years agoUpdate windows_visual_studio_Opencv.markdown
Vadim Pisarevsky [Fri, 27 Oct 2017 13:26:42 +0000 (16:26 +0300)]
Update windows_visual_studio_Opencv.markdown

7 years agoMerge pull request #9952 from catree:add_resnet_ssd_face.cpp
Vadim Pisarevsky [Fri, 27 Oct 2017 13:19:41 +0000 (13:19 +0000)]
Merge pull request #9952 from catree:add_resnet_ssd_face.cpp

7 years agoMerge pull request #9947 from sovrasov:floodfill_docs
Vadim Pisarevsky [Fri, 27 Oct 2017 13:06:11 +0000 (13:06 +0000)]
Merge pull request #9947 from sovrasov:floodfill_docs

7 years agoMerge pull request #9802 from Nickolays:Fix#9797
Vadim Pisarevsky [Fri, 27 Oct 2017 13:00:34 +0000 (13:00 +0000)]
Merge pull request #9802 from Nickolays:Fix#9797

7 years agoMerge pull request #9875 from terfendail:fast_avx
Vadim Pisarevsky [Fri, 27 Oct 2017 12:53:59 +0000 (12:53 +0000)]
Merge pull request #9875 from terfendail:fast_avx

7 years agoMerge pull request #9897 from Bhanudutta:bugfix_1
Vadim Pisarevsky [Fri, 27 Oct 2017 12:50:44 +0000 (12:50 +0000)]
Merge pull request #9897 from Bhanudutta:bugfix_1

7 years agoMerge pull request #9892 from terfendail:v4l_custom
Vadim Pisarevsky [Fri, 27 Oct 2017 11:57:18 +0000 (11:57 +0000)]
Merge pull request #9892 from terfendail:v4l_custom

7 years agoMerge pull request #9880 from dkurt:caffe_ceil_mode
Vadim Pisarevsky [Fri, 27 Oct 2017 11:51:46 +0000 (11:51 +0000)]
Merge pull request #9880 from dkurt:caffe_ceil_mode