Alexander Alekhin
96aebbe7f9
Merge pull request #9970 from mshabunin:media-sdk-convert
2017-11-07 13:37:07 +00:00
Alexander Alekhin
888d0cda40
Merge pull request #10001 from alalek:cmake_exclude_java_from_cpp_modules
2017-11-07 13:35:00 +00:00
Cartucho
7267e94be7
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>))"
2017-11-04 06:38:18 +03:00
Alexander Alekhin
9c4f0a984f
ocl: drop CV_OclDbgAssert
2017-11-03 13:31:37 +03:00
Alexander Alekhin
8fb48c09f7
ocl: improve debug information
2017-11-03 13:31:37 +03:00
Alexander Alekhin
6e4f9433d0
Merge pull request #9998 from alalek:ocl_fix_dnn_softmax_9991
2017-11-03 09:16:39 +00:00
Alexander Alekhin
c624967049
Merge pull request #10007 from alalek:videoio_gst_mjpeg_fix
2017-11-02 18:27:00 +00:00
Alexander Alekhin
b1b2528e50
videoio: improve condition for MJPEG gstreamer sink
2017-11-02 18:27:30 +03:00
Alexander Alekhin
bacc96f4e8
dnn(ocl): fix softmax global/local size consistency
2017-11-02 17:08:40 +03:00
Alexander Alekhin
cc3f9323bb
cmake: exclude opencv_java (JNI) from OpenCV C++ modules list
...
for non-ANDROID platforms
2017-11-02 17:06:12 +03:00
Alexander Alekhin
f9ac1665b6
Merge pull request #9983 from dkurt:fix_halide_copy_to_device
2017-11-02 12:01:39 +00:00
Alexander Alekhin
942672ad91
Merge pull request #9995 from alalek:ocl_fix_moments_9990
2017-11-02 11:45:09 +00:00
Alexander Alekhin
47ae5197a9
test: extract OpenCL Moments tests, drop 'coi' parameter
2017-11-02 13:37:58 +03:00
Alexander Alekhin
c9c759f700
ocl: fix moments global_size (should be >= local_size)
2017-11-02 13:37:57 +03:00
Alexander Alekhin
7db612a545
core(ocl): fix parameters for 'intelblas_gemm_buffer_NT' kernel
2017-11-02 12:50:32 +03:00
Maksim Shabunin
0c79f4a00f
MediaSDK: fixed Linux build, improved BGR<->NV12 conversions
2017-11-01 14:14:45 +03:00
Vadim Pisarevsky
cc626a3b5a
Merge pull request #9627 from dtmoodie:pyrlk_bugfix
2017-11-01 11:03:09 +00:00
Dmitry Kurtaev
14af2a0c0c
Fixed Halide's copy_to_device invocation
2017-11-01 14:01:54 +03:00
Vadim Pisarevsky
bc348eb8ab
Merge pull request #9963 from dkurt:fix_caffe_shrinker
2017-10-31 12:27:19 +00:00
Alexander Alekhin
6e4dacc0b3
Merge pull request #9971 from csukuangfj:fix-doc
2017-10-31 10:03:54 +00:00
Dmitry Kurtaev
e1ebc4e991
Specify layer types for Caffe FP32->FP16 weights converter
2017-10-31 12:31:40 +03:00
KUANG Fangjun
67acfc6e25
improve doc.
2017-10-31 10:30:01 +01:00
Vadim Pisarevsky
87984f2c6a
Merge pull request #9854 from opalmirror:test_stereo_min_disparity_master
2017-10-31 09:28:54 +00:00
Vadim Pisarevsky
15df161b22
Merge pull request #9959 from dkurt:reset_detection_outputs
2017-10-31 09:26:42 +00:00
Alexander Alekhin
bc9c9abab0
Merge pull request #9877 from mapreri:non-linux
2017-10-30 15:41:36 +00:00
Alexander Alekhin
7809c4156f
core(ocl): workaround CL_OUT_OF_RESOURCES error
...
Flush deallocation queue before calling map/unmap
2017-10-30 17:54:56 +03:00
Fakabbir Amin
cd428fb798
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.
2017-10-30 13:04:20 +03:00
Dmitry Kurtaev
03cefa7bfe
Set zero confidences in case of no detections
2017-10-30 10:17:57 +03:00
Alexander Alekhin
7b0d2d189f
Merge pull request #9951 from alalek:fix_bilateral_f32_simd
2017-10-27 16:43:20 +00:00
Vadim Pisarevsky
e0e40405ed
Merge pull request #9847 from wzw-intel:ocl4dnn_fusion
2017-10-27 13:59:46 +00:00
Vadim Pisarevsky
ff037ebe5f
Merge pull request #9845 from dkurt:fast_neural_style_models
2017-10-27 13:59:02 +00:00
Alexander Alekhin
91c0b13743
Merge pull request #9922 from alalek:ts_markdown_table
...
ts(misc): support tables exporting in markdown format
2017-10-27 17:01:18 +03:00
Vadim Pisarevsky
ede39b85f6
Merge pull request #9947 from sovrasov:floodfill_docs
2017-10-27 13:06:11 +00:00
Vadim Pisarevsky
ff190b1ef4
Merge pull request #9802 from Nickolays:Fix#9797
2017-10-27 13:00:34 +00:00
Vadim Pisarevsky
1a495a5817
Merge pull request #9875 from terfendail:fast_avx
2017-10-27 12:53:59 +00:00
Vadim Pisarevsky
8b1b126e3e
Merge pull request #9892 from terfendail:v4l_custom
2017-10-27 11:57:18 +00:00
Vadim Pisarevsky
5384d2f090
Merge pull request #9880 from dkurt:caffe_ceil_mode
2017-10-27 11:51:46 +00:00
Dmitry Kurtaev
4b52b8df34
Layers for fast-neural-style models: https://github.com/jcjohnson/fast-neural-style
2017-10-27 14:26:45 +03:00
Vadim Pisarevsky
9e6ef99422
Merge pull request #9850 from klchang:master
2017-10-27 11:22:28 +00:00
Vadim Pisarevsky
58a83e99c0
Merge pull request #9839 from terfendail:features/python_wrapper/surface_matching_cleanup
2017-10-27 11:22:10 +00:00
Alexander Alekhin
cc9ab7e582
imgproc: fix bilateral filter SIMD 32f optimization
2017-10-27 14:20:13 +03:00
Vadim Pisarevsky
bc93775385
Merge pull request #9862 from sovrasov:dnn_nms
2017-10-27 11:19:57 +00:00
Vadim Pisarevsky
b4367c92f3
Merge pull request #9889 from IgWod:add-const-getviewerpose
2017-10-27 11:16:19 +00:00
Vadim Pisarevsky
825c0ffdb4
Merge pull request #9874 from dkurt:fix_identity_permute_layer
2017-10-27 11:11:48 +00:00
Vadim Pisarevsky
69f2590359
Merge pull request #9921 from dkurt:fix_prelu_after_fully_connected
2017-10-27 11:10:59 +00:00
Vadim Pisarevsky
7060ee4d00
Merge pull request #9923 from savuor:fitellipse_enable_tests
2017-10-27 11:09:41 +00:00
Vladislav Sovrasov
a385fff3bf
imgproc: clarify usage of the mask in floodfill
2017-10-27 14:06:24 +03:00
Vadim Pisarevsky
7b8fb64f21
Merge pull request #9939 from alalek:fix_dnn_getUMat_crash
2017-10-27 11:06:22 +00:00
Vadim Pisarevsky
0c291c7768
Merge pull request #9940 from catree:fix_issue_9925
2017-10-27 11:05:07 +00:00
Vladislav Sovrasov
5bf39ceb5d
dnn: handle 4-channel images in blobFromImage ( #9944 )
2017-10-27 14:06:53 +03:00