Alexander Alekhin
617fe2545c
Merge pull request #12709 from WydD:3.4
2018-10-01 13:32:51 +00:00
Alexander Alekhin
93663dc57a
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
2018-10-01 13:32:29 +00:00
Antonio Borondo
28e55dc5f3
Fix documentation of cv::cuda::compare
2018-10-01 13:23:18 +01:00
Alexander Alekhin
9253e8bda2
Merge pull request #12705 from berak:imread_document_grayscale
2018-09-30 23:59:48 +03:00
Alexander Alekhin
0f031b6680
dnn(ocl4dnn): drop weights_buf
...
- avoid memory access violation during "prefetch" stage
2018-09-30 20:35:41 +00:00
Loic Petit
255b20f6de
Fix frame rate rounding in ffmpeg wrapper ( #9023 )
2018-09-30 22:24:02 +02:00
Loic Devulder
ac9ec55b37
3rdparty/protobuf: fix compilation issue on s390
...
This commit fixes an issue while trying to compile
on s390x architecture.
This is simply a backport of a fixe already applied
in official protobuf code:
- https://github.com/protocolbuffers/protobuf/pull/3955
2018-09-30 21:33:34 +02:00
berak
df4139d373
document imread grayscale behaviour
2018-09-30 15:22:26 +02:00
Hamdi Sahloul
1059735bfb
Merge pull request #12667 from cv3d:fix/ts_report
...
TS: fix Python v2/v3 compatibility (#12667 )
* TS: fix Python2.7 compatibility
* TS: fix Python3 compatibility
* py3: use integer division '/' => '//' instead of cast
2018-09-29 20:03:54 +03:00
Alexander Alekhin
8f2eb60719
Merge pull request #12690 from cv3d:fix/ts_python_exe
2018-09-29 16:39:05 +00:00
Alexander Alekhin
a1ffc00ba8
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
2018-09-29 16:36:25 +00:00
Hamdi Sahloul
1a81a97e9f
Utilize the currently running Python executable
...
especially if it matches the module being tested
2018-09-29 23:58:27 +09:00
Tomoaki Teshima
e6ef9221cb
fix test failure of cudev
...
* follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
* loosen threshold in cudaimgproc
2018-09-29 23:13:12 +09:00
Alexander Alekhin
ee84ae0551
Merge pull request #12682 from soonbro:patch-1
2018-09-29 16:03:38 +03:00
Alexander Alekhin
bd04568baf
Merge pull request #12676 from PWhiddy:patch-1
2018-09-29 16:02:33 +03:00
Alexander Alekhin
8ecdd215b6
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
2018-09-29 12:50:51 +00:00
Alexander Alekhin
5a3bca8d5c
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart
2018-09-29 12:45:47 +00:00
soonbro
9b9f38afc8
fix typo in FpsMeter.java
...
'mFramesCouner' -> 'mFramesCounter'
2018-09-29 11:36:47 +00:00
Alexander Alekhin
4fea6179a0
Merge pull request #12659 from dkurt:js_features2d
2018-09-28 16:18:09 +00:00
Alexander Alekhin
055f177a6a
Merge pull request #12630 from alalek:docs_blacklist_matlab
2018-09-28 16:15:19 +00:00
Andrew Mroczkowski
3c5a6be835
Fix Xcode version parsing error (affects bitcode generation)
...
The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.
2018-09-28 17:01:40 +03:00
Alexander Alekhin
4b895a4d1f
Merge pull request #12657 from alalek:docs_repair_cuda_section
2018-09-28 09:45:50 +00:00
Dmitry Kurtaev
e9f99063c7
JavaScript bindings for features2d module
2018-09-28 11:04:13 +03:00
Peter Whidden
9f0ff03da5
Fix typo "wit" -> "with"
2018-09-27 14:37:59 -07:00
Alexander Alekhin
9ba659af84
Merge pull request #12660 from alalek:flann_drop_useless_mutex
2018-09-27 19:46:59 +00:00
Rostislav Vasilikhin
be989b3b60
Merge pull request #12637 from savuor:fix/instr_ipp_ocl
...
Fixes for instrumentation of IPP and OCL (#12637 )
* fixed warning about re-declaring variable when both IPP and instrumentation are enabled
* fixed segfault when no funName provided
* compilation fixed when both OCL and instrumentation are enabled
2018-09-27 22:39:06 +03:00
Alexander Alekhin
0706bd72b8
Merge pull request #12671 from alalek:fix_build_warnings_3.4
2018-09-27 16:23:05 +00:00
Alexander Alekhin
f6dc396a0f
Merge pull request #12568 from sturkmen72:patch-3
2018-09-27 13:42:44 +00:00
Alexander Alekhin
48e8e76a34
fix build warnings
2018-09-27 16:31:31 +03:00
Alexander Alekhin
fae329a0ca
Merge pull request #12650 from alalek:dnn_ocl4dnn_verification_test
...
* dnn(ocl4dnn): update kernel checks
* dnn: workaround for IDLF kernels on Intel iGPU
* dnn(test): remove "skip" check for unstable cases
2018-09-27 12:54:23 +03:00
Alexander Alekhin
52f52f6786
flann: drop useless mutex
2018-09-26 19:37:44 +03:00
Alexander Alekhin
fe56bdeeb9
Merge pull request #12647 from alalek:cmake_js_cleanup
...
* cmake: js cleanup
- avoid unnecessary 2 messages for other platforms
- drop MODULE_NAME variable
* js: cleanup build_js.py
2018-09-26 18:53:02 +03:00
Vadim Pisarevsky
b34d86ca24
Merge pull request #12548 from alalek:videoio_backend_name
2018-09-26 15:19:55 +00:00
Dmitry Kurtaev
24ab751547
Merge pull request #12565 from dkurt:dnn_non_intel_gpu
...
* Remove isIntel check from deep learning layers
* Remove fp16->fp32 fallbacks where it's not necessary
* Fix Kernel::run to prevent localsize > globalsize
2018-09-26 16:27:00 +03:00
Dmitry Kurtaev
c8f3579f93
Fix #12542 ( #12603 )
...
* Fix #12542
* Remove ignore of non-virtual-dtor error
2018-09-26 16:08:51 +03:00
Alexander Alekhin
962dc21f2b
docs: fix CUDA docs section
2018-09-26 15:36:55 +03:00
Alexander Alekhin
43e66e7ff9
Merge pull request #12644 from dkurt:dnn_out_layers_names
2018-09-25 16:12:59 +00:00
Dmitry Kurtaev
ad5898224d
Add a file with preprocessing parameters for deep learning networks
2018-09-25 18:28:37 +03:00
Dmitry Kurtaev
f8398d80bc
add Net::getUnconnectedOutLayersNames method
2018-09-25 18:10:45 +03:00
Alexander Alekhin
9faacfbc0d
Merge pull request #12639 from tomoaki0705:fixFp16CudaFailure
2018-09-25 13:19:51 +00:00
Alexander Alekhin
a610be6335
Merge pull request #12591 from sturkmen72:patch-6
2018-09-25 10:05:16 +00:00
Tomoaki Teshima
6a5266df79
fix CvFp16Test failure
2018-09-25 15:00:37 +09:00
Alexander Alekhin
238a3806b0
Merge pull request #12632 from mshabunin:move-opengl-sample
2018-09-24 17:53:11 +00:00
Alexander Alekhin
a07a4cefe1
Merge pull request #12629 from cv3d:fix/opengl
2018-09-24 11:32:07 +00:00
Maksim Shabunin
a0211a1c2f
Moved OpenGL sample to opengl folder
2018-09-24 13:13:30 +03:00
Hamdi Sahloul
47bb09bc4b
OpenGL: avoid losing precision in double-to-float conversion
2018-09-24 19:06:48 +09:00
Alexander Alekhin
93b0b03447
docs: DOXYGEN_BLACKLIST CMake variable for modules exclusion
2018-09-24 11:34:03 +03:00
Alexander Alekhin
0a23c1bf11
Merge pull request #12614 from alalek:winpack_samples_python_launcher_update
2018-09-23 13:37:36 +00:00
Alexander Alekhin
ecef7f7930
samples: update winpack python samples launcher
...
- accepts script parameter (allows drag & drop from 'explorer')
- use script dir instead of current dir (can launch samples from 'samples/dnn')
- added 'pause' to show error messages (about missing numpy) instead of instant closing
2018-09-22 17:28:58 +00:00
Hamdi Sahloul
5db13fe2a7
cuda::polarToCart: update documentation
2018-09-22 07:02:43 +09:00