Sayed Adel
5771fd693d
Change behaviour of 16-bit multiply operator
...
- redefine 16-bit multiply operator to perform saturating multiply
instead of non-saturating multiply
- implement 8-bit multiply operator to perform saturating multiply
- implement v_mul_wrap() for 8-bit, 16-bit non-saturating multiply
- improve performance of v_mul_hi() for VSX
- update intrin tests with new changes
- replace unv 16-bit multiplication operator with v_mul_wrap due behavior changes
- Several improvements depend on vpisarev review
* initial forward declarations for universal intrinsics
* move emulating SSE intrinsics into separate file
* implement v_mul_expand for 8-bit
* reimplement saturating multiply using v_mul_expand + v_pack
* map v_expand, v_load_expand, v_load_expand_q to sse4.1
* fix overflow avx2::v_pack(uint32)
* implement two universal intrinsics v_expand_low and v_expand_high
2018-10-11 04:35:39 +02:00
Vitaly Tuzov
1ff11c84ab
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels
2018-10-11 04:30:33 +02:00
Alexander Alekhin
761c269e47
Merge pull request #12794 from alalek:fix_warnings
2018-10-10 20:22:07 +00:00
Alexander Alekhin
4e62900009
core: call omp_set_dynamic() for better CPU usage
...
Similar to 'OMP_DYNAMIC=TRUE'.
2018-10-10 19:57:43 +00:00
Alexander Alekhin
7813eef92b
fix build warnings
2018-10-10 19:26:19 +00:00
Vitaly Tuzov
cc10e6b344
pyrDown and pyrUp SSE2 implementations replaced with wide universal intrinsics implementations
2018-10-10 21:12:47 +03:00
Alexander Alekhin
11e2a216c5
ocl(win32): bypass deallocate() during process termination
2018-10-10 18:06:06 +00:00
Alexander Alekhin
404893810c
cmake: fix Python detection for standalone bindings
2018-10-10 16:58:23 +00:00
Alexander Nesterov
53ec8f286b
Added QR code decoding.
2018-10-10 15:27:00 +00:00
Alexander Alekhin
70f2ee917e
cmake: add DllMain() into each OpenCV DLL
...
to detect process termination after ExitProcess() call
2018-10-10 11:00:59 +00:00
Adam Radomski
cc3ec5d453
Fix dnn caffe importer extract blobs from reused layers
2018-10-10 10:44:56 +02:00
Hamdi Sahloul
c4d434fd6f
CUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true ( #12762 )
2018-10-09 17:39:39 +03:00
Apoorv Goel
b8aa0cddab
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
...
* Add documentation for cvtColorTwoPlane
* Change brief and add links
2018-10-09 15:49:17 +03:00
Lubov Batanina
50811e04f2
Merge pull request #12596 from l-bat:l-bat/shufflenet_onnx
...
* Add Shufflenet support in ONNX
* Add test for transpose layer
2018-10-08 22:18:41 +03:00
Alexander Alekhin
449826288b
Merge pull request #12765 from cv3d:ts/cuda/device_name
2018-10-08 19:15:54 +00:00
Alexander Alekhin
68fe37b008
Merge pull request #12755 from alalek:fix_allocSingleton
2018-10-08 15:30:17 +00:00
Alexander Alekhin
26ba4f3c1d
Merge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions
2018-10-08 15:22:24 +00:00
Alexander Alekhin
e19b422854
Merge pull request #12752 from alalek:dnn_cleanup_getUMat
2018-10-08 15:21:50 +00:00
Vitaly Tuzov
9d602f2752
Replaced SSE2 area resize implementation with wide universal intrinsic implementation
2018-10-08 16:27:52 +03:00
Dmitry Kurtaev
7649e537b7
Fix JavaScript bindings for features2d module
2018-10-07 22:55:38 +03:00
Hamdi Sahloul
2faa4cd933
TS/CUDA: Show device ID in case of multiple devices
2018-10-08 03:00:25 +09:00
Alexander Alekhin
18bf91a08b
core: update allocSingleton implementation, valgrind suppression
2018-10-05 18:25:13 +03:00
Alexander Alekhin
634dd656d5
dnn: don't use Mat expressions with async UMat functions
2018-10-05 17:09:50 +03:00
Alexander Alekhin
9d02d42afe
dnn(ocl4dnn): don't use getUMat()
...
especially in CPU only processing
2018-10-05 15:24:51 +03:00
Alexander Alekhin
c716e374c1
Merge pull request #12744 from alalek:issue_12736
2018-10-05 10:20:13 +00:00
Alexander Alekhin
aeec6e43eb
Merge pull request #12749 from powderluv:fix-clang-cl-tzcnt
2018-10-05 09:28:07 +00:00
Anush Elangovan
630a94b8b7
_tzcnt_u32() is undefined in clang-cl so use alternate impl
...
_tzcnt_u32() is not exported by clang-cl intrin.h so check for
clang-cl and enable an alterate for _tzcnt_u32()
Some discussions:
http://lists.llvm.org/pipermail/cfe-dev/2016-October/051329.html
https://bugs.llvm.org/show_bug.cgi?id=30506
TEST=Build with clang-cl
2018-10-04 14:04:22 -07:00
Rostislav Vasilikhin
da5e0ef461
ocl::KernelArg::Local(): added size argument
2018-10-04 17:19:09 +03:00
Alexander Alekhin
0926a84a45
cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS
...
to avoid build break without `__OPENCV_BUILD`
2018-10-04 14:43:43 +03:00
Alexander Alekhin
0101fa789c
Merge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure
2018-10-04 11:33:34 +00:00
Alexander Alekhin
12b3d157a5
Merge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation
2018-10-04 11:31:47 +00:00
Tomoaki Teshima
7294ae0f17
fix test failure of StereoBeliefPropagation
...
* if the src has odd number of height, access error happens
* it could happen on width, too
* check both dst and src range in both width and height
2018-10-04 08:35:34 +09:00
Apoorv Goel
0ffc186680
Merge pull request #12731 from UnderscoreAsterisk:fix-12012
...
* fix #12012
* Replace CV_StsBadFlag with Error::StsBadFlag
2018-10-03 15:50:04 +03:00
Alexander Alekhin
068ebe8b4d
Merge pull request #12693 from peters:patch-1
2018-10-03 06:14:44 +00:00
Alexander Alekhin
eec468fa13
dnn(ocl4dnn): calculate activation expression once
...
- to avoid multiple conditional calls via sub_group() functions
2018-10-02 21:23:41 +00:00
Alexander Alekhin
81c94357e8
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
2018-10-02 20:52:34 +00:00
Peter Rekdal Sunde
042c486b68
Obtain fourcc when AVStream is network stream
...
The `codec_tag` is only available when opening a file from disk. If `AVStream` is a network stream then `fourcc` must be obtained using `codec_id`. I have tested the following scenarios:
1) Open a `.mp4` file and verify that `codec_tag` is returned (old behavior)
2) Open a `rtsp` stream and verify that `codec_fourcc` is returned (Tested with a MJPEG, H264 and H265 stream)
2018-10-02 22:15:05 +02:00
Alexander Alekhin
6921f967a1
Merge pull request #12605 from terfendail:integral_wintr
2018-10-02 16:40:13 +00:00
Alexander Alekhin
83a0c12144
Merge pull request #12581 from terfendail:lapack_intr
2018-10-02 16:39:50 +00:00
Tomoaki Teshima
fa8684b5c8
fix test failure of cudafilters Median_Accuracy
...
* avoid race condition
2018-10-03 00:59:08 +09:00
Vitaly Tuzov
283348afc3
SSE2 code in invert() replaced with universal intrinsics
2018-10-02 12:47:07 +03:00
Suleyman TURKMEN
ee0c985491
Merge pull request #12649 from sturkmen72:patch-9
...
Update hog.cpp (#12649 )
2018-10-01 22:22:37 +03:00
Alexander Alekhin
b41f38ecc7
Merge pull request #12669 from mshabunin:add-paths-config
2018-10-01 15:57:57 +00:00
Alexander Alekhin
682180e0cd
Merge pull request #12620 from alalek:ocl_extra_build_options
2018-10-01 15:57:31 +00:00
Alexander Alekhin
1385db48f5
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
2018-10-01 15:36:49 +00:00
Alexander Alekhin
94201b7cf9
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
2018-10-01 17:56:17 +03:00
Maksim Shabunin
15632c6305
Added support for multi-path configuration parameter (env)
2018-10-01 17:50:47 +03:00
Vitaly Tuzov
6b84990620
integral() implementation updated to utilize wide universal intrinsics
2018-10-01 17:25:43 +03:00
Alexander Alekhin
c9b6b2cf04
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
2018-10-01 13:35:03 +00:00
Alexander Alekhin
617fe2545c
Merge pull request #12709 from WydD:3.4
2018-10-01 13:32:51 +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
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
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
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
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
Hamdi Sahloul
47bb09bc4b
OpenGL: avoid losing precision in double-to-float conversion
2018-09-24 19:06:48 +09:00
Hamdi Sahloul
5db13fe2a7
cuda::polarToCart: update documentation
2018-09-22 07:02:43 +09:00
Hamdi Sahloul
9932612373
cuda::polarToCart: test double precision and tune tolerance
2018-09-22 07:02:43 +09:00
Hamdi Sahloul
6203c95d31
cuda::polarToCart: Support double precision
2018-09-22 07:02:43 +09:00
Alexander Alekhin
d5d19a9f67
Merge pull request #12592 from alalek:dnn_test_at_least_one
2018-09-21 16:49:51 +00:00
Alexander Alekhin
f33f236ab6
Merge pull request #12598 from cv3d:cmake/js
2018-09-21 14:59:27 +00:00
Hamdi Sahloul
95b1fe0776
JS: Provides meaningful message in case of compile issues
2018-09-21 04:02:34 +09:00
Hamdi Sahloul
35bee663eb
JS: Improves Emscripten detection
2018-09-21 04:02:34 +09:00
Suleyman TURKMEN
98f6ea0785
Update hog.cpp
2018-09-20 13:45:01 +03:00
Alexander Alekhin
e0a5824028
dnn(test): test at least CPU code path
2018-09-19 13:56:59 +03:00
Alexander Alekhin
ec9c53eeff
ts: update valgrind test filter
...
- DNN: avoid very large models
- build filter per module
- fixed longTestFilter
2018-09-19 00:55:56 +00:00
Alexander Alekhin
d3eed2cf23
videoio: CAP_PROP_BACKEND property interface
2018-09-18 16:25:01 +00:00
Alexander Alekhin
51f7eb3a3c
videoio(test): add "camera" tests
...
- disabled due specific requirements (camera, OpenNI camera, etc)
- designed for manual validation
2018-09-18 16:19:19 +00:00
Alexander Alekhin
b35fbff675
videoio: added '.getBackendName()' method
2018-09-18 16:19:19 +00:00
Alexander Alekhin
15e9e3304c
Merge pull request #12579 from dkurt:dnn_reset_myriad_device
2018-09-18 16:14:38 +00:00
Dmitry Kurtaev
8ac7b21716
Enable Myriad device for OpenVINO models test
2018-09-18 13:49:24 +03:00
Alexander Alekhin
3cab9e7a9c
3.4: fixes
2018-09-18 08:31:11 +00:00
Suleyman TURKMEN
30597e5c98
Update seamless_cloning.cpp
2018-09-18 07:22:39 +03:00
Alexander Alekhin
70f38b4dfa
Merge pull request #12510 from take1014:doc_hough
2018-09-17 21:39:12 +03:00
Alexander Alekhin
d389edd843
Merge pull request #12528 from dkurt:dnn_py_tests
2018-09-17 18:34:43 +00:00
Alexander Alekhin
27a4e370f9
Merge pull request #12559 from dkurt:dnn_remove_usrtype1
2018-09-17 18:13:29 +00:00
Alexander Alekhin
b4fd3e8674
Merge pull request #12563 from cv3d:bug/cuda_msseg
2018-09-17 18:09:11 +00:00
Lubov Batanina
43f889ae1f
Merge pull request #12519 from l-bat:l-bat/onnx_parser
...
Support asymmetric padding in pooling layer (#12519 )
* Add Inception_V1 support in ONNX
* Add asymmetric padding in OpenCL and Inference engine
* Refactoring
2018-09-17 20:26:17 +03:00
Dmitry Kurtaev
7d75526373
Use TorchType enum
2018-09-17 18:55:05 +03:00
Hamdi Sahloul
ecc9bd0925
Support GpuMat in copyTo() functions
2018-09-17 23:43:14 +09:00
Dmitry Kurtaev
d259eb28bb
Add python tests for dnn module
2018-09-17 15:22:47 +03:00
Vadim Pisarevsky
2113818f19
Merge pull request #12364 from dkurt:dnn_change_blob_from_image
2018-09-17 12:04:41 +00:00
Alexander Alekhin
29bee6f07e
cmake: move Matlab scripts to opencv_contrib ( #12541 )
...
* matlab: move to opencv_contrib
* cmake: preserve variables scope for processing modules
- use macro instead of function to avoid scope resets
2018-09-17 14:55:42 +03:00
Dmitry Kurtaev
a7b3d2581f
Replace CV_USRTYPE1 for int64 to CV_32SC2 in Torch importer
2018-09-17 12:31:09 +03:00
Suleyman TURKMEN
6d5f7b72c0
Update seamless_cloning.cpp
2018-09-14 19:51:40 +03:00
Alexander Alekhin
cecb878915
Merge pull request #12527 from terfendail:mean_wintr
2018-09-14 16:34:30 +00:00
Alexander Alekhin
29c10b6792
Merge pull request #12535 from terfendail:testparser_update
2018-09-14 16:32:25 +00:00
Alexander Alekhin
92ec971453
Merge pull request #12526 from terfendail:avx2_resize_fix
2018-09-14 15:57:47 +00:00
Vitaly Tuzov
95502242c9
meanStdDev() implementation updated to use wide universal intrinsics
2018-09-14 17:52:08 +03:00
Vitaly Tuzov
1f88a1af9c
testlog_parser updated to handle output of latest GTest as well
2018-09-14 17:29:06 +03:00
Hamdi Sahloul
5d54def264
Add semicolons after CV_INSTRUMENT macros
2018-09-14 06:45:31 +09:00
Alexander Alekhin
dbfeb8892d
Merge pull request #12403 from dkurt:dnn_replace_darknet_reorg
2018-09-13 20:58:11 +00:00
Alexander Alekhin
949d7d7d25
Merge pull request #12524 from alalek:fix_dnn_skx_dlie
2018-09-13 20:56:31 +00:00
Takuho NAKANO
451340fd3d
Merge pull request #12523 from takotakot:12455_rotatedrect_constructor
...
* Fix perpendicular decision of RotatedRect::RotatedRect
Error estimation is based on #12455 .
* Fix abs to std::fabs and atan to std::atan
2018-09-13 22:26:05 +03:00
Alexander Alekhin
fdaeb20253
dnn(test): run DL IE tests on Intel OpenCL devices only
2018-09-13 15:45:51 +00:00
Vitaly Tuzov
29770e13e8
Fixed bit-exact resize SIMD implementation for AVX2 baseline
2018-09-13 18:20:27 +03:00
Alexander Alekhin
e51d7cb3d8
Merge pull request #12502 from alalek:fix_dnn_tests_32bit
2018-09-13 14:20:42 +00:00
Alexander Alekhin
f512bf7004
Merge pull request #12522 from mshabunin:remove-va-msdk-34
2018-09-13 14:15:59 +00:00
Alexander Alekhin
63affb2be9
Merge pull request #12515 from hmaarrfk:fix_bayer2rgba_blue_channel
2018-09-13 12:53:08 +00:00
Alexander Alekhin
87b1100027
Merge pull request #12410 from terfendail:sum_wintr
2018-09-13 15:49:56 +03:00
Maksim Shabunin
78c500e97a
Removed unnecessary build-time MediaSDK detection
2018-09-13 13:43:11 +03:00
Alexander Alekhin
347e09cd07
Merge pull request #12511 from GeorgeMironov:rename-tf-namespace
2018-09-12 20:13:43 +00:00
Mark Harfouche
095b0d3272
Fix BayerXX2RGBA when blue is on the first line.
2018-09-12 16:06:44 -04:00
Alexander Alekhin
b7b82c1cef
dnn(tensorflow): re-generate files using protoc
2018-09-12 21:33:45 +03:00
George Mironov
cb5da8983f
Rename tensorflow namespace
2018-09-12 21:33:11 +03:00
Alexander Alekhin
796795ac89
Merge pull request #12501 from alalek:fix_qt_build
2018-09-12 17:14:23 +00:00
Alexander Alekhin
3e8934dec0
Merge pull request #12507 from cv3d:fix_warnings
2018-09-12 17:12:46 +00:00
Dmitry Kurtaev
58ac3e09da
Change default value of crop argument of blobFromImage from true to false
2018-09-12 19:02:58 +03:00
Dmitry Kurtaev
09fa758725
Replace Darknet's Reorg to permute layer
2018-09-12 18:13:39 +03:00
take1014
57ae3ac7a2
fix document about HoughLines
2018-09-12 22:18:30 +09:00
Alexander Alekhin
6fc855865f
dnn(test): fix failures of 32-bit builders
2018-09-12 13:06:16 +00:00
Vadim Pisarevsky
f4b9acb4db
Merge pull request #12497 from tomoaki0705:removeRawSSE
2018-09-12 11:59:44 +00:00
Vadim Pisarevsky
acbfd85737
Merge pull request #12204 from allnes:detect_qr_code
2018-09-12 11:55:44 +00:00
Hamdi Sahloul
03b3be0f51
MSVC: Slience external/meaningless warnings
2018-09-12 20:02:13 +09:00
Marat K
38f8fc6c82
Merge pull request #12249 from kopytjuk:feature/region-layer-batch-mode
...
Feature/region layer batch mode (#12249 )
* Add batch mode for Darknet networks.
Swap variables in test_darknet.
Adapt reorg layer to batch mode.
Adapt region layer.
Add OpenCL implementation.
Remove trailing whitespace.
Bugifx reorg opencl implementation.
Fix bug in OpenCL reorg.
Fix modulo bug.
Fix bug.
Reorg openCL.
Restore reorg layer opencl code.
OpenCl fix.
Work on openCL reorg.
Remove whitespace.
Fix openCL region layer implementation.
Fix bug.
Fix softmax region opencl bug.
Fix opencl bug.
Fix openCL bug.
Update aff_trans.cpp
When the fullAffine parameter is set to false, the estimateRigidTransform function maybe return empty, then the _localAffineEstimate function will be called, but the bug in it will result in incorrect results.
core(libva): support YV12 too
Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)
cmake: allow to specify own libva paths
via CMake:
- `-DVA_LIBRARIES=/opt/intel/mediasdk/lib64/libva.so.2\;/opt/intel/mediasdk/lib64/libva-drm.so.2`
android: NDK17 support
tested with NDK 17b (17.1.4828580)
Enable more deep learning tests using Intel's Inference Engine backend
ts: don't pass NULL for std::string() constructor
openvino: use 2018R3 defines
experimental version++
OpenCV version++
OpenCV 3.4.3
OpenCV version '-openvino'
openvino: use 2018R3 defines
Fixed windows build with InferenceEngine
dnn: fix variance setting bug for PriorBoxLayer
- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
for _variance.size() == 1 case.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Fix lifetime of networks which are loaded from Model Optimizer IRs
Adds a small note describing BUILD_opencv_world (#12332 )
* Added a mall note describing BUILD_opencv_world cmake option to the Installation in Windows tutorial.
* Made slight changes in BUILD_opencv_world documentation.
* Update windows_install.markdown
improved grammar
Update opengl_interop.cpp
resolves #12307
java: fix LIST_GET macro
fix typo
Added option to fail on missing testdata
Fixed that object_detection.py does not work in python3.
cleanup: IPP Async (IPP_A)
except header file with conversion routines (will be removed in OpenCV 4.0)
imgcodecs: add null pointer check
Include preprocessing nodes to object detection TensorFlow networks (#12211 )
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics
resolve #5788
imgcodecs(webp): multiple fixes
- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder
ml: fix adjusting K in KNearest (#12358 )
dnn(perf): fix and merge Convolution tests
- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1
dnn(test): use dnnBackendsAndTargets() param generator
Bit-exact resize reworked to use wide intrinsics (#12038 )
* Bit-exact resize reworked to use wide intrinsics
* Reworked bit-exact resize row data loading
* Added bit-exact resize row data loaders for SIMD256 and SIMD512
* Fixed type punned pointer dereferencing warning
* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize
Bit-exact GaussianBlur reworked to use wide intrinsics (#12073 )
* Bit-exact GaussianBlur reworked to use wide intrinsics
* Added v_mul_hi universal intrinsic
* Removed custom SSE2 branch from bit-exact GaussianBlur
* Removed loop unrolling for gaussianBlur horizontal smoothing
doc: fix English gramma in tutorial out-of-focus-deblur filter (#12214 )
* doc: fix English gramma in tutorial out-of-focus-deblur filter
* Update out_of_focus_deblur_filter.markdown
slightly modified one sentence
doc: add new tutorial motion deblur filter (#12215 )
* doc: add new tutorial motion deblur filter
* Update motion_deblur_filter.markdown
a few minor changes
Replace Slice layer to Crop in Faster-RCNN networks from Caffe
js: use generated list of OpenCV headers
- replaces hand-written list
imgcodecs(webp): use safe cast to size_t on Win32
* Put Version status back to -dev.
follow the common codestyle
Exclude some target engines.
Refactor formulas.
Refactor code.
* Remove unused variable.
* Remove inference engine check for yolov2.
* Alter darknet batch tests to test with two different images.
* Add yolov3 second image GT.
* Fix bug.
* Fix bug.
* Add second test.
* Remove comment.
* Add NMS on network level.
* Add helper files to dev.
* syntax fix.
* Fix OD sample.
Fix sample dnn object detection.
Fix NMS boxes bug.
remove trailing whitespace.
Remove debug function.
Change thresholds for opencl tests.
* Adapt score diff and iou diff.
* Alter iouDiffs.
* Add debug messages.
* Adapt iouDiff.
* Fix tests
2018-09-12 13:29:43 +03:00
Alexander Alekhin
d7ac4495c3
highgui: fix QT build
2018-09-11 20:30:50 +00:00
Alexander Alekhin
492ef14550
Merge pull request #12494 from DEEPIR:3.4
2018-09-11 19:38:00 +00:00
Alexander Alekhin
be2ccdbf0b
Merge pull request #12479 from sturkmen72:patch-2
2018-09-11 19:33:50 +00:00
Tomoaki Teshima
88b04c3cd4
remove raw SSE2 implementation
2018-09-11 21:28:18 +09:00
Alexander Nesterov
1fb7ee0e16
Optimiaztion search template lines and added sample
2018-09-11 11:46:36 +00:00
cyy
8f78a1123b
fix uninitialized read errors reported by CUDA-INITCHECK
2018-09-11 14:47:39 +08:00
Alexander Alekhin
b9fd5f8186
Merge pull request #12483 from terfendail:meanstddev_multichan
2018-09-10 19:27:51 +00:00
Lubov Batanina
0c8590027f
Merge pull request #12071 from l-bat/l-bat:onnx_parser
...
* Add Squeezenet support in ONNX
* Add AlexNet support in ONNX
* Add Googlenet support in ONNX
* Add CaffeNet and RCNN support in ONNX
* Add VGG16 and VGG16 with batch normalization support in ONNX
* Add RCNN, ZFNet, ResNet18v1 and ResNet50v1 support in ONNX
* Add ResNet101_DUC_HDC
* Add Tiny Yolov2
* Add CNN_MNIST, MobileNetv2 and LResNet100 support in ONNX
* Add ONNX models for emotion recognition
* Add DenseNet121 support in ONNX
* Add Inception v1 support in ONNX
* Refactoring
* Fix tests
* Fix tests
* Skip unstable test
* Modify Reshape operation
2018-09-10 21:07:51 +03:00
Vitaly Tuzov
0a5bd0ac8b
sum() implementation updated to use wide universal intrinsics
2018-09-10 20:16:38 +03:00
Vitaly Tuzov
2f929376ec
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels
2018-09-10 20:05:45 +03:00
Suleyman TURKMEN
30a4e2f7ac
Update hog.cpp
2018-09-10 16:49:39 +03:00
Alexander Alekhin
c331a214d0
Merge pull request #12054 from alalek:debug_bindings
2018-09-10 10:44:32 +00:00
Suleyman TURKMEN
92517fa359
Update window.cpp
2018-09-09 19:24:25 +00:00
Alexander Alekhin
95dd4b3f27
bindings: add debug helpers for args conversions
2018-09-08 12:23:08 +00:00
Mark Harfouche
53bbed89ae
Output RGBA images when bayer_xx2YYYA is called
2018-09-07 16:03:04 -04:00
cyy
286c2c236b
Merge pull request #12458 from DEEPIR:3.4
...
* may be an typo fix
* remove identical branch,may be paste error
* add parentheses around macro parameter
* simplify if condition
* check malloc fail
* change the condition of branch removed by commit 3041502861
2018-09-07 18:43:47 +03:00
Hamdi Sahloul
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +09:00
Alexander Alekhin
f90aea22b1
cuda: fix build (legacy C-API usage)
2018-09-07 07:26:17 +00:00
Alexander Alekhin
bd98ed46bd
Merge pull request #12446 from alalek:imgproc_grabcut_numeric_issues
2018-09-06 20:18:45 +00:00
cyy
8b48c2a10c
Merge pull request #12443 from DEEPIR:master
...
* simplify condition
* dims must > 0 or latter sz[dims-1] will underflow
2018-09-06 23:09:39 +03:00
Alexander Alekhin
f1f15841d7
Merge pull request #11630 from alalek:c_api_eliminate_constructors
2018-09-06 20:07:16 +00:00
Vadim Pisarevsky
80b62a41c6
Merge pull request #12411 from vpisarev:wide_convert
...
* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion
* fixed compile warnings
* fix some more compile errors
* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)
* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
2018-09-06 19:36:59 +03:00
Vadim Pisarevsky
54279523a3
Merge pull request #12437 from vpisarev:avx2_fixes
...
* trying to fix the custom AVX2 builder test failures (false alarms)
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* seemingly disabled false alarm warning in surf.cpp; increased tolerance thresholds in the tests for SolvePnP and in DNN/ENet
2018-09-06 18:56:55 +03:00
Alexander Alekhin
24e72e151a
imgproc: grabcut numeric stability
2018-09-06 17:05:54 +03:00
Alexander Alekhin
8a3c394d6a
don't use constructors for C API structures
2018-09-06 14:34:16 +03:00
Alexander Alekhin
ad146e5a6b
core: remove constructors from C API structures
...
POD structures can't have constructors.
2018-09-06 14:34:09 +03:00
Alexander Alekhin
66d15e89df
Merge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4
2018-09-06 10:33:33 +00:00
Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
woody.chow
07c6b0a8df
Replace naive normL2Sqr with hal::normL2Sqr_ for better performance
2018-09-06 17:43:07 +09:00
Zhenqing Hu
d621a99e73
To fix bug #12389 , which is a validation for the potential null pointer.
...
Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
2018-09-05 19:14:34 +03:00
Alexander Alekhin
107660c7ba
Merge pull request #12433 from alalek:fix_contrib_1746
2018-09-05 16:09:27 +00:00
Alexander Alekhin
e70526625f
imgproc: fix Subdiv2D::getTriangleList()
2018-09-05 16:24:27 +03:00
Alexander Alekhin
8a328e393d
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests
2018-09-05 10:04:04 +00:00
Dmitry Kurtaev
6ec230480d
Enable Myriad tests with batch size > 1
2018-09-05 10:45:09 +03:00
Alexander Alekhin
c441ad36c8
build: don't use nullptr without C++11 guard
2018-09-05 06:19:02 +00:00
Hamdi Sahloul
3f3d805663
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
2018-09-05 12:16:47 +09:00
Alexander Alekhin
351ee2e3a5
Merge pull request #12409 from dkurt:fix_12407
2018-09-04 16:34:30 +00:00
Alexander Alekhin
7f7f30a08b
Merge pull request #12406 from alalek:backport_12357_12391
2018-09-04 16:09:44 +00:00
Alexander Alekhin
fda99c1c6c
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
2018-09-04 15:16:08 +00:00
Alexander Alekhin
71c8de8fa1
Merge pull request #12383 from alalek:ts_qemu_support
2018-09-04 15:15:39 +00:00
Dmitry Kurtaev
27a6be8763
Fix #12407
2018-09-04 17:48:52 +03:00
Alexander Alekhin
acce95f446
backport fixes for static analyzer warnings
...
Commits:
- 09837928d910fb88d027
2018-09-04 16:49:42 +03:00
Alexander Alekhin
a78e5344df
Merge pull request #12382 from alalek:update_gtest_1.8.1
2018-09-04 13:28:55 +00:00
Alexander Alekhin
e5236cecd6
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
2018-09-04 12:55:05 +00:00
Alexander Alekhin
4f9db2c03a
Merge pull request #12377 from alalek:inputarray_raw_wrapper_customtype
2018-09-04 11:29:23 +00:00
Todor Tomov
9988e1b6ee
cap_v4l: Fix private control enumeration end condition
...
Currently the private control enumeration will be stopped when QUERYCTRL
returns -EINVAL only. It is possible however that other errors occur.
One particular case is when the v4l2 device doesn't support any controls
and doesn't implement the QUERYCTRL ioctl. In that case the v4l2
framework returns -ENOTTY. In that case the current control enumeration
will go in an endless loop.
To fix this change the control enumeration stop condition. If any errors
occur, end the control enumeration.
Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
2018-09-04 11:33:08 +03:00
Alexander Alekhin
0f0a82b619
Merge pull request #12402 from alalek:fix_build_dnn_tests
2018-09-04 06:39:20 +00:00
Alexander Alekhin
2cf34c0fe5
dnn: fix tests build with disabled OpenCL
2018-09-03 23:11:25 +00:00
Alexander Alekhin
49a1328046
Merge pull request #12396 from LaurentBerger:I12392
2018-09-03 20:26:14 +00:00
Alexander Alekhin
2877f17372
Merge pull request #12397 from terfendail:resize_wintr_fix
2018-09-03 20:25:45 +00:00
Alexander Alekhin
00cbb894ec
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
2018-09-03 18:41:48 +00:00
Alexander Alekhin
a0f86479e0
core: wrap custom types via _RawArray (raw() call)
...
- support passing of `std::vector<KeyPoint>` via InputArray
2018-09-03 18:41:48 +00:00
Vitaly Tuzov
f9a5c4d181
Fixed bit-exact resize wide intrinsics implementation for 16U
2018-09-03 20:37:25 +03:00
LaurentBerger
d71812425a
Solves issue 12392
2018-09-03 19:30:49 +02:00
Alexander Alekhin
aa5c45339c
Merge pull request #12393 from peterjozsa:issue_12301
2018-09-03 16:16:48 +00:00
Alexander Alekhin
1e362ff5c3
imgproc(GaussianBlur): restore processing order
2018-09-03 18:39:42 +03:00
Vadim Pisarevsky
fc71316690
Merge pull request #12371 from alalek:issue_12366
2018-09-03 14:30:16 +00:00
yuki takehara
cb7ee27cd9
Fix bug in distanceTransform ( #12278 )
...
* fix 12218
* Update test_distancetransform.cpp
marked the test as "BIGDATA_TEST" in order to skip it on low-mem platforms
* modify test
* use a smaller image in the test
* fix test code
2018-09-03 17:18:10 +03:00
Dmitry Kurtaev
c7cf8fb35c
Import SSDs from TensorFlow by training config ( #12188 )
...
* Remove TensorFlow and protobuf dependencies from object detection scripts
* Create text graphs for TensorFlow object detection networks from sample
2018-09-03 17:08:40 +03:00
Peter Jozsa
8b0e1c7fcb
Fix https://github.com/opencv/opencv/issues/12301
2018-09-03 14:56:38 +02:00
Alexander Alekhin
e3af72bb68
Merge pull request #12376 from alalek:issue_12337
2018-09-03 10:17:56 +00:00
Alexander Alekhin
ec3492a22a
Merge pull request #12374 from alalek:issue_12368
2018-09-03 10:17:09 +00:00
Alexander Alekhin
07808c8d5d
Merge pull request #12373 from alalek:issue_12365
2018-09-03 10:16:51 +00:00
Wu Zhiwen
a11d944f51
dnn: Remove a duplicated code snippet for flatten layer
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-09-03 10:57:33 +08:00
Alexander Alekhin
af883e88e1
ts: support QEMU launcher
2018-09-02 21:48:01 +00:00
Alexander Alekhin
3dddf703a9
ts: re-apply OpenCV-specific patch on googletest 1.8.1
2018-09-02 13:45:48 +00:00
Alexander Alekhin
f7ccc74e09
ts: update Google Test 1.8.1
...
Helper script from googletest: ./scripts/fuse_gtest_files.py
2018-09-02 12:21:29 +00:00
Alexander Alekhin
546fcd990e
ts: restore Google Test 1.8.0 (capture OpenCV specific patch)
2018-09-02 12:07:15 +00:00
Alexander Alekhin
5eb295adf3
Merge pull request #12379 from alalek:fix_warning_win32
2018-09-02 11:50:32 +00:00
Alexander Alekhin
20bf7b6a79
imgcodecs(webp): use safe cast to size_t on Win32
2018-09-02 10:00:52 +00:00
Alexander Alekhin
af769e4ec8
Merge pull request #12362 from alalek:fix_js_headers
2018-09-02 04:15:16 +00:00
Alexander Alekhin
70a27c7dd6
core: add solveLP type checks for output
...
to forbid Mat1f
Checks are not reliable: empty uninitialized `cv::Mat` has `CV_8UC1` type
2018-09-01 14:51:44 +00:00
Alexander Alekhin
701760dbeb
calib3d: use Mat::reserveBuffer() instead of .create()
...
to allocate memory >2Gb
2018-09-01 13:18:08 +00:00
Alexander Alekhin
0f9f2696be
imgproc: small code refactoring (findContours -> l_cinfo)
2018-09-01 12:58:40 +00:00
Alexander Alekhin
65a0587ce8
imgproc(segmentation): don't increase mask NULL pointer
...
Avoid manual address arithmetic
2018-09-01 12:38:57 +00:00
Vadim Pisarevsky
f9c8bb40b1
Merge pull request #12350 from dkurt:dnn_ie_caffe_faster_rcnn
2018-08-31 14:57:14 +00:00
Vitaly Tuzov
0f2b535fcc
Bit-exact GaussianBlur reworked to use wide intrinsics ( #12073 )
...
* Bit-exact GaussianBlur reworked to use wide intrinsics
* Added v_mul_hi universal intrinsic
* Removed custom SSE2 branch from bit-exact GaussianBlur
* Removed loop unrolling for gaussianBlur horizontal smoothing
2018-08-31 17:04:59 +03:00
Vitaly Tuzov
e345cb03d5
Bit-exact resize reworked to use wide intrinsics ( #12038 )
...
* Bit-exact resize reworked to use wide intrinsics
* Reworked bit-exact resize row data loading
* Added bit-exact resize row data loaders for SIMD256 and SIMD512
* Fixed type punned pointer dereferencing warning
* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize
2018-08-31 16:54:05 +03:00
Alexander Alekhin
f33cbe94dd
Merge pull request #12142 from alalek:dnn_ocl_fix_convolution_perf_tests
2018-08-31 13:27:14 +00:00
berak
e13f6ded7f
ml: fix adjusting K in KNearest ( #12358 )
2018-08-31 16:07:53 +03:00
Vadim Pisarevsky
4b03a4a841
Merge pull request #12353 from alalek:imgcodecs_fix_webp
2018-08-31 13:03:10 +00:00
Vadim Pisarevsky
bab4f4f5d8
Merge pull request #12348 from take1014:subdiv_getTriangleList_5788
2018-08-31 13:01:16 +00:00
Vadim Pisarevsky
a08c6e49b3
Merge pull request #12341 from terfendail:countnonzero_wintr
2018-08-31 12:58:25 +00:00
Dmitry Kurtaev
50bceea038
Include preprocessing nodes to object detection TensorFlow networks ( #12211 )
...
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
2018-08-31 15:41:56 +03:00
Alexander Alekhin
c557193b8c
dnn(test): use dnnBackendsAndTargets() param generator
2018-08-31 15:11:58 +03:00
Alexander Alekhin
3e6b3a6856
dnn(perf): fix and merge Convolution tests
...
- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1
2018-08-31 15:02:19 +03:00
Alexander Alekhin
d52cef1719
js: use generated list of OpenCV headers
...
- replaces hand-written list
2018-08-31 14:48:44 +03:00
Alexander Alekhin
0d4fd20a73
imgcodecs: add null pointer check
2018-08-31 12:56:02 +03:00
Alexander Alekhin
0515f930e8
imgcodecs(webp): multiple fixes
...
- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder
2018-08-30 20:42:33 +00:00
Vitaly Tuzov
c894fc5bae
countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics
2018-08-30 20:43:39 +03:00
take1014
e1ee744e15
resolve #5788
2018-08-31 00:59:00 +09:00
Alexander Alekhin
e86287d8ae
cleanup: IPP Async (IPP_A)
...
except header file with conversion routines (will be removed in OpenCV 4.0)
2018-08-30 18:53:07 +03:00
Alexander Alekhin
4c7d521413
Merge pull request #12346 from mshabunin:test-data-check
2018-08-30 15:36:58 +00:00
Dmitry Kurtaev
ea43e28a37
Replace Slice layer to Crop in Faster-RCNN networks from Caffe
2018-08-30 17:57:08 +03:00
Vadim Pisarevsky
258a769567
Merge pull request #12327 from take1014:distanceTransform_type
2018-08-30 13:12:08 +00:00
Alexander Alekhin
7845f6d95c
Merge pull request #12345 from berak:fix_java_list_string
2018-08-30 13:04:19 +00:00
Maksim Shabunin
cecf84410c
Added option to fail on missing testdata
2018-08-30 15:15:08 +03:00
Alexander Alekhin
596a0125ed
Merge pull request #12336 from dkurt:dnn_ie_fix_net_lifetime
2018-08-30 11:09:18 +00:00
berak
72f422c7dc
java: fix LIST_GET macro
2018-08-30 13:06:02 +02:00
Wu Zhiwen
ca51bbb7ff
dnn: fix variance setting bug for PriorBoxLayer
...
- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
for _variance.size() == 1 case.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-08-30 11:05:38 +08:00
Dmitry Kurtaev
4062ef5fcb
Fix lifetime of networks which are loaded from Model Optimizer IRs
2018-08-29 13:34:26 +03:00
take1014
1ae477a46d
fix typo
2018-08-28 22:14:47 +09:00
Alexander Alekhin
d13db35f31
Merge tag '3.4.3'
2018-08-28 16:03:08 +03:00
Alexander Alekhin
b38c50b3d0
OpenCV 3.4.3
2018-08-28 15:58:21 +03:00
Alexander Alekhin
50b61668e2
Merge pull request #12326 from alalek:issue_12325
2018-08-28 12:51:33 +00:00
Alexander Alekhin
1df84f7246
Merge pull request #12319 from dkurt:dnn_enable_ie_tests
2018-08-28 12:50:32 +00:00
Alexander Alekhin
af0c930e77
ts: don't pass NULL for std::string() constructor
2018-08-28 14:19:56 +03:00
Alexander Alekhin
4e0d2a3e6c
Merge pull request #12193 from alalek:fix_vaapi_sample
2018-08-27 20:56:20 +00:00
Alexander Alekhin
da6d8961fc
Merge pull request #12286 from logic1988:master
2018-08-27 19:05:23 +00:00
Dmitry Kurtaev
3e027df583
Enable more deep learning tests using Intel's Inference Engine backend
2018-08-27 18:37:35 +03:00
Alexander Alekhin
6477262e63
Merge pull request #12306 from berak:python_nmsboxes
2018-08-25 16:35:00 +00:00
Maxim Smirnov
c94d75874b
CV_Asserts changed
...
Some `CV_Assert`s changed to `CV_Assert_N`s according to https://github.com/opencv/opencv/issues/12304
2018-08-25 14:52:27 +03:00
berak
21f3987d53
python: add support for NMSBoxes
2018-08-25 08:44:45 +02:00
Alexander Alekhin
d10a219833
Merge pull request #12298 from berak:java_matofrotatedrect
2018-08-24 15:54:27 +00:00
berak
bd7bf39b4b
java: change MatOfRotatedRect to CV_32FC5
2018-08-24 14:20:36 +02:00
Dmitry Kurtaev
472b71ecef
Merge pull request #12243 from dkurt:dnn_tf_mask_rcnn
...
* Support Mask-RCNN from TensorFlow
* Fix a sample
2018-08-24 14:47:32 +03:00
Alexander Alekhin
e8d45a9cdd
Merge pull request #12274 from alalek:fix_10945
2018-08-24 08:30:52 +00:00
Alexander Alekhin
ff2eface19
Merge pull request #12126 from alalek:reproducer_12121
2018-08-24 08:08:17 +00:00
Alexander Alekhin
29ce348c4d
Merge pull request #12287 from berak:java_matofrotatedrect
2018-08-24 07:03:13 +00:00
Hamdi Sahloul
4d78342919
Closes #12281 - a bug in cuda::pow with negative base values
2018-08-24 05:12:14 +09:00
logic1988
b47c9ac643
Update aff_trans.cpp
...
When the fullAffine parameter is set to false, the estimateRigidTransform function maybe return empty, then the _localAffineEstimate function will be called, but the bug in it will result in incorrect results.
2018-08-23 21:52:27 +08:00
berak
1c20a7f008
java: add a MatOfRotatedRect class
2018-08-23 12:01:36 +02:00
Alexander Alekhin
096366738b
dnn(build): fix CV_Assert() usage
2018-08-22 16:04:40 +03:00
Alexander Alekhin
6a6506b02d
viz: call "mapper->Update()" before and after SetInputData()
2018-08-22 15:40:51 +03:00
Alexander Alekhin
2c42361ecd
build: fix build with defined CV_STATIC_ANALYSIS
2018-08-22 14:19:21 +03:00
Alexander Alekhin
f25450791b
dnn(test): mark unstable OpenCL tests
2018-08-21 16:31:41 +03:00
Alexander Alekhin
c9faa09d55
Merge pull request #12266 from mshabunin:fix-windows-ie-build
2018-08-21 13:07:44 +00:00
Alexander Alekhin
1deeca985f
Merge pull request #12262 from sivaraam:v4l2_mainloop
2018-08-21 12:47:29 +00:00
Alexander Alekhin
6acabd1fd8
Merge pull request #12256 from alalek:core_intrin_fp16_fix
2018-08-21 12:47:08 +00:00
Alexander Alekhin
5ac9a2a7d0
Merge pull request #12219 from alalek:fix_assert_messages
2018-08-21 12:46:35 +00:00
Maksim Shabunin
808c89adc1
Fixed windows build with InferenceEngine
2018-08-21 14:59:13 +03:00
Kaartic Sivaraam
a527e8cc73
cap-v4l: remove unwanted loop in V4L2 mainloop
...
The while loop would run only once making it useless and leading
to confusion.
So, remove the unwanted while loop and just keep an infinite for
loop.
2018-08-21 16:41:01 +05:30
Colin Smith
76f47548b3
Add export macro for ios conversion functions
2018-08-20 14:10:54 -07:00
Alexander Alekhin
67d46dfc6c
core(intrin): restrict FP16 operations
...
Intrinsics must be effective, so don't declare FP16 type/operations if there is no native support.
- CV_FP16: supports load/store into/from float32
- CV_SIMD_FP16: declares FP16 types and native FP16 operations
2018-08-20 19:24:33 +03:00
Rostislav Vasilikhin
378cf2ab63
fixed filename slash processing
2018-08-20 18:02:49 +03:00
Alexander Alekhin
c6f5b013ec
Merge pull request #12242 from alalek:fix_12236
2018-08-20 13:53:27 +00:00
Alexander Alekhin
e593d5bbc5
Merge pull request #12255 from csukuangfj:patch_5
2018-08-20 13:47:41 +00:00
Kuang Fangjun
ab8ba047a5
fix a typo.
2018-08-20 15:52:18 +08:00
Kuang Fangjun
cecc19381f
fix an error in the formula for cv::cornerSubPix
2018-08-20 15:49:35 +08:00
Alexander Alekhin
6e84abc746
ml: don't use "getSubVector()" with 2D matrix
...
It is designed for 1D vectors only
2018-08-18 20:50:36 +00:00
Alexander Alekhin
322c6b1ba4
Merge pull request #12235 from alalek:core_perf_scalar_tests
2018-08-18 20:45:47 +00:00
Alexander Alekhin
73d44c7881
Merge pull request #12172 from alalek:core_move_const_table
2018-08-17 14:03:01 +00:00
Alexander Alekhin
31fef14d76
Merge pull request #12136 from sturkmen72:update_documentation
2018-08-17 14:02:20 +00:00
Alexander Alekhin
7ee69740e8
ml(test): test different samples layout of TrainData
2018-08-17 16:57:20 +03:00
Suleyman TURKMEN
c61bc3a0cb
Update documentation and samples
2018-08-17 14:21:29 +03:00
Alexander Alekhin
b24fc6954d
core(perf): fix addScalar test
...
keep the same type for passed Scalar values
2018-08-16 19:36:28 +03:00
Alexander Alekhin
828cb4286d
Merge pull request #12220 from sturkmen72:update_seamless_cloning
2018-08-16 16:26:27 +00:00
Alexander Alekhin
ee5e0e16d9
Merge pull request #12233 from mshabunin:fix-world-install-headers
2018-08-16 16:03:10 +00:00
Alexander Alekhin
b907bfe3e7
Merge pull request #12222 from NCBee:master
2018-08-16 16:02:39 +00:00
Maksim Shabunin
f84eb3dde6
Fixed core headers installation in world builds
2018-08-16 17:16:02 +03:00
Alexander Alekhin
b996b618e0
Merge pull request #12228 from tomoaki0705:fixTypoCalib3d
2018-08-16 12:29:10 +00:00
Alexander Alekhin
98c5ce9347
imgproc(test): refactor test_intersection.cpp
...
don't use legacy test API
2018-08-16 15:27:24 +03:00
Alexander Alekhin
f89defad5d
imgproc: fix rotatedRectangleIntersection()
2018-08-16 15:27:24 +03:00
Bahram Dahi
96f92c6705
imgproc(tests): intersetion calculation of RotatedRect
2018-08-16 15:00:01 +03:00
Tomoaki Teshima
f0c46a4c74
fix typo
2018-08-16 19:11:40 +09:00
Suleyman TURKMEN
860ae77ec9
Update seamless_cloning
2018-08-15 22:59:18 +03:00
Alexander Alekhin
d2e08a524e
core: repair CV_Assert() messages
...
Multi-argument CV_Assert() is accessible via CV_Assert_N() (with malformed messages).
2018-08-15 17:43:10 +03:00
Alexander Alekhin
c1df9ad456
OpenCV version++
...
OpenCV 3.4.3
2018-08-14 14:10:37 +03:00
Alexander Alekhin
781721ca50
experimental version++
2018-08-14 14:10:37 +03:00
Alexander Alekhin
b9b66ca437
Merge pull request #12205 from dkurt:dnn_update_tf_face_detection
2018-08-14 10:53:12 +00:00
Dmitry Kurtaev
f056c0f137
UINT8 face detection network using Intel's Inference Engine backend
2018-08-13 18:38:47 +03:00
Alexander Alekhin
615883977f
Merge pull request #12128 from dkurt:dnn_fix_12066
2018-08-10 14:14:16 +00:00
Alexander Alekhin
4910f16f16
core(libva): support YV12 too
...
Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)
2018-08-10 16:02:05 +03:00
Alexander Alekhin
8b2122e12f
Merge pull request #12174 from alalek:dnn_move_range_ostream_operator
2018-08-08 20:51:26 +00:00
Alexander Alekhin
f16f818f5f
Merge pull request #12184 from alalek:issue_12163
2018-08-08 20:50:54 +00:00
Alexander Alekhin
5b3ac112fe
core: move const tables outside of dispatched code
...
To avoid duplicates in binaries
2018-08-08 17:54:54 +03:00
Alexander Alekhin
a0cff0be94
imgproc(cvtColor): slightly improve error messages
...
Do not try to process empty inputs.
2018-08-08 17:16:42 +03:00
Alexander Alekhin
b00758babe
imgproc(cvtColor): temporary disable IPP for 8U GRAY2BGR mode
...
Details 12176
2018-08-08 13:58:45 +03:00
Alexander Alekhin
a56b221559
core: cv::Range() ostream write operator
...
remove from DNN module headers
2018-08-07 20:03:21 +03:00
yom
fb2b26c419
photo: Decolor corrections
...
* Keep image aspect ratio in resize called in grad_system and
weak_order
* Bug correction in loop inside Decolor::gradvector
2018-08-07 19:08:57 +03:00
Alexander Alekhin
377e51df83
Merge pull request #12169 from berak:photo_decolor
2018-08-07 16:01:42 +00:00
Alexander Alekhin
7453a6938a
core(test): extra tests/fixes for merge/split ( #12171 )
...
* core(test): merge hang test
* core(merge/split): fix intrin optimization
2018-08-07 18:11:05 +03:00
Maksim Shabunin
39f5e57321
Merge pull request #12159 from zarelaky:master
2018-08-07 13:15:19 +00:00
berak
f49f6d52b4
photo: avoid resizing a const Mat in decolor()
2018-08-07 15:14:22 +02:00
zarelaky
715f23127c
Update cap_gstreamer.cpp
...
fixed call open(int id) failed
2018-08-07 15:21:46 +03:00
Maksim Shabunin
f0f652f9e9
Merge pull request #12161 from alalek:cache_dump_neighbor_directories_for_cleanup
2018-08-07 12:09:39 +00:00
Maksim Shabunin
731aa963bd
Merge pull request #12166 from berak:fix_mjpeg_decoder
2018-08-07 12:09:13 +00:00
berak
7e353a1ec5
videoio: check iterator in mjpeg_encoder.cpp
2018-08-07 11:43:37 +02:00
Alexander Alekhin
5c3880d302
core(intrin): avoid symbols duplication from SIMD128/256 cases
...
All vx_call() must be wrapped into own simd128/simd256/simd512 namespace
```
namespace CV__SIMD_NAMESPACE {
... vx_call declaration is here ...
}
```
2018-08-06 19:29:46 +00:00
Alexander Alekhin
9eaa583bfb
core: dump neighbour cache directories (from old OpenCV versions)
...
- use '3.4.x' cache name for current maintenance series (there are no serious changes between releases)
- message is shown only once during creation of new cache directory
- use OPENCV_CACHE_SHOW_CLEANUP_MESSAGE=0 to hide this warning
2018-08-06 19:05:35 +03:00
Vadim Pisarevsky
6500700d6f
Merge pull request #12157 from allnes:detect_qr_code
2018-08-06 14:50:28 +00:00
Alexander Nesterov
f95a411ba3
Update binarization
2018-08-06 12:10:45 -03:00
Vadim Pisarevsky
7c8ab271fc
Merge pull request #12125 from dkurt:dnn_mobilenet_ppn
2018-08-06 14:40:50 +00:00
Vadim Pisarevsky
70b893333d
Merge pull request #12130 from dkurt:dnn_ie_mvn
2018-08-06 14:37:46 +00:00
Dmitry Kurtaev
449696f1e5
Enable reshape-as-shape layer from TensorFlow
2018-08-06 17:35:06 +03:00
Vadim Pisarevsky
e0c93bcf6c
Merge pull request #12082 from dkurt:dnn_ie_faster_rcnn
2018-08-06 14:28:58 +00:00
Vadim Pisarevsky
23022f3ffb
Merge pull request #12121 from maver1:amatyuko/sse2_convert_with_saturation_fix
2018-08-06 14:26:37 +00:00
Alexander Alekhin
ac4a6aad15
Merge pull request #12050 from alalek:dnn_ocl_avoid_memory_access_violation
2018-08-05 14:47:01 +00:00
Alexander Alekhin
7d7767ba42
Merge pull request #12134 from mshabunin:add-yuv420-v4l
2018-08-04 13:48:34 +00:00
Alexander Alekhin
9cb3e9abf0
Merge pull request #12135 from tompollok:3.4
...
imgproc: update cornerSubPix documentation
2018-08-04 16:02:21 +03:00
Alexander Alekhin
b4cea8d6d1
Merge pull request #12120 from alalek:core_test_intrin_dispatched
2018-08-03 17:07:17 +00:00
Alexander Alekhin
8f57fc93ec
Merge pull request #12123 from allnes:detect_qr_code
2018-08-03 16:52:26 +00:00
Alexander Alekhin
1c73e66edf
Merge pull request #12131 from alalek:issue_12083
2018-08-02 16:50:51 +00:00
tompollok
061149cbbd
imgproc: update cornerSubPix documentation
2018-08-02 18:00:43 +02:00
Maksim Shabunin
a2daf0c83c
videoio: added YUV420 format (UV order) support to v4l capture
2018-08-02 18:34:11 +03:00
Dmitry Kurtaev
be08730cd6
MVN layer using Intel's Inference Engine backend
2018-08-02 17:49:03 +03:00
Alexander Alekhin
3082ea82f9
core(merge): fix SIMD loop head processing
2018-08-02 17:23:19 +03:00
Pierre Jeambrun
5131619a1a
feat(stitching): Add Sift support for the FeaturesFinder
2018-08-02 17:22:13 +03:00
Alexander Alekhin
f2e1710dd5
core(test): regression test for 12121
2018-08-01 19:42:54 +03:00
Alexander Nesterov
05830874d7
Refactor code
2018-08-01 12:15:40 -03:00
Dmitry Kurtaev
4fb086d6c3
MobileNet-SSD v1 from TensorFlow with shared convolution weights
2018-08-01 16:16:48 +03:00
amatyuko
3ea2586a5a
Fix for SSE2 intrinsics problem in the part of saturation arithmetic processing during 32s->16u packed conversion -
...
for some big negative values less than -INT_MAX+32767 the sign of the numbers is lost due to overflow that leads to
incorrect saturation to MAX value, instead of zero.
The issue is not reproduced with CV_ENABLED_INTRINSICS=OFF
2018-08-01 16:04:08 +03:00
Alexander Alekhin
3f302cabb8
core(test): intrinsic tests for all dispatched CPU optimizations
...
- tests for both SIMD128 / SIMD256
- different dispatched + baseline(SIMD128) intrinsics
2018-08-01 13:50:42 +03:00
Dmitry Kurtaev
8e034053af
Faster-RCNN from TensorFlow on CPU with Intel's Inference Engine backend
2018-08-01 11:29:58 +03:00
luz.paz
1e1a1855ae
Source typo fixes
2018-07-31 18:44:23 +03:00
luz.paz
2003eb1b9b
Misc. typos
...
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
2018-07-31 18:44:23 +03:00
Alexander Alekhin
7e71b1079e
Merge pull request #12103 from alalek:ocl_fix_crash
2018-07-31 14:55:43 +00:00
Alexander Alekhin
814ebe39ae
Merge pull request #12113 from dkurt:dnn_fix_ssd_on_myriad
2018-07-31 14:55:18 +00:00
Alexander Alekhin
61c870ae09
Merge pull request #12080 from mshabunin:fix-static-3
2018-07-31 14:53:28 +00:00
Maksim Shabunin
7cf52de47e
dnn: modified IE search, R2 compatibility fixed
2018-07-31 14:48:06 +03:00
Dmitry Kurtaev
ed0e79cb61
Add missing parameter to DetectionOutput layer from Intel's Inference Engine
2018-07-31 11:37:45 +03:00
Sayed Adel
bb82cdc928
core:test Fix fp16 build if AVX2 sets as baseline
2018-07-31 10:02:20 +02:00
Alexander Alekhin
28d0e97c09
Merge pull request #12004 from mshabunin:more-asserts
2018-07-30 16:42:09 +00:00
Alexander Alekhin
5bde800ee3
Merge pull request #12088 from alalek:ocl_callback_catch_exceptions
2018-07-30 16:33:41 +00:00
Alexander Alekhin
29a1dc5719
Merge pull request #12087 from alalek:docs_videowriter_write_bgr_input
2018-07-30 16:33:23 +00:00
Alexander Alekhin
dbf3362c4d
Merge pull request #12056 from seiko2plus:coreExpandTests
2018-07-30 16:23:11 +00:00
Alexander Alekhin
c4e0f4b2b5
Merge pull request #12102 from csukuangfj:patch_3
2018-07-30 12:48:06 +00:00
Alexander Alekhin
e90e398e7a
core(ocl): do not split refcount operations / compare
...
- check result from CV_XADD() directly
- decrease urefcount after unmap() call only
2018-07-30 15:42:09 +03:00
miaow1988
2988260107
Fixed the int size overflow bug of cv::Mat.push_back().
...
Changed the type of variable *r* from int to size_t.
This change makes sure that a valid result of std::max(r + delta,
(r*3+1)/2) can be passed into the reserve function.
2018-07-30 18:36:19 +08:00
Kuang Fangjun
83039c8752
fix a typo.
2018-07-30 18:18:18 +08:00
Sayed Adel
6499263b41
core:test Expand hal_intrin tests to support SIMD256
2018-07-30 08:50:50 +02:00
Sayed Adel
47202b3349
core:avx2 fix unaligned store for v_store_interleave v_uint32x8-3ch
2018-07-29 18:22:46 +02:00
Alexander Alekhin
9076bb6089
Merge pull request #12081 from mshabunin:fix-ie-build
2018-07-28 20:34:19 +00:00
Alexander Alekhin
89528d7c3a
core(ocl): don't expose exceptions from OpenCL callback
...
to avoid silent crashes of OpenCL worker threads.
2018-07-28 10:29:26 +00:00
Alexander Alekhin
0bef42ba12
videoio: add note about image BGR format VideoWriter::write()
2018-07-28 09:08:09 +00:00
Alexander Alekhin
b41bc0ae59
Merge pull request #12067 from mshabunin:clean-test-case-list
2018-07-28 06:21:53 +00:00
Maksim Shabunin
fb1f12021b
Fixed build with latest IE version
2018-07-27 19:56:35 +03:00
Maksim Shabunin
dd8e990451
Fixed several issues found by static analysis, GStreamer backend
2018-07-27 18:41:39 +03:00
Maksim Shabunin
e031bada7d
Fixed several issues found by static analysis, Windows-specific
2018-07-27 18:25:55 +03:00
Alexander Alekhin
b597c87bed
dnn(ocl): avoid memory access violation
2018-07-27 15:35:11 +03:00
Maksim Shabunin
0aded5aae6
cmake: fixed builds in directories containing plus sign
2018-07-27 15:05:56 +03:00
Alexander Alekhin
2f0fc920dd
Merge pull request #12061 from alalek:dnn_test_skip_checks_only
2018-07-26 15:15:32 +00:00
Alexander Alekhin
9137e2d635
Merge pull request #12060 from alalek:dnn_debug_layers
2018-07-26 15:14:32 +00:00
Alexander Alekhin
c37d1a53b5
Merge pull request #12025 from Triplesalt:tfimport-relu
2018-07-26 15:08:05 +00:00
Maksim Shabunin
1165fdd0f5
Added more strict checks for empty inputs to compare, meanStdDev and RNG::fill
2018-07-26 18:06:38 +03:00
Maksim Shabunin
597db69151
ts: test case list is printed after cmd line parsing, refactored
2018-07-26 16:43:43 +03:00
Triplesalt
9eb79926df
Allow a different input order for Mul+Maximum.
...
Squashed : ReLU operand order tests.
2018-07-26 14:19:11 +02:00
Vadim Pisarevsky
fa466b022d
Merge pull request #12052 from dkurt:dnn_ie_torch_tests
2018-07-26 09:09:35 +00:00
Vadim Pisarevsky
43820d89b4
further improvements in split & merge; started using non-temporary store instructions ( #12063 )
...
* 1. changed static const __m128/256 to const __m128/256 to avoid wierd instructions and calls inserted by compiler.
2. added universal intrinsics that wrap MOVNTPS and other such (non-temporary or "no cache" store) instructions. v_store_interleave() and v_store() got respective flags/overloaded variants
3. rewrote split & merge to use the "no cache" store instructions. It resulted in dramatic performance improvement when processing big arrays
* hopefully, fixed some test failures where 4-channel v_store_interleave() is used
* added missing implementation of the new universal intrinsics (v_store_aligned_nocache() etc.)
* fixed silly typo in the new intrinsics in intrin_vsx.hpp
* still trying to fix VSX compiler errors
* still trying to fix VSX compiler errors
* still trying to fix VSX compiler errors
* still trying to fix VSX compiler errors
2018-07-26 12:04:28 +03:00
Dmitry Kurtaev
faa6c4e1e1
Faster-RCNN anf RFCN models on CPU using Intel's Inference Engine backend.
...
Enable Torch layers tests with Intel's Inference Engine backend.
2018-07-25 19:04:55 +03:00
Alexander Alekhin
dd8701c1a0
dnn(test): skip checks only for unstable tests
...
but execute tested functions in Layer_Test_Halide/Convolution.Accuracy
2018-07-25 16:55:21 +03:00
Alexander Alekhin
74cf48b5d7
dnn(test): use Backend/Target enums
...
instead of 'int'
2018-07-25 16:55:21 +03:00
Alexander Alekhin
45b5b3c13a
dnn: check layer output for NaN/Inf
2018-07-25 16:25:18 +03:00
Alexander Alekhin
5336b9ad19
Merge pull request #12048 from mshabunin:fix-static-2
2018-07-24 19:45:27 +00:00
Alexander Alekhin
a16254de2b
Merge pull request #12047 from alalek:issue_12045
2018-07-24 19:44:25 +00:00
Alexander Alekhin
8a2ce75d96
Merge pull request #12020 from alalek:videoio_backends_query_api
2018-07-24 19:43:49 +00:00
Vadim Pisarevsky
9c7040802c
converted split() & merge() to wide univ intrinsics ( #12044 )
...
* fixed/updated v_load_deinterleave and v_store_interleave intrinsics; modified split() and merge() functions to use those intrinsics
* fixed a few compile errors and bug in v_load_deinterleave(ptr, v_uint32x4& a, v_uint32x4& b)
* fixed few more compile errors
2018-07-24 17:27:56 +03:00
Maksim Shabunin
cbb1e867e5
More issues found by static analysis
2018-07-24 16:04:42 +03:00
Alexander Alekhin
8de08e0463
Merge pull request #12021 from dkurt:dnn_ie_tf_ssd
2018-07-24 13:03:41 +00:00
Alexander Alekhin
236f383969
Merge pull request #12037 from dkurt:test_openvino_models
2018-07-24 12:34:04 +00:00
Alexander Alekhin
8f80565d9c
objdetect(qr): update test code
...
improve error checks
2018-07-24 13:56:55 +03:00
Alexander Alekhin
4283309daa
dnn: update tests for OpenVINO models
2018-07-24 09:41:14 +03:00
Alexander Alekhin
6e767e2376
ts: add findDataDirectory() function
2018-07-24 09:40:58 +03:00
Dmitry Kurtaev
28e08ae0bd
Add a sample which tests OpenVINO models
2018-07-23 19:08:51 +03:00
Maksim Shabunin
e0603bb45f
Fixed several issues found by static analysis tools
2018-07-23 17:22:47 +03:00
Alexander Alekhin
7d40fcead5
Merge pull request #12031 from alalek:dnn_ocl_eliminate_getUMat_with_bad_lifetime
2018-07-23 07:52:42 +00:00
Alexander Alekhin
b117302bca
Merge pull request #12016 from tyl12:fix_videoio_static_para
2018-07-21 03:50:58 +00:00
Alexander Alekhin
e1205d046a
Merge pull request #12003 from mshabunin:avi-error-messages
2018-07-21 03:30:55 +00:00
Teng Yiliang
dadde75ef0
use struct member width_set/height_set to replace static width/height.
...
the static variables will cause race-condition when operating in
multithread scenarios.
Signed-off-by: Teng Yiliang <ylteng@outlook.com>
Signed-off-by: Teng Yiliang <yiliang.teng@weimob.com>
2018-07-21 07:27:17 +08:00
Alexander Alekhin
ee743afebe
dnn(ocl): don't use getUMat() for long live objects
2018-07-20 17:53:55 +03:00
Alexander Alekhin
767b31cfbf
Merge pull request #12029 from tomoaki0705:fixBuildVS2013BinarySuffix
2018-07-20 11:27:27 +00:00
Tomoaki Teshima
18abe54497
fix build error on Visual Studio 2013
...
* replace binary literal prefix to hexadecimal literal prefix
2018-07-20 18:09:17 +09:00
Alexander Alekhin
05f0cb16de
Merge pull request #12022 from mshabunin:fix-ie-build
2018-07-19 20:50:42 +00:00
Maksim Shabunin
a4060e15a4
dnn, IE backend: updated to match new interface
2018-07-19 19:22:23 +03:00
Alexander Alekhin
7198b9e461
Merge pull request #12019 from mshabunin:static-debug-assert
2018-07-19 15:50:33 +00:00
Alexander Alekhin
ab9b6e806c
Merge pull request #11781 from dkurt:dnn_uint8_inputs
2018-07-19 14:38:46 +00:00
Alexander Alekhin
270cc3bcbc
videoio: add routines to query information about backends API
...
into cv::videoio_registry namespace
2018-07-19 17:27:37 +03:00
Dmitry Kurtaev
c213a3823e
Run entire SSDs from TensorFlow using Intel's Inference Engine
2018-07-19 17:05:56 +03:00
Alexander Alekhin
51074b9743
Merge pull request #12007 from alalek:fix_ts_perf_test_macro
2018-07-19 12:09:48 +00:00
Dmitry Kurtaev
070393dfda
uint8 inputs for deep learning networks
2018-07-19 14:37:33 +03:00
Alexander Alekhin
f4df537e27
ts: fix PERF_TEST() macro to allow test_case name reusing
...
Example (reuse 'Transform' test case):
PERF_TEST(Transform, getPerspectiveTransform_1000) { ... }
PERF_TEST(Transform, getPerspectiveTransform_QR_1000) { ... }
2018-07-19 13:20:54 +03:00
Alexander Alekhin
e526c4bfe4
core(test): remove verbose messages
2018-07-18 16:09:27 +03:00
Maksim Shabunin
fe806878be
Enable debug assertions for static analysis builds
2018-07-18 15:53:16 +03:00
Maksim Shabunin
a2a9a01e05
AVI container: verbose error messages
2018-07-18 15:22:42 +03:00
Alexander Alekhin
6c4f618db5
Merge pull request #11104 from asciian:reading_from_stream
2018-07-17 16:24:06 +00:00
Alexander Alekhin
f3ee07ca11
Merge pull request #11986 from alalek:build_eliminate_gcc8_warnings
2018-07-17 15:41:36 +00:00
Alexander Alekhin
7cc84ce8ab
Merge pull request #11984 from mshabunin:fix-static-1
2018-07-17 15:40:48 +00:00
Alexander Alekhin
40b8ca2eed
Merge pull request #11968 from allnes:detect_qr_code
2018-07-17 15:38:46 +00:00
Alexander Alekhin
4dcef28023
Merge pull request #11964 from mshabunin:avi-container-fixes
2018-07-17 15:35:07 +00:00
Alexander Alekhin
0a41b3df45
Merge pull request #11990 from alalek:clone_nodiscard_attribute
2018-07-17 15:34:08 +00:00
Maksim Shabunin
c473718bc2
Check for empty Mat in compare, operator= and RNG::fill, fixed related tests
2018-07-17 17:50:50 +03:00
Maksim Shabunin
1da46fe6fb
Fixed issues found by static analysis (mostly DBZ)
2018-07-17 16:14:54 +03:00
Alexander Alekhin
78d07e841d
Merge pull request #11959 from pengli:3.4
2018-07-17 11:20:02 +00:00
Dmitry Kurtaev
f38808a39f
Add Java overloads for each default argument ( #11940 )
...
* Add Java overloads for each default argument
* Add "fisheye_" prefix for cv::fisheye:: functions and enums
2018-07-17 13:41:46 +03:00
Alexander Alekhin
540415dc5e
Merge pull request #11989 from csukuangfj:patch_2
2018-07-17 10:27:21 +00:00
Li Peng
f0cadaa6e3
enable concat layer fuse for OCL target
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-07-17 12:46:16 +08:00
Vadim Pisarevsky
f058b5fb1e
Wide univ intrinsics ( #11953 )
...
* core:OE-27 prepare universal intrinsics to expand (#11022 )
* core:OE-27 prepare universal intrinsics to expand (#11022 )
* core: Add universal intrinsics for AVX2
* updated implementation of wide univ. intrinsics; converted several OpenCV HAL functions: sqrt, invsqrt, magnitude, phase, exp to the wide universal intrinsics.
* converted log to universal intrinsics; cleaned up the code a bit; added v_lut_deinterleave intrinsics.
* core: Add universal intrinsics for AVX2
* fixed multiple compile errors
* fixed many more compile errors and hopefully some test failures
* fixed some more compile errors
* temporarily disabled IPP to debug exp & log; hopefully fixed Doxygen complains
* fixed some more compile errors
* fixed v_store(short*, v_float16&) signatures
* trying to fix the test failures on Linux
* fixed some issues found by alalek
* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested
* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested
2018-07-16 18:57:24 +03:00
Alexander Alekhin
481829a81b
Merge pull request #11957 from alalek:issue_11956
2018-07-16 15:54:34 +00:00
Alexander Alekhin
c9439476da
Merge pull request #11970 from dkurt:dnn_enable_tf_tests
2018-07-16 15:51:27 +00:00
Alexander Alekhin
b0ee5d9023
core: CV_NODISCARD macro with semantic of [[nodiscard]] attr
...
[[nodiscard]] is defined in C++17.
There is fallback alias for modern GCC / Clang compilers.
2018-07-16 18:03:32 +03:00
Kuang Fangjun
84f2f37680
remove a useless statement.
2018-07-16 22:44:11 +08:00
Alexander Alekhin
d5951bc033
build: eliminate GCC8 warnings
2018-07-16 17:24:12 +03:00
Alexander Alekhin
a5e8ae2183
Merge pull request #11969 from alalek:core_Matx_inv_solve_templates
2018-07-16 14:18:12 +00:00
Alexander Alekhin
d6c669f5cf
Merge pull request #11963 from dkurt:dnn_cl_fix_matmul
2018-07-16 11:10:32 +00:00
Maksim Shabunin
53eb27f508
AVI container: use C++ streams for file operations, check some operations for overflow
2018-07-16 13:46:28 +03:00
Alexander Alekhin
4a3dfffd46
Merge pull request #11965 from alalek:issue_11944
2018-07-16 09:48:33 +00:00
Alexander Alekhin
50751ae6ff
Merge pull request #11967 from catree:add_tutorial_ml_java_python
2018-07-16 09:24:32 +00:00
Alexander Nesterov
dee5f9a67b
Update qrcode algorithm: fix seg. fault with kmeans
2018-07-14 21:51:21 +03:00
Kuang Fangjun
2b6aa50b81
avoid negative index.
2018-07-14 16:05:29 +08:00
Alexander Alekhin
3c74fde349
core: eliminate 'if' logic from Matx::inv()/solve()
...
- 'if' logic is moved into templates.
- removed unnecessary cv::Mat objects creation.
- fixed inv() test (invA * A == eye)
- added more Matx tests to cover all defined template specializations
2018-07-13 20:09:01 +03:00
Dmitry Kurtaev
6eb8faea85
Enable TensorFlow networks tests for different backends and targets
2018-07-13 19:58:56 +03:00
Alexander Alekhin
23fc96e98f
Merge pull request #11955 from terfendail:matx_solve_fix2
2018-07-13 15:15:03 +00:00
Vadim Pisarevsky
abceae1ac0
Merge pull request #11921 from allnes:detect_qr_code
2018-07-13 14:26:17 +00:00
Alexander Alekhin
eed1130327
Merge pull request #11966 from alalek:core_solve_method_check
2018-07-13 14:25:42 +00:00
Dmitry Kurtaev
de6f0a537d
Fix fully-connected layer in case of number of rows less than 4
2018-07-13 16:35:37 +03:00
catree
4dc7e617a4
Add overloaded cv::PCACompute() that returns also the eigenvalues. Useful for Java and Python OpenCV where PCA is not available.
2018-07-13 15:05:54 +02:00
Alexander Alekhin
0155851929
imgproc(getPerspectiveTransform): add configuration parameter
2018-07-13 15:31:33 +03:00
Alexander Alekhin
71c6cb9c22
imgproc(getPerspectiveTransform): solve(DECOMP_SVD -> LU)
2018-07-13 15:31:33 +03:00
Alexander Alekhin
2170811e48
imgproc(perf): update getPerspectiveTransform perf test
...
Function is very fast, so 0.000 ms results are useless.
1000 runs requires 25ms on i7-6700K.
2018-07-13 15:31:33 +03:00
Alexander Alekhin
5385086fef
core: solve(): add check for passed 'method' values
2018-07-13 15:15:48 +03:00
Dmitry Kurtaev
dcc1beb1f8
Clip kernel for OpenCL PriorBox layer
2018-07-13 14:49:13 +03:00
Alexander Nesterov
e38ea3a888
Update detect QRCode algorithm
2018-07-12 18:18:57 -03:00
Alexander Alekhin
33b7028be2
core: use "explicit" for Matx() ctor
2018-07-12 19:50:56 +00:00
Vitaly Tuzov
850a8577b2
Fixed unreachable code warnings for Matx::solve()
2018-07-12 19:19:51 +03:00
Alexander Alekhin
9c3ec05825
Merge pull request #11941 from alalek:dnn_ocl_fix_verify_umat_mapping
2018-07-12 07:37:55 +00:00
Vitaly Tuzov
d0a3686812
Merge pull request #11904 from terfendail/matx_solve_fix
...
Fixed Matx::solve function for non-square matrixes (#11904 )
2018-07-11 22:00:57 +03:00
Alexander Alekhin
2508f7f971
dnn(ocl): fix wrong usage of stalled .getMat() pointers
...
Temporary object lifetime must be greater than pointer usage.
2018-07-11 19:11:36 +03:00
Dmitry Kurtaev
8b5f061dae
Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers
2018-07-11 18:58:56 +03:00
Alexander Alekhin
999aba3807
Merge pull request #11936 from berak:dnn_shufflelayer_name
2018-07-11 12:01:31 +00:00
Alexander Alekhin
82c7ab0231
Merge pull request #11927 from pengli:3.4
2018-07-11 09:33:24 +00:00
Li Peng
4c5a86828a
Fix gemmlike convolution input reading
...
use vload3 for half3 or float3 input vector reading,
also check read position to see if it exceed input width
Signed-off-by: Li Peng <peng.li@intel.com>
2018-07-11 15:25:21 +08:00
berak
a7b502f04a
dnn: preserve name, type strings for ShuffleLayer
2018-07-11 08:19:23 +02:00
Alexander Alekhin
e4b5e9b9c9
Merge pull request #11931 from catree:add_doc_eye_ones
2018-07-10 15:43:32 +00:00
catree
d7bd662c95
Add a note in the documentation about Mat::ones and mat::eye. With multi-channels type (e.g. CV_8UC3), only the first channel is treated.
2018-07-10 15:35:46 +02:00
Alexander Alekhin
452fa3011c
dnn(test): drop CV_ENUM for DNNBackend / DNNTarget
2018-07-10 15:12:01 +03:00
Dmitry Kurtaev
d57e5406f0
Add readNet* functions which parse models from byte arrays
2018-07-10 11:12:01 +03:00
Alexander Alekhin
7fe0727930
Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward
2018-07-09 16:25:34 +00:00
Alexander Alekhin
529d38613b
Merge pull request #11923 from alalek:dnn_external_protobuf
2018-07-09 16:07:42 +00:00
Alexander Alekhin
88d56dc700
Merge pull request #11922 from alalek:dnn_test_myriad_check
2018-07-09 16:07:18 +00:00
Alexander Alekhin
7ba66a1682
Merge pull request #11703 from alalek:c_api_calib3d_chessboard_detector
2018-07-09 15:37:26 +00:00
Alexander Alekhin
b6255ab9e7
dnn(ocl4dnn): fix args for 'max_pool_forward' kernel
2018-07-09 18:02:20 +03:00
Alexander Alekhin
924ff903ad
Merge pull request #11903 from alalek:issue_9002
2018-07-09 14:49:37 +00:00
Alexander Alekhin
e2b5d11290
dnn: allow to use external protobuf
...
"custom layers" feature will not work properly in these builds.
2018-07-09 17:28:45 +03:00
Alexander Alekhin
e41f19d2f3
Merge pull request #11919 from dkurt:dnn_replace_convert_fp16
2018-07-09 14:07:37 +00:00
Alexander Alekhin
52b151dceb
dnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test
2018-07-09 16:20:46 +03:00
Dmitry Kurtaev
362d4f5395
Replace convertFp16 from dnn::Net::setInput()
2018-07-09 14:35:54 +03:00
Alexander Alekhin
a29d11240e
Merge pull request #11906 from berak:fix_qrcode
2018-07-09 09:36:41 +00:00
asciian
61d8719b8d
Reading net from std::ifstream
...
Remove some assertions
Replace std::ifstream to std::istream
Add test for new importer
Remove constructor to load file
Rename cfgStream and darknetModelStream to ifile
Add error notification to inform pathname to user
Use FileStorage instead of std::istream
Use FileNode instead of FileStorage
Fix typo
2018-07-09 10:02:05 +03:00
Alexander Alekhin
0fd74fa177
Merge pull request #11911 from berak:core_fix_autobuffer_opengl
2018-07-08 13:50:35 +00:00
berak
45677819e8
core: fix autobuffer usage in opengl.cpp
2018-07-08 09:51:06 +02:00
berak
e14b2ba43c
objdetect: validate input in qrcode
2018-07-07 16:56:40 +02:00
Alexander Alekhin
81325a3fa0
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
2018-07-06 17:35:47 +03:00
Alexander Alekhin
aa0c6ddb4c
highgui: fix GTK issues with external UI thread
2018-07-06 17:35:47 +03:00
Alexander Alekhin
5e6a3f1f6c
Merge pull request #11901 from alalek:fix_cuda_build
2018-07-06 14:07:50 +00:00
Vadim Pisarevsky
523b6f32ba
Merge pull request #11867 from dkurt:dnn_ie_layers
2018-07-06 13:13:20 +00:00
Alexander Alekhin
fc59498b2b
cuda: fix build
...
use cv::AutoBuffer::data() to get data pointer
2018-07-06 15:32:36 +03:00
Alexander Alekhin
3b01777c98
Merge pull request #11895 from alalek:fix_fn_types
2018-07-06 12:01:31 +00:00
Alexander Alekhin
06fc77610b
core(hal): eliminate build warnings
2018-07-06 13:00:41 +03:00
Dmitry Kurtaev
019c2f2115
Enable more deep learning tests
2018-07-05 14:23:15 +03:00
Alexander Alekhin
4bc080dc50
fix function signatures, drop invalid casts
2018-07-05 13:55:26 +03:00
Alexander Alekhin
c7fc563dc0
calib3d: chessboard detector - replace OpenCV C API
2018-07-05 13:09:10 +03:00
Alexander Alekhin
0bb2c115aa
Merge pull request #11719 from alalek:update_autobuffer_api
2018-07-05 10:01:15 +00:00
Alexander Alekhin
ccd2370bb7
Merge pull request #11890 from dkurt:keras_resize_nearest
2018-07-05 09:57:24 +00:00
Alexander Alekhin
c0d0cf5e74
Merge pull request #11893 from dkurt:fix_11884
2018-07-05 09:56:50 +00:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
135ea264ef
core: align cv::AutoBuffer API with std::vector/std::array
...
- added .data() methods
- added operator[] (int i)
- extend checks support to generic and debug-only cases
- deprecate existed operator* ()
2018-07-04 19:10:38 +03:00
Dmitry Kurtaev
f25a01bb5a
Disable fusion to output layers
2018-07-04 15:53:47 +03:00
Alexander Alekhin
bd8c8e720e
Merge tag '3.4.2'
2018-07-04 14:08:11 +03:00
Alexander Alekhin
9e1b1e5389
OpenCV 3.4.2
2018-07-04 14:05:47 +03:00
Dmitry Kurtaev
36288eebe7
Nearest neighbor resize from Keras
2018-07-04 11:53:24 +03:00
Vadim Pisarevsky
a0baae8a55
Merge pull request #11875 from dkurt:dnn_fix_reshape
2018-07-04 08:08:04 +00:00
Alexander Alekhin
9a66331984
Merge pull request #11882 from alalek:videoio_vfw_lower_priority
2018-07-03 14:54:54 +00:00
Alexander Alekhin
f545aee66d
videoio(VFW): lower priority (after DSHOW)
2018-07-03 15:54:45 +03:00
Alexander Alekhin
b3578710cf
videoio(MSMF): fix 32-bit build crash
2018-07-03 15:28:55 +03:00
ilovezfs
0c4328fbf3
Python 3.7 compatability
...
The result of PyUnicode_AsUTF8() is now of type const char * rather of
char *.
2018-07-03 00:38:59 -07:00
Dmitry Kurtaev
7ed5d85f25
Add Reshape layer tests
2018-07-03 08:26:43 +03:00
Alexander Alekhin
5557474467
imgcodecs(sunras): avoid buffer overrun
...
`src_pitch` may be large than data `step`
2018-07-02 12:56:50 +03:00
Alexander Alekhin
5a27f7c81f
Merge pull request #11856 from alalek:videoio_msmf_fix_check
2018-06-30 04:52:36 +00:00
Alexander Alekhin
6ce26b72b1
Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_code
2018-06-30 04:51:20 +00:00
Alexander Alekhin
2dbaba077a
videoio(msmf): avoid using of C++11 code
...
build fails with MSVS 2012 without additional flags
2018-06-29 20:48:58 +00:00
Alexander Alekhin
7a2448672c
videoio(MSMF): avoid OpenCV load failure on Win7 machines
...
OpenCV binaries are compiled on Win10 environment
2018-06-29 20:22:26 +00:00
Alexander Alekhin
9be3f7d41a
Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2
2018-06-29 15:02:22 +00:00
Alexander Alekhin
f40231af5d
Merge pull request #11851 from pengli:3.4
2018-06-29 15:01:20 +00:00
Alexander Alekhin
c3a90ccbad
videoio(MSMF): remove "always true" check
2018-06-29 15:23:48 +03:00
Li Peng
145eae321e
pooling ocl kernel optimization
...
set global size with real output size, also optimize
max pooling index computation if necessary.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-06-29 15:22:49 +08:00
Dmitry Kurtaev
d971678add
Add a planar data layout tracking for TensorFlow importer
2018-06-29 09:50:14 +03:00
Dmitry Kurtaev
346871e27f
Set output layers names and types for models in DLDT's intermediate representation
2018-06-28 10:21:45 +03:00
Vadim Pisarevsky
67259d7082
Merge pull request #11768 from alalek:videoio_msmf_async_live_capture
2018-06-27 18:12:10 +00:00
Vadim Pisarevsky
75ee536d6d
Filter homography decomp: updated PR #7153 ( #11846 )
...
* Add functionality to filter homography decompositions
* documentation + small refactor
* fix comparing int to size_t (compiler warning)
* fix whitespace issues
* clarification of function return values in documentation
* refactor of function parameters and change in loop nesting
* cleanup useless .h, fix size_t to int compare, small refactor
* fix documentation and whitespace
* change output from return value to outputarray parameter
* update function docs to reflect changes in parameters
* whitespace
* failing test
* fixed warnings related to extended initialisers and improper types
* initialize vectors from arrays
* initialize vectors from arrays part 2
* fix whitespace
* fix trailing whitespace
* Include <inttypes.h> in test_filter_homography_decomp.cpp, should fix 'uint8_t' : undeclared identifier error
* updated the test (made it shorter and providing better diagnostic) and significantly improved implementation (get rid of heavy repeated and/or unnecessary operations)
* fixed compile warning; removed trailing whitespace
2018-06-27 16:47:35 +03:00
Nesterov Alexander
0081dc478f
Init qrcode algo ( #11829 )
2018-06-27 16:37:10 +03:00
Vadim Pisarevsky
5dc0e51682
Merge pull request #11839 from dkurt:dnn_ie_r2
2018-06-27 09:56:02 +00:00
Vadim Pisarevsky
ba1a6ad4cc
Merge pull request #11840 from dkurt:dnn_tf_nchw
2018-06-26 19:27:25 +00:00
branka-plateiq
34ad9b8a42
Pass RANSAC parameters as function input ( #10569 )
...
* Pass RANSAC parameters as function input
* Clean up unnecessary code
* Keep the original function signature
* Clean up based on PR comments
Replace array with vector.
Correct naming convention for input variables.
Add checks on input variables.
* Use vector instead of array for dynamic size
* Revert change.
* Use dynamic array
* Fix wrong syntax in array allocation
* Undo change
* Fix variable name
* Use vector and not array
* fixed compile warning on Windows
2018-06-26 16:40:28 +03:00
Dmitry Kurtaev
dbeb4a11be
Parse strides and convolution kernel shapes considering data layout
2018-06-26 16:18:21 +03:00
Dmitry Kurtaev
b11e22c25b
Update Inference Engine tests
2018-06-26 15:38:08 +03:00
Vadim Pisarevsky
53a475d63c
Merge pull request #11836 from terfendail:msmf_camfallback
2018-06-26 12:17:55 +00:00
Vadim Pisarevsky
e87425f047
Merge pull request #11835 from dkurt:dnn_tf_two_inputs
2018-06-26 12:12:24 +00:00
Vitaly Tuzov
67b67003c5
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.
2018-06-26 14:04:02 +03:00
Dmitry Kurtaev
9510551c63
Multiple inputs for TensorFlow models
2018-06-26 14:03:59 +03:00
Vadim Pisarevsky
b80c7bca0d
Merge pull request #11826 from dkurt:dnn_tf_data_layouts
2018-06-26 06:36:27 +00:00
Vadim Pisarevsky
dc27d52221
temporarily disabled OpenCL use in DNN module on Mac ( #11828 )
...
* temporarily disabled OpenCL use in DNN module on Mac, since some of the tests fail
* disable OpenCL in DNN on Mac at CMake level, not source level (thanks to alalek for the advice)
2018-06-26 09:35:18 +03:00
Dmitry Kurtaev
715f40a48d
Use layers consumers to predict data layout
2018-06-25 18:25:40 +03:00
Li, Peng
ab8022f74e
update convolution opencl kernels in dnn module ( #11762 )
...
* optimize ocl kernel enqueue in fc layer
Signed-off-by: Li Peng <peng.li@intel.com>
* use CV_LOG_INFO in convolution auto tuning
Signed-off-by: Li Peng <peng.li@intel.com>
* update convolution IDLF kernel
extend parameter tuning range, also cleanup
ocl kernel implementation
Signed-off-by: Li Peng <peng.li@intel.com>
* update in-memory convolution cache config
fp16 and fp32 cache config are stored separately
Signed-off-by: Li Peng <peng.li@intel.com>
2018-06-25 17:06:18 +03:00
Rostislav Vasilikhin
18bc2a1a93
Kinect2 support added to OpenNI2 backend ( #11794 )
...
* Kinect2 support added to OpenNI2 backend
* more fixes for OpenNI2 backend
* whitespace fixed
* libfreenect2 support added
* const cast added
* mutable removed
2018-06-25 13:19:20 +03:00
Dmitry Kurtaev
e8e9d1d021
Implement Interp layer using Resize layer
2018-06-22 19:26:47 +03:00
Alexander Alekhin
1894f1a37f
Merge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag
2018-06-22 05:23:55 +00:00
Alexander Alekhin
50c607d206
dnn(ocl): fix external / predefined builtin configuration behavior
...
OPENCV_OCL4DNN_FORCE_AUTO_TUNING should ignore existed configuration from:
- builtin predefined configurations (for Intel OpenCL iGPUs)
- external configuration (via OPENCV_OCL4DNN_CONFIG_PATH)
Prefer external configuration over builtin.
2018-06-21 20:59:03 +03:00
Dmitry Kurtaev
4626246087
Add ShuffleChannel layer
2018-06-21 19:10:42 +03:00
Dmitry Kurtaev
40b85c1cd9
Remove undocumented feature to retreive layers outputs by indices
2018-06-20 14:44:21 +03:00
Alexander Alekhin
eed43a231b
Merge pull request #11775 from alalek:issue_11771
2018-06-17 13:25:44 +00:00
Alexander Alekhin
8622b1254e
Merge pull request #11774 from adamrankin:cap_dshow_autofocus
2018-06-16 14:11:44 +00:00
Alexander Alekhin
5e2c112697
photo: remove redundant broken check
...
`dest(roi_d)` operation contains similar check inside.
2018-06-16 11:36:51 +03:00
Adam Rankin
ecf4b639e1
Adding the ability to toggle autofocus on/off for DirectShow webcams
2018-06-15 12:32:12 -04:00
Alexander Alekhin
9629af1aa9
videoio: MSMF async reader for camera stream
...
Synchronized reading from camera with heavy frame processing
provides bad effects (huge frame latency, processing frames from the past).
Generally, there is no way to process each frame and some frames will be dropped.
Allow preventive frame dropping to reduce lag of processed frames.
This mode is applied to cameras only (opened by 'index').
2018-06-14 18:37:05 +03:00
Alexander Alekhin
30d4e0261a
Merge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax
2018-06-14 13:18:30 +00:00
Alexander Alekhin
001f5faa0d
Merge pull request #11763 from dkurt:dnn_keras_relu6_v2
2018-06-14 13:17:54 +00:00
Dmitry Kurtaev
bd87eb6e66
Import average pooling and softmax layers from Darknet
2018-06-14 15:22:08 +03:00
Alexander Alekhin
2bb5d1bca3
videoio(msmf): cleanup unused methods from ComPtr wrapper
...
Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters
2018-06-14 14:15:09 +03:00
Dmitry Kurtaev
693a7663e7
Import ClipByValue from Keras
2018-06-14 13:30:30 +03:00
Alexander Alekhin
8f24db048c
Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition
2018-06-14 09:57:39 +00:00
Alexander Alekhin
fd46684bf8
[move sift.cpp] opencv: use cv::AutoBuffer<>::data()
...
original commit: fc69aa57bc
2018-06-13 19:11:18 +00:00
Alexander Alekhin
5fd7cfbcad
dnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT
...
to control DNN_BACKEND_DEFAULT enumeration value behavior
2018-06-13 19:00:04 +03:00
Alexander Alekhin
1c2ee8a5f1
Merge pull request #11737 from alalek:videoio_msmf_replace_debug_print
2018-06-13 13:31:31 +00:00
Alexander Alekhin
09c63e4f00
videoio(msmf): fix reopen condition in configureHW()
...
`camid` value is always -1 after close().
2018-06-13 16:29:45 +03:00
Alexander Alekhin
f040282bf8
Merge pull request #11739 from dkurt:more_ie_models
2018-06-13 13:26:50 +00:00
yuki takehara
4fe648b15c
Merge pull request #11706 from take1014:setTo_Nan_10507
...
* setTo_#10507
* setTo_Nan_10507
* setTo: update check / test for NaNs
2018-06-12 18:05:44 +00:00
Alexander Alekhin
d69a327d6d
OpenCV version++
...
OpenCV 3.4.2
2018-06-10 10:20:38 +03:00
Alexander Alekhin
ab11b17d4b
experimental version++
2018-06-10 10:20:38 +03:00
Dmitry Kurtaev
7d727ac2fb
Fuse top layers to batch normalization
2018-06-09 18:06:53 +03:00
Alexander Alekhin
0d249c7448
videoio(msmf): replace custom debug print function
2018-06-09 17:38:32 +03:00
Dmitry Kurtaev
2c291bc2fb
Enable FastNeuralStyle and OpenFace networks with IE backend
2018-06-09 15:57:12 +03:00
Alexander Alekhin
34fc8e9260
Merge pull request #11714 from alalek:win32_waitKey_accuracy
2018-06-09 12:10:24 +00:00
Alexander Alekhin
929d39f69a
Merge pull request #11728 from dkurt:dnn_update_tf_ssd
2018-06-08 19:04:28 +00:00
Alexander Alekhin
f72633b9f5
Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D
2018-06-08 19:01:40 +00:00
Alexander Alekhin
c05180ccce
Merge pull request #11702 from terfendail:msmf_sizefix
2018-06-08 18:56:31 +00:00
Vitaly Tuzov
cb4b6bb2dc
Fixed setting of frame size properties for MSMF-based VideoCapture
2018-06-08 18:55:06 +03:00
Alexander Alekhin
c64f6b3c22
videoio(MSMF): refactor grabFrame() / retrieveFrame() methods
...
- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()
2018-06-08 17:20:47 +03:00
Dmitry Kurtaev
40765c5f8d
Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine
2018-06-08 16:55:21 +03:00
gnthibault
b46fef327e
Fixed Assertin error due to Size.area() overflowing
2018-06-08 11:22:36 +02:00
Alexander Alekhin
8620bd5a84
highgui(win32): improve waitKey() timeout condition
...
- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit
2018-06-07 19:31:08 +03:00
rockzhan
1187a7fa34
Merge pull request #11649 from rockzhan:dnn_dw_prelu
...
dnn: Fix output mismatch when forward dnn model contain [depthwise conv(group=1) + bn + prelu] (#11649 )
* this can make sure [depthwise conv(group=1) + bn + prelu] output not shift
* add TEST to show the output mismatch in [DWconv+Prelu]
* fix typo
* change loading image to init cvMat directly
* build runtime model, without loading external model
* remove whitespace
* change way to create a cvmat
* add bias_term, add target output
* fix [dwconv + prelu] value mismatch when no optimizations
* fix Test error when change output channels
* add parametric test
* change num_output to group value
* change conv code and change test back
2018-06-07 13:45:54 +00:00
David
7175f257b5
Added ResizeBilinear op for tf ( #11050 )
...
* Added ResizeBilinear op for tf
Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).
Minor changes to tf_importer and resize layer to save some code lines
Minor changes in init.cpp
Minor changes in tf_importer.cpp
* Replaced implementation of a custom ResizeBilinear layer to all layers
* Use Mat::ptr. Replace interpolation flags
2018-06-07 16:29:04 +03:00
Maksim Shabunin
60fa6bea70
Merge pull request #11711 from alalek:python_standalone
2018-06-07 13:27:19 +00:00
Alexander Alekhin
dd7f88bd68
python: support standalone Python bindings build
...
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
2018-06-07 15:16:39 +03:00
Vadim Pisarevsky
5e5d997dff
Merge pull request #11620 from terfendail:hmmorph_fix
2018-06-07 11:19:21 +00:00
Sayed Adel
e0d28aa893
core:ppc Fix java CoreTest/testMahalanobis ( #11677 )
...
* core:ppc Fix java CoreTest/testMahalanobis
* core:ppc Fix warning unused variable on clang
2018-06-07 14:16:48 +03:00
Vadim Pisarevsky
828f33311f
Merge pull request #11700 from dkurt:dnn_ie_try_catch
2018-06-07 11:09:00 +00:00
Dmitry Kurtaev
f3a6ae5f00
Wrap Inference Engine init to try-catch
2018-06-07 12:55:52 +03:00
Vitaly Tuzov
2e22f8e790
Fix for morphologyEx MORPH_HITMISS mode
2018-06-06 21:04:17 +03:00
Vadim Pisarevsky
7c3090ddcf
Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code
2018-06-06 12:21:00 +00:00
Vadim Pisarevsky
3cbd2e2764
Merge pull request #11650 from dkurt:dnn_default_backend
2018-06-06 09:30:39 +00:00
Alexander Alekhin
afaf5f940e
Merge pull request #11695 from alalek:dnn_test_fix_sa_warnings
2018-06-05 20:07:39 +00:00
Alexander Alekhin
31a1df0fae
Merge pull request #11692 from alalek:default_log_level_warnings
2018-06-05 20:07:15 +00:00
Alexander Alekhin
b0ae357cfb
Merge pull request #11687 from alalek:gstreamer_write_pipeline
2018-06-05 20:06:55 +00:00
Alexander Alekhin
4091ced5ab
core: set default logger level to 'warning' in Release builds
...
should hide unnecessary 'info' messages
2018-06-05 18:39:47 +03:00
Alexander Alekhin
6816495bee
dnn(test): reuse test/test_common.hpp, eliminate dead code warning
2018-06-05 12:52:53 +03:00
Alexander Alekhin
277e9279cc
videoio(gstreamer): support dumping of VideoWriter pipeline
2018-06-04 18:39:20 +00:00
Alexander Alekhin
d041b0a599
videoio: fix capture modes
2018-06-04 19:48:51 +03:00
Alexander Alekhin
b2cff44084
Merge pull request #11682 from alalek:fix_pylint
2018-06-04 16:16:08 +00:00
Alexander Alekhin
2628662586
videoio(ffmpeg): cleanup, remove dead code
2018-06-04 19:07:22 +03:00
Dmitry Kurtaev
b781ac7346
Make Intel's Inference Engine backend is default if no preferable backend is specified.
2018-06-04 18:31:46 +03:00
Alexander Alekhin
15130f4f43
Merge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace
2018-06-04 15:27:33 +00:00
Alexander Alekhin
dcb9bc2544
python: eliminate pylint warnings
...
Tested with:
- pylint 1.9.1
2018-06-04 17:58:06 +03:00
Alexander Alekhin
ec30b1294f
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package
2018-06-04 14:37:36 +00:00
Rostislav Vasilikhin
fc35c77f00
Merge pull request #11610 from savuor:fix/stereobm_simd_fixed_float
...
* StereoBM: fixed SIMD processing for fixed-type output arrays
* changed norm type and threshold, added assertion
* fixed disp_shift
2018-06-04 13:03:12 +00:00
Alexander Alekhin
04802e41e9
gtest: support parameters with types from anonymous namespace
2018-06-04 13:30:24 +03:00
Vadim Pisarevsky
ccbc0b91ea
Merge pull request #11654 from alalek:issue_11648
2018-06-04 10:22:44 +00:00
Vadim Pisarevsky
3030594665
Merge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2
2018-06-04 10:19:44 +00:00
Vadim Pisarevsky
055f33ec46
Merge pull request #11657 from dkurt:dnn_ie_multiple_networks
2018-06-04 10:12:46 +00:00
Alexander Alekhin
c7183775db
Merge pull request #11678 from csukuangfj:fix-doc
2018-06-03 11:00:38 +00:00
Kuang Fangjun
9ae28415ec
fix doc.
2018-06-03 17:44:24 +08:00
Kuang Fangjun
ec42d87204
fix #11673 .
2018-06-03 07:58:23 +08:00
Alexander Alekhin
40a61ec64e
Merge pull request #11647 from sanchom:3.4
2018-06-02 20:52:17 +00:00
Alexander Alekhin
6912c20380
Merge pull request #11659 from take1014:snippet_11597
2018-06-01 16:48:10 +00:00
Alexander Alekhin
993981428f
Merge pull request #11656 from pauljurczak:patch-1
2018-06-01 16:39:54 +00:00
Alexander Alekhin
b229107f8e
Merge pull request #11641 from alalek:videoio_test_fixup
2018-06-01 16:39:11 +00:00
take1014
4ec9afac57
add imgproc snippets
2018-06-01 23:42:00 +09:00
Dmitry Kurtaev
ab389142af
Fix multiple networks with Intel's Inference Engine backend
2018-06-01 14:10:32 +03:00
Paul Jurczak
bd7bad02a0
convertFp16 documentation edit (2)
...
If this seems too wordy, take into account a new user who tries to find out extent of FP16 support in OpenCV.
2018-06-01 04:15:21 -06:00
Alexander Alekhin
03edddba47
core: drop unnecessary duplicate check
2018-06-01 12:31:48 +03:00
Sancho McCann
dbab7ecac8
Refactored out a dead code path.
2018-05-31 21:09:26 +00:00
Alexander Alekhin
1822e85f4a
Merge pull request #11642 from alalek:calib3d_chess_board_avoid_clone
2018-05-31 19:17:48 +00:00
Vadim Pisarevsky
d734e83af0
Hsv2rgb univ intrin ( #11637 )
...
* add universal intrinsics for HSV2RGB_b
* rewritten HSV2RGB_b without using extra universal intrinsics
* removed unused variable
* undo changes in v_load_deinterleave
2018-05-31 21:59:45 +03:00
Alexander Alekhin
0349e8c9af
Merge pull request #11608 from take1014:hist_11544
2018-05-31 16:44:02 +00:00
Vadim Pisarevsky
7d19bd6c19
Merge pull request #11634 from vpisarev:empty_mat_with_types_2
...
fixes handling of empty matrices in some functions (#11634 )
* a part of PR #11416 by Yuki Takehara
* moved the empty mat check in Mat::copyTo()
* fixed some test failures
2018-05-31 16:36:39 +00:00
Alexander Alekhin
da75e463a8
Merge pull request #11639 from alalek:fix_precomp_hpp
2018-05-31 16:35:21 +00:00
Alexander Alekhin
1bc96e3ed0
calib3d: cv::findContours() doesn't require to clone input
2018-05-31 19:34:23 +03:00
Alexander Alekhin
f185802489
documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)
...
Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master
2018-05-31 19:30:56 +03:00
Alexander Alekhin
46c508b84f
Merge pull request #11638 from alalek:docs_avoid_master_links_in_3.4
2018-05-31 16:22:03 +00:00
Alexander Alekhin
5d68c8dbe7
videoio(test): fixup information dump
2018-05-31 18:54:43 +03:00
Alexander Alekhin
b934702c7f
cmake: support find_package(FFMPEG)
...
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
2018-05-31 18:27:01 +03:00
Alexander Alekhin
58d47ae9c8
Merge pull request #11633 from alalek:issue_10546
2018-05-31 15:08:45 +00:00
take1014
229e8b1b18
Correct handling when IPP is enabled
2018-05-31 22:54:32 +09:00
Alexander Alekhin
799b4f48e7
fix missing precomp.hpp
2018-05-31 16:53:44 +03:00
Alexander Alekhin
9ba9358ecb
documentation: avoid links to 'master' branch from 3.4 maintenance branch
2018-05-31 16:45:18 +03:00
Dmitry Kurtaev
32bab45f81
Fix Inference Engine graphs with fused output layers
2018-05-31 16:21:08 +03:00
Alexander Alekhin
c94fe0c7e7
videoio(v4l): eliminate global variable
2018-05-31 15:11:20 +03:00
Alexander Alekhin
83d915eca1
videoio(v4l): don't pre-scan or cache list of available cameras
2018-05-31 15:11:20 +03:00
Alexander Alekhin
22f435ff4d
videoio(v4l): fix code indentation, tabs
2018-05-31 15:11:20 +03:00
Alexander Alekhin
49321a233c
Merge pull request #11632 from alalek:videoio_fixes
2018-05-31 12:09:14 +00:00
Alexander Alekhin
1b27351f45
Merge pull request #11627 from alalek:fix_python_cast_method_with_kw
2018-05-31 11:38:39 +00:00
Vadim Pisarevsky
c58cc4c2ff
Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn
2018-05-31 11:07:39 +00:00
Alexander Alekhin
ddba772297
videoio: fix isOpened() method for legacy APIs, fix "index" API list
2018-05-31 14:07:22 +03:00
Dmitry Kurtaev
f96f934426
Update Intel's Inference Engine deep learning backend ( #11587 )
...
* Update Intel's Inference Engine deep learning backend
* Remove cpu_extension dependency
* Update Darknet accuracy tests
2018-05-31 14:05:21 +03:00
Alexander Alekhin
133e9f2012
Merge pull request #11618 from alalek:ffmpeg_debug_log
2018-05-30 15:36:42 +00:00
Alexander Alekhin
5c80763a71
Merge pull request #11601 from alalek:calib3d_replace_findContours
2018-05-30 15:35:49 +00:00
Alexander Alekhin
c2d40b465d
python: fix arg types of cv2_UMatWrapperObject functions
2018-05-30 18:07:03 +03:00
Alexander Alekhin
1207300e01
python: avoid direct cast PyCFunctionWithKeywords->PyCFunction
2018-05-30 17:24:43 +03:00
Dmitry Kurtaev
bf87a43185
Faster-RCNN object detection models from TensorFlow
2018-05-30 17:12:36 +03:00
Alexander Alekhin
44572fac44
Merge pull request #11557 from tomoaki0705:relaxIntelOnlyOCL4DNN
2018-05-29 15:25:22 +00:00
Alexander Alekhin
c27b1d93e3
Merge pull request #11614 from dkurt:dnn_fix_keras_dilated_conv
2018-05-29 15:21:30 +00:00
Alexander Alekhin
8f28817373
Merge pull request #11617 from alalek:ffmpeg_fix_time_base
2018-05-29 15:19:13 +00:00
Alexander Alekhin
d70e01b635
calib3d: chess board - replace to cv::findContours()
2018-05-29 14:16:20 +00:00
Alexander Alekhin
83ec0f526c
videoio(ffmpeg): add option to enable debug logs
2018-05-29 12:40:52 +00:00
Alexander Alekhin
cd9e43704e
videoio: backends priority list
2018-05-29 12:06:45 +00:00
Alexander Alekhin
5128c1ff1f
videoio(ffmpeg): specify stream->time_base
...
Using codec->time_base is deprecated to specify muxer settings.
Resolves issue with FPS value for AVI files with FFmpeg 4.0.
Related FFmpeg commits:
- 194be1f43e91736025b2
2018-05-29 11:42:50 +00:00
Tomoaki Teshima
2e9e71ab9e
make ocl4dnn available to run on other platform than Intel GPU
2018-05-29 19:18:10 +09:00
Dmitry Kurtaev
085be6a445
Fix dilated convolution from Keras
2018-05-29 12:15:47 +03:00
Alexander Alekhin
06c1890639
Merge pull request #11607 from dkurt:dnn_scale_shift_layer
2018-05-28 18:19:22 +00:00
Dmitry Kurtaev
2c3c59d018
Remove Shift deep learning layer
2018-05-28 18:18:56 +03:00
Alexander Alekhin
549b5df225
build: workaround issues with C compilation mode
...
- cvdef.h + cvRound (double only)
- highgui_c.h
2018-05-28 18:07:23 +03:00
Alexander Alekhin
58d28061a4
Merge pull request #11591 from alalek:calib3d_chessboard_fix3
2018-05-28 12:48:11 +00:00
Alexander Alekhin
faae5edf72
Merge pull request #11590 from alalek:calib3d_chessboard_fix2
2018-05-28 12:44:46 +00:00
Alexander Alekhin
29421d7def
Merge pull request #11589 from alalek:calib3d_chessboard_fix
2018-05-28 10:13:43 +00:00
Alexander Alekhin
4384036108
Merge pull request #11576 from alalek:avoid_copyTo_with_getMat
2018-05-25 16:52:58 +00:00
Alexander Alekhin
f3cbb0f941
calib3d: chess board - perform full range (with 0) histogram smooth
2018-05-25 15:35:36 +03:00
Alexander Alekhin
ad57750d25
calib3d: chess board - properly detect/handle iCntMaxima=0 case
2018-05-25 15:32:07 +03:00
Alexander Alekhin
1dfc742f27
calib3d: chess board - avoid image modification via cvFindContours
2018-05-25 15:01:34 +03:00
Alexander Alekhin
0a6d190095
Merge pull request #11396 from terfendail:msmf_icapture
2018-05-24 18:30:09 +00:00
yuki takehara
ed207d79e7
Merge pull request #11108 from take1014:hough_4303
...
* Added accumulator value to the output of HoughLines and HoughCircles
* imgproc: refactor Hough patch
- eliminate code duplication
- fix type handling, fix OpenCL code
- fix test data generation
- re-generated test data in debug mode via plain CPU code path
2018-05-23 20:42:12 +00:00
yuki takehara
2d5d98ec0f
Merge pull request #11551 from take1014:filter2d_10683
...
* Add arguments to dftFilter2D
* test: add expected test values
2018-05-23 20:25:11 +00:00
Alexander Alekhin
1923916929
Merge pull request #11581 from mdfirman:rectify3Collinear_bugfix
2018-05-23 20:19:12 +00:00
Alexander Alekhin
3654fb10d7
Merge pull request #11567 from alalek:code_quality
2018-05-23 15:47:11 +00:00
Michael Firman
e8cb67572a
Bugfix to allow adjust3rdMatrix to be run
2018-05-23 16:03:21 +01:00
Alexander Alekhin
5a706eee8a
Merge pull request #11578 from alalek:build_warnings
2018-05-23 15:02:32 +00:00
Alexander Alekhin
9b173d317f
Merge pull request #11573 from mshabunin:fix-gst-leak
2018-05-23 15:00:37 +00:00
Vitaly Tuzov
9622ca0e37
MSMF-based VideoCapture and VideoWriter backend changed to C++ interface
2018-05-23 17:54:08 +03:00
Alexander Alekhin
39b60f9b17
fix build warnings
2018-05-23 16:04:41 +03:00
Alexander Alekhin
8307e06c1a
Merge pull request #11575 from mshabunin:fix-ie-win
2018-05-23 13:00:23 +00:00
Alexander Alekhin
b3ff29fcf5
avoid copyTo(outputarray.getMat()) pattern
...
- leads to errors due 'const' modifier of getMat() method
- may be non-optimal with non-CPU data storage
2018-05-23 13:56:34 +03:00
Maksim Shabunin
895e10c317
dnn: fixed IE support on Windows
2018-05-23 12:46:14 +03:00
Maksim Shabunin
1a15136536
GStreamer backend: fixed memory leak and version check
2018-05-23 10:48:13 +03:00
Namgoo Lee
79af0bfccf
NPP : NppStreamHandler fix
2018-05-23 15:54:39 +09:00
Alexander Alekhin
2f9b4439af
Merge pull request #11565 from alalek:issue_11545
2018-05-22 16:00:37 +00:00
Alexander Alekhin
099eb40ba1
Merge pull request #11564 from alalek:ts_run_py_passthrough_test_args
2018-05-22 15:58:51 +00:00
Alexander Enaldiev
84584002f2
Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats
...
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)
* imgcodecs: fixes
- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
2018-05-22 15:10:15 +00:00
Alexander Alekhin
2fc713bb94
Merge pull request #11566 from mshabunin:allow-ie-force
2018-05-22 14:12:32 +00:00
Alexander Alekhin
471c17321f
improve code quality
...
- eliminate rand() calls
- non initialized members/ variables
- unused return values
- missing/useless NULL checks
2018-05-22 17:08:31 +03:00
Maksim Shabunin
53a68783a5
dnn: support later IE versions
2018-05-22 15:18:18 +03:00
Maksim Shabunin
020ad1ac76
dnn: allow setting IE paths via command line
2018-05-22 14:40:03 +03:00
Alexander Alekhin
35a4551609
imgcodecs: fix imwrite handling of different OutputArray types
2018-05-22 13:57:51 +03:00
Alexander Alekhin
76ac7ab4ef
imgcodecs: added test for imwrite parameter types
...
issue 11545
2018-05-22 13:55:14 +03:00
Alexander Alekhin
a00182db8e
ts: run.py passthrough --test_* args "as is"
...
to allow pass `--test_bigdata` via run.py
2018-05-22 13:40:09 +03:00
Alexander Alekhin
58c8aefe03
dnn(text): update check threshols
...
- make green Linux debug/Linux32/Win32 builders
2018-05-22 13:29:31 +03:00
Alexander Alekhin
085b27fc3d
Merge pull request #11390 from dkurt:east_text_detection
2018-05-21 13:02:29 +00:00
Alexander Alekhin
e21c01708a
videoio: fix lifetime management of data of input frames
2018-05-21 12:29:24 +03:00
Alexander Alekhin
faafb3152a
Merge pull request #11550 from tomoaki0705:fixCudaAsync
2018-05-20 20:59:34 +00:00
Tomoaki Teshima
e2c787884d
fix the test failure of CUDA_Arithm/MeanStdDev
2018-05-20 19:38:02 +09:00
shengyu
72d3e14e8f
fix wrong indentation on github page (tab to space)
2018-05-19 11:23:51 +08:00
Dmitry Kurtaev
07dc6d2b45
Return a convex hull from rotatedRectangleIntersection
2018-05-18 14:20:17 +03:00
Alexander Alekhin
ab2c21e7c1
Merge pull request #11531 from alalek:issue_11518
2018-05-18 10:59:27 +00:00
Alexander Alekhin
d6279bfff8
fix build warnings
2018-05-17 18:29:21 +03:00
Alexander Alekhin
1ba25c5569
Merge pull request #11520 from terfendail:ffmpeg_icapture
2018-05-17 15:28:58 +00:00
Alexander Alekhin
45b92aebe5
Merge pull request #11523 from alalek:bigdata_tests
2018-05-17 14:53:19 +00:00
Alexander Alekhin
491e3627b6
photo: initialize cos() table with double type
...
This avoids MSVC 19.14.26428.1 to call vectorized __vdecl_cosf4() function with less precision.
2018-05-17 15:30:11 +03:00
Alexander Alekhin
1983991d2f
photo(test): update test checks
...
- allow 5% of changed pixels with intensity difference <= 1
2018-05-16 17:58:46 +03:00
Li Peng
1b517a45ae
add fp16 accuracy and perf test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:45:07 +08:00
Li Peng
ba5e8befa9
fp16 ocl support for more layers
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:45:04 +08:00
Li Peng
3dd916882a
fp16 ocl support for googlenet
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:45:02 +08:00
Li Peng
329abb5b64
dnn fp16 support
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:44:39 +08:00
Vitaly Tuzov
aeed43ec90
FFMPEG-based VideoCapture and VideoWriter backend changed to C++ interface
2018-05-16 17:19:18 +03:00
Alexander Alekhin
bb8ff2c463
Merge pull request #11494 from tomoaki0705:fixOpenCLDnn
2018-05-16 14:11:36 +00:00
Alexander Alekhin
336841fa1b
Merge pull request #11525 from alalek:issue_11511
2018-05-16 12:14:11 +00:00
Tomoaki Teshima
3f5347dd7a
work around of the test failure of opencv_test_dnn
...
* let OpenCL kernel run only on Intel GPU
* brush up the workaround based on 9a2b028 from alalek
2018-05-16 19:23:19 +09:00
Namgoo Lee
2c1ce8c0e9
cuda_meanStdDev : bug fix
2018-05-16 03:31:47 +09:00
Alexander Alekhin
f42fca9f49
cuda: avoid unnecessary cudaStreamSynchronize() call
...
resolves #11511
2018-05-15 18:38:22 +03:00
Alexander Alekhin
703f79b757
tests: add "bigdata" tests
2018-05-15 15:56:26 +03:00
Alexander Alekhin
6582afcdbb
ts: add BigData tests category (skipped by default)
...
Pass --test_bigdata to allow launching of "BigData" tests.
2018-05-15 15:55:56 +03:00
Vadim Pisarevsky
e0dbe5cfcc
handle huge matrices correctly ( #11505 )
...
* make sure that the matrix with more than INT_MAX elements is marked as non-continuous, and thus all the pixel-wise functions process it correctly (i.e. row-by-row, not as a single row, where integer overflow may occur when computing the total number of elements)
2018-05-14 15:29:14 +03:00
Alexander Alekhin
c6a9de812b
Merge pull request #11497 from alalek:libjpeg-turbo
2018-05-14 12:17:10 +00:00
Alexander Alekhin
f8252702a8
3rdparty: integrate libjpeg-turbo build scripts into OpenCV
2018-05-11 18:29:57 +03:00
Alexander Alekhin
78f205ffa5
python: better Python 3 support
2018-05-11 17:32:04 +03:00
Alexander Alekhin
df02fe0615
Merge pull request #11445 from cclauss:file-long-raw_input-xrange
2018-05-11 13:28:53 +00:00
Alexander Alekhin
24bb7b7679
Merge pull request #11444 from cclauss:patch-2
2018-05-11 13:28:27 +00:00
Alexander Alekhin
8356a6b6ab
Merge pull request #11442 from cclauss:print-function
2018-05-11 13:26:04 +00:00
Dmitry Kurtaev
8488f2e265
EAST: An Efficient and Accurate Scene Text Detector ( https://arxiv.org/abs/1704.03155v2 )
2018-05-11 14:55:42 +03:00
Alexander Alekhin
d1d7408a20
Merge pull request #11502 from berak:fix_knearest
2018-05-11 11:47:13 +00:00
berak
9b0ef7bb17
ml: fix caching of internal state when changing the impl in KNearest
2018-05-11 12:20:17 +02:00
Alexander Alekhin
ed150bd97a
Merge pull request #11461 from dkurt:dnn_reduce_mem_consumption
2018-05-11 09:47:03 +00:00
Dmitry Kurtaev
c99c3e761e
Fuse multipliers but not convolution layers weights
2018-05-10 19:24:38 +03:00
Vadim Pisarevsky
9e3b6a228a
Merge pull request #11418 from K-Shinotsuka:issue42
2018-05-10 15:15:04 +00:00
Vadim Pisarevsky
566cb5e3d8
Merge pull request #11430 from K-Shinotsuka:issue43
2018-05-10 15:14:39 +00:00
Alexander Alekhin
6f24b81079
Merge pull request #11490 from shengyu7697:tab_to_space
2018-05-10 14:41:07 +00:00
Alexander Alekhin
d2bc7b5a95
Merge pull request #11489 from alalek:fix_arm_build
2018-05-10 14:37:51 +00:00
Alexander Alekhin
9dc2005251
Merge pull request #11476 from tomoaki0705:fixCudaSampleBuildError
2018-05-09 20:48:33 +00:00
Namgoo Lee
ed86bd34b1
Merge pull request #11483 from nglee:dev_cudaCannyStreamIssue
...
cuda_canny : multi stream safety (#11483 )
* CUDA_ImgProc/Canny Asynchronous test
* cuda_canny : multi stream safety (1/3)
- Convert global variable canny::counter to class local variable
* cuda_canny : multi stream safety (2/3)
- Use texture objects rather than texture reference for cc >= 3.0,
since texture reference must be declared as a static global variable
which results in race condition when ran concurrently
* cuda_canny : multi stream safety (3/3)
- Refrain from using global variable in row_filter and column_filter
(converts column_filter::c_kernel and row_filter::c_kernel to local
variables)
* Fixes #11193
2018-05-09 23:44:34 +03:00
Alexander Alekhin
352510cc19
core: fix ARM intrinsincs
...
'0' is specific case (make no sence as a standalone operation),
but it can be useful in template-based programming.
reverts commit: a58c9d4d63
2018-05-09 23:31:02 +03:00
shengyu
70455a959d
tab to space
2018-05-09 21:15:51 +08:00
Tomoaki Teshima
f7ea6b12ea
cuda: fix build error of sample
2018-05-09 00:23:49 +09:00
Damien Picard
ba000bf8ea
Fixes 11480 : allow to force the video codec used to read videos
...
with the ffmpeg backend
2018-05-08 15:02:01 +02:00
Tomoaki Teshima
a58c9d4d63
arm: fix build error of v_rotate_left
...
* remove meaningless tests
2018-05-08 00:35:18 +09:00
Sayed Adel
115b10ed32
photo:ppc fix MergeRobertson test
2018-05-05 09:38:55 +00:00
Sayed Adel
ed19da21ab
core:ppc Several improvements on VSX(2)
...
* add v_float64x2 support to v_rotate_*
* treat float vector in v_check_any, vec_any_lt as int vector
* add test case for v_rotate_left
2018-05-04 23:09:38 +00:00
cDc
f2fbfd7a10
fix bug in Matx::inv()
2018-05-05 10:30:58 +03:00
Dmitry Kurtaev
777d77848c
Free Convolution and MatMul weights after TensorFlow layers import
2018-05-04 11:20:14 +03:00
Dmitry Kurtaev
9ffe4694db
Reduce memory consumption at Caffe importer
2018-05-04 09:24:13 +03:00
k-shinotsuka
ecb4ea8f76
add universal intrinsics for RGB2HSV_f
2018-05-04 00:58:46 +09:00
k-shinotsuka
a5f68e98f4
add universal intrinsics for HLS2RGB_f
2018-05-03 23:50:38 +09:00
zuoshaobo
4ff6a1bc7b
Merge pull request #11425 from zuoshaobo:relu_negative_slope
...
* FIX INF_ENGINE RELU ERROR
* set slope to variable
* tab in indentwq
2018-05-03 13:36:49 +03:00
cclauss
8a79b167b8
Define execfile, file, long, raw_input, xrange for Python 3
2018-05-03 09:19:05 +02:00
cclauss
de99f53e94
Don't forget self in table_formatter.py
...
__ridx__ is an _undefined name_ in this context but __self.ridx__ is used three other times in this method and nine times in this class. Undefined names may raise [NameError](https://docs.python.org/3/library/exceptions.html#NameError ) at runtime.
flake8 testing of https://github.com/opencv/opencv
$ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__
```
./modules/ts/misc/table_formatter.py:50:23: F821 undefined name 'ridx'
self.rows[ridx + 1].props = properties
^
```
2018-05-03 08:24:24 +02:00
cclauss
05c1a3d160
print() is a function in Python 3
2018-05-03 07:12:12 +02:00
Alexander Alekhin
083b08742d
Merge pull request #11406 from alalek:core_matsize_dims
2018-04-28 14:38:42 +00:00
Alexander Alekhin
65b0b319eb
eliminate MSVS2017 build warning
...
modules\dnn\src\layers\prior_box_layer.cpp(208): warning C4834: discarding return value of function with 'nodiscard' attribute
2018-04-28 15:14:41 +03:00
yuki takehara
4934f7c5a4
Merge pull request #11285 from take1014:core_6125
...
* Resolves 6125
* Fix test code
* Delete unnecessary code
2018-04-28 14:14:10 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera
2018-04-27 19:34:29 +03:00
Alexander Alekhin
7e43a0c2b7
Merge pull request #11394 from dkurt:dnn_custom_layers_py
2018-04-27 15:19:46 +00:00
Alexander Alekhin
8c349ff8ff
core: added MatSize::dims() method
...
to avoid accessing of 'p[-1]' (static code analysers dislike this)
2018-04-27 16:57:29 +03:00
Alexander Alekhin
8d7ccd29fe
Merge pull request #11401 from exoson:livestitch
2018-04-27 13:47:42 +00:00
Tomoaki Teshima
87a4f4ab3a
Merge pull request #11409 from tomoaki0705/fixCLAHEfailure
...
Arm: fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4 (#11409 )
* fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4
* avoid the race condition in the reduce
* imgproc(ocl): simplify CLAHE code
* remove unused class
2018-04-27 16:41:56 +03:00
Alexander Alekhin
856a07711b
core: disabled IPP AVX512 normL1(a, b, mask)
...
for cv::Mat with type=16UC3 and width < 16
2018-04-27 12:57:53 +03:00
exoson
058299cc66
Optimize MultiBandBlender to run faster
2018-04-27 10:48:13 +03:00
Alexander Alekhin
1031dfe4e8
Merge pull request #11402 from alalek:build_warnings
2018-04-26 19:04:37 +00:00
Alexander Alekhin
39e2d64b84
core: fix icc std::exception_ptr detection
...
std::exception_ptr requires enabled C++11 mode
2018-04-26 17:46:25 +03:00
Vitaly Tuzov
1dc73281f8
Added precise seek to MSMF-based VideoCapture::set(CAP_PROP_POS_FRAMES)
2018-04-26 16:15:23 +03:00
Alexander Alekhin
8e15c6fd78
videoio(openni2): fix CV_CAP_PROP_OPENNI2_SYNC property
2018-04-26 14:16:03 +03:00
Alexander Alekhin
f708a11f0f
build: fix warnings
2018-04-26 14:13:01 +03:00
Alexander Alekhin
57dad685d1
core: disabled IPP AVX2 normL1(a, b, mask)
...
for cv::Mat with width < 16
2018-04-26 13:35:25 +03:00
Alexander Alekhin
dfa04a11bb
core: norm with mask 16UC3 regression test
2018-04-26 13:35:25 +03:00
Dmitry Kurtaev
d5b9563263
Custom deep learning layers in Python
2018-04-26 09:25:18 +03:00
Alexander Alekhin
9166e6052b
imgproc: fixed fixedpoint coding style
...
- fixed wrong condition (always true)
- replaced unnecessary shift operation: '>> 63' to '< 0'
- used CV_BIG_INT()/CV_BIG_UINT() macros
2018-04-25 17:33:57 +03:00
Alexander Alekhin
469dc6ac42
imgproc: fix fixed point build
...
avoid using of templated 'operator T ()'
2018-04-25 16:34:44 +03:00
Alexander Alekhin
ca1975cada
Merge pull request #11385 from shengyu7697:tab_to_space
2018-04-24 18:11:14 +03:00
shengyu
7773b2b4d6
tab to space
2018-04-24 17:45:16 +03:00
Alexander Alekhin
84db82a329
build: fix warnings
2018-04-24 16:15:22 +03:00
Alexander Alekhin
ef2548778c
build: -Wimplicit-fallthrough warning for GCC 7+ only
2018-04-24 16:03:40 +03:00
Alexander Alekhin
6b581c4e51
build: unreachable code after CV_Error() (part 2)
2018-04-24 16:03:40 +03:00
Alexander Alekhin
576d2dbac0
refactor: don't use CV_ErrorNoReturn() internally
2018-04-24 15:38:42 +03:00
Dmitry Kurtaev
4ec456f0a0
Custom layers for deep learning networks ( #11129 )
...
* Custom deep learning layers support
* Stack custom deep learning layers
2018-04-24 14:59:59 +03:00
Alexander Alekhin
909a25571e
Merge pull request #11332 from alalek:v_select_x86
2018-04-24 11:44:33 +00:00
Vadim Pisarevsky
5c57e6bdb0
Merge pull request #11380 from vpisarev:faster_interleave_deinterleave
2018-04-24 11:30:18 +00:00
Vitaly Tuzov
80600e5cdc
Added DXVA hardware acceleration to MSMF-based VideoCapture
2018-04-24 13:42:49 +03:00
Vitaly Tuzov
916f094ce6
Integrated camera and file MSMF-based VideoCaptures and implemented configuration properties get/set
2018-04-24 12:13:20 +03:00
Vitaly Tuzov
b0b2d8de44
Remove unused code
2018-04-24 12:13:19 +03:00
Maksim Shabunin
5ae550c622
Merge pull request #11320 from mshabunin:gstreamer-cpp
2018-04-24 08:23:28 +00:00
Vadim Pisarevsky
4001e310f5
improved performance of v_load_deinterleave(8uC3) & v_store_interleave(8uC3) intrinsics when using SSSE3 instructions.
2018-04-23 18:06:06 +03:00
Alexander Alekhin
e82af627ed
Merge pull request #11376 from alalek:cv_error_set_terminate
2018-04-23 14:51:55 +00:00
Vitaly Tuzov
44848d3241
MSMF-based CameraCapture reworked to use SourceReader
2018-04-23 17:04:54 +03:00
Vitaly Tuzov
65c46d0cc6
Removed WINRT related code
2018-04-23 17:04:53 +03:00
Alexander Alekhin
4cbec82ac1
build: unreachable code after CV_Error()
2018-04-23 15:45:57 +03:00
Alexander Alekhin
10c9227136
core: CV_Error with set_terminate() on Windows
...
To dump contents of the last OpenCV error
2018-04-23 15:09:41 +03:00
Maksim Shabunin
5309832308
VideoIO: prettier test console output, gstreamer capture backend changed to C++ interface
2018-04-23 13:21:37 +03:00
Alexander Alekhin
65726e4244
core(hal): improve v_select() SSE4.1+
...
v_select 'mask' is restricted to these values only: 0 or ~0 (0xff/0xffff/etc)
mask in accuracy test is updated.
2018-04-23 13:17:53 +03:00
Vadim Pisarevsky
9615f8c994
Merge pull request #11358 from mshabunin:enable-xine
2018-04-23 10:09:29 +00:00
Vadim Pisarevsky
b8a6bfb54e
Merge pull request #11350 from alalek:fix_11348
2018-04-23 10:08:10 +00:00
Vadim Pisarevsky
a312380367
Merge pull request #11357 from alalek:disable_errors_dump
2018-04-23 10:06:43 +00:00
Alexander Alekhin
29b4fd2774
Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests
2018-04-23 09:16:39 +00:00
Alexander Alekhin
f659f80c7f
Merge pull request #11374 from lupustr3:pvlasov/morph_big_fix
2018-04-23 09:14:23 +00:00
Pavel Vlasov
a42789f330
IPP morphology with big images hotfix.
2018-04-23 10:50:20 +03:00
berak
d89fb163c6
core: add a check for empty input in inRange()
2018-04-21 12:54:52 +02:00
Alexander Alekhin
7b36e57551
Merge pull request #11362 from dkurt:dnn_keras_deconv
2018-04-20 16:53:38 +00:00
Ryan Wong
6f675ae75b
Merge pull request #11304 from kinchungwong:issue_11242_intrin_cv34x_nocpp11
...
* Issue 11242 intrinsics v_extract, v_rotate improvement, branch 3.4, without C++11 (remove type restrictions for SSE2, use PALIGNR on SSSE3, compile to no-op when imm is 0 or nlanes).
* fix whitespace
* Fix #11242 (NEON intrinsics v_rotate...) branch 3.4
Separate macro expansion OPENCV_HAL_IMPL_NEON_SHIFT_OP for bitwise shifts for integers, from macro expansion OPENCV_HAL_IMPL_NEON_ROTATE for lane rotations. Bitwise shifts do not apply to floats, but lane-rotations can apply to both.
* fix whitespace
* Fix #11242 compile error (VSX intrinsics v_rotate(a)) branch 3.4 no-c++11
2018-04-20 18:43:47 +03:00
Alexander Alekhin
c8b515ea69
Merge pull request #11315 from tomoaki0705:featureComparePixelCount
2018-04-20 14:50:40 +00:00
Alexander Alekhin
52172e6f92
Merge pull request #11361 from alalek:ocl_use_host_mem_ptr_workaround
2018-04-20 14:49:37 +00:00
Dmitry Kurtaev
d959d7b9f0
Fuse deconvolution layer subgraphs from Keras
2018-04-20 16:51:38 +03:00
Simon Que
705464258e
Merge pull request #11353 from eecsninja:3.4
...
* Fix CV_Asserts with negation of strings
{!"string"} causes some compilers to throw a warning.
The value of the string is not that important -- it's only for printing
the assertion message.
Replace these calls with:
CV_Error(Error::StsError, "string")
to suppress the warning.
* remove unnecessary 'break' after CV_Error()
2018-04-20 15:31:47 +03:00
Maksim Shabunin
a9bdf75c5b
videoio: refactored XINE backend
2018-04-20 15:20:46 +03:00
Alexander Alekhin
d76b41b50e
ocl: CL_MEM_USE_HOST_PTR workaround test
2018-04-20 14:58:42 +03:00
Alexander Alekhin
2f9cbc2e57
core: disable errors dump
...
Error messages are available via exceptions
2018-04-20 12:33:20 +03:00
Dmitry Kurtaev
bd77d100e1
Enable some tests for clDNN plugin from Intel's Inference Engine
2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Alexander Alekhin
21026bf7cd
python: fix support of UI callbacks
2018-04-19 18:42:01 +03:00
Alexander Alekhin
647eb243ae
core: CV_Error is marked as 'noreturn'
2018-04-19 18:04:12 +03:00
Vadim Pisarevsky
7ea5029ae5
Grabcut with frozen models ( #11339 )
...
* model is not learned when grabcut is called with GC_EVAL
* fixed test, was writing to wrong file.
* modified patch by Iwan Paolucci; added GC_EVAL_FREEZE_MODEL in addition to GC_EVAL (which semantics is retained)
2018-04-19 15:23:50 +03:00
Vadim Pisarevsky
64a6b12114
Merge pull request #11340 from dkurt:dnn_inf_engine_switch_target
2018-04-19 12:23:15 +00:00
Vadim Pisarevsky
4e31015715
Merge pull request #11341 from alalek:v_min_max_sse41
2018-04-19 12:21:50 +00:00
Alexander Alekhin
ad2127765f
Merge pull request #11309 from K-Shinotsuka:issue41
2018-04-19 10:58:00 +00:00
Tomoaki Teshima
98d9369a38
add new comparison to tolerate with rounding error
...
* restore resize of carotene
* clean up the source code
* remove unused member function (Near)
* add strict test on the border
2018-04-19 17:31:42 +09:00
Dmitry Kurtaev
3b4a292ca9
Let switch CPU/OpenCL targets for models from Intel's Model Optimizer
2018-04-19 10:23:57 +03:00
Alexander Alekhin
fa3cb03f62
core(hal): v_min()/v_max() use SSE4.1 intrinsics
2018-04-18 19:43:20 +03:00
Alexander Alekhin
0477284b0a
Merge pull request #11338 from alalek:fix_fp16_with_disabled_optimizations
2018-04-18 13:34:34 +00:00
Vadim Pisarevsky
b290bdafb9
Merge pull request #11322 from dkurt:dnn_yolov3
2018-04-18 12:11:13 +00:00
Alexander Alekhin
97882d03cc
core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option
...
Reproducer:
cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
2018-04-18 14:13:03 +03:00
Alexander Alekhin
28d4157ea7
Merge pull request #11331 from dkurt:fix_11318
2018-04-17 16:41:29 +00:00
Dmitry Kurtaev
66ce8cd7ea
Fix bugs found by valgrind
2018-04-17 17:53:51 +03:00
Vadim Pisarevsky
b8b7ca7302
Rewite polar transforms ( #11323 )
...
* Rewrite polar transformations
- A new wrapPolar function encapsulate both linear and semi-log remap
- Destination size is a parameter or calculated automatically to keep objects size between remapping
- linearPolar and logPolar has been deprecated
* Fix build warning and error in accuracy test
* Fix function name to warpPolar
* Explicitly specify the mapping mode, so we retain all the parameters as non-optional.
Introduces WarpPolarMode enum to specify the mapping mode in flags
* resolves performance warning on windows build
* removed duplicated logPolar and linearPolar implementations
2018-04-17 15:50:52 +03:00
k-shinotsuka
b3755ae670
add universal intrinsics for RGB2HLS_f
2018-04-17 19:37:36 +09:00
Dmitry Kurtaev
97fec07d96
Support YOLOv3 model from Darknet
2018-04-16 18:44:12 +03:00
Alexander Alekhin
e0fef2bca1
Merge pull request #11319 from alalek:issue_11293
2018-04-16 15:39:22 +00:00
Alexander Alekhin
ee90a6cbde
dnn(test): update error tolerance for RCNN/RFCN tests
2018-04-16 14:24:41 +03:00
Alexander Alekhin
59b413c8a1
imgproc(ipp): disable parallel GaussianBlur
2018-04-16 13:31:52 +03:00
Alexander Alekhin
225c75e4a1
Merge pull request #11306 from alalek:opencl_trace_messages
2018-04-14 11:36:19 +00:00
Alexander Alekhin
cfaca4327b
Merge pull request #11169 from tomoaki0705:universalRemap
2018-04-13 13:24:06 +00:00
Alexander Alekhin
a2d6ee2d31
Merge pull request #11305 from tomoaki0705:typoNVIDIA
2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a82e70cd40
remove raw SSE2/NEON implementation from imgwarp.cpp
...
* use universal intrinsic instead of raw intrinsic
* add 2 channels de-interleave on x86 platform
* add v_int32x4 version of v_muladd
* add accumulate version of v_dotprod based on the commit from seiko2plus on bf1852d
* remove some verify check in performance test
* avoid the out of boundary access and keep the performance
2018-04-13 21:19:16 +09:00
Alexander Alekhin
670ef403b0
ocl: improve trace messages of OpenCL calls
2018-04-13 14:54:27 +03:00
Alexander Alekhin
46d85fb558
Merge pull request #11302 from dkurt:dnn_inf_engine_extra_layers
2018-04-13 11:49:38 +00:00
Tomoaki Teshima
a40354d16f
use correct name for NVIDIA
...
* remove NVidia and Nvidia
* replace Cuda with CUDA
* keep the letters for API
2018-04-13 20:33:19 +09:00
Dmitry Kurtaev
b92c3182ab
Blank and L2-normalization layers from Intel's Inference Engine
2018-04-12 15:21:08 +03:00
Alexander Alekhin
2129db6e91
Merge pull request #11297 from seiko2plus:VSXImprovements_1
2018-04-12 10:57:39 +00:00
Sayed Adel
56ec10bfa2
core:ppc Several improvements on VSX(1)
...
* remove unnecessary defines from vsx_utils
* fix v_load_expand, load lower 64bit
* use vec_ld, vec_st with alignment load/store on all types except 64bit
* map v_extract to v_rotate_right
* update license header
* enable VSX by default on clang since #11167
2018-04-11 19:21:22 +00:00
Vadim Pisarevsky
0b9d075958
Merge pull request #11295 from dkurt:dnn_repeated_conv_params
2018-04-11 15:25:24 +00:00
Vadim Pisarevsky
59221296c0
Merge pull request #10978 from alalek:cv_check_macros
2018-04-11 15:17:27 +00:00
Vadim Pisarevsky
533bb89800
Merge pull request #11236 from dkurt:dnn_fuse_l2_norm
2018-04-11 15:09:55 +00:00
Vitaly Tuzov
c80a168d9d
Updated warpAffine test to ensure bit-exactness for CV_8U ( #10921 )
...
* Updated warpAffine test to ensure bit-exactness for CV_8U
* Updated invertAffineTransform to bit-exact evaluation
2018-04-11 18:08:29 +03:00
Vitaly Tuzov
62cf71002e
Bit-exact GaussianBlur performance update ( #10898 )
...
* Added custom implementation for NxN bit-exact GaussianBlur
* Reworked fixedpoint interface a bit
* Reworked horizontal line estimation for bit-exact GaussianBlur
* Reworked vertical line estimation for bit-exact GaussianBlur
* Updated range estimation for vectorized part of bit-exact GaussianBlur evaluation
2018-04-11 18:07:48 +03:00
Vadim Pisarevsky
30175594e9
Merge pull request #11062 from dkurt:dnn_inf_engine_cldnn
2018-04-11 15:06:18 +00:00
Dmitry Kurtaev
512632e574
Parse repeated values of ConvolutionParameter
2018-04-11 14:38:05 +03:00
Dmitry Kurtaev
4ef6c91583
Fix multiple inputs for models from Intel's Model Optimizer
2018-04-11 13:28:07 +03:00
Alexander Alekhin
070ec313f2
Merge pull request #11282 from alalek:fix_msvs_build_issues
2018-04-10 14:36:51 +00:00
Alexander Alekhin
d2d9fd6945
build: fix MSVS build problems
...
with 'CL=/permissive-'
2018-04-10 14:50:56 +03:00
Alexander Alekhin
fa4b9e80e2
Merge pull request #11275 from alalek:issue_11274
2018-04-10 11:28:21 +00:00
Dmitry Kurtaev
1ba72ca0d3
Fuse tf.nn.l2_normalize layer
2018-04-10 10:12:44 +03:00
shimat
68db42e9be
fix LSD test (wrong detector kind)
2018-04-10 11:38:35 +09:00
Alexander Alekhin
567ae61e78
core: add "check" macros
2018-04-09 21:24:02 +03:00
Alexander Alekhin
86488ac1bc
Merge pull request #11130 from allnes:gst_test_pipeline
2018-04-09 18:21:11 +00:00
Alexander Nesterov
c0d6f3d23e
Added tests for gstreamer pipeline
2018-04-10 02:33:26 +03:00
Alexander Alekhin
b76ce0e0a4
Merge pull request #11253 from mshabunin:decrease-tbb-dependency
2018-04-09 16:03:34 +00:00
Alexander Alekhin
b82bec88d9
Merge pull request #11271 from alalek:tbb_build_warning
2018-04-09 15:53:26 +00:00
Alexander Alekhin
7dc162cb42
core: fix mm_pause() for non-SSE i386 builds
...
replaced to safe binary compatible 'rep; nop' asm instruction
2018-04-09 18:37:35 +03:00
Vadim Pisarevsky
474a23bda5
Merge pull request #11170 from alalek:test_fixed_type
2018-04-09 14:53:43 +00:00
tlanclos
a2c7afad77
V4L Buffer: Support CV_CAP_PROP_BUFFERSIZE in cap_v4l ( #11047 )
2018-04-09 17:34:00 +03:00
shimat
e172935658
LSD: support vector<Vec4i> lines ( #11042 )
...
* add LSD supportsVec4iResult
* LineSegmentDetector.drawSegments: support vector<Vec4i>
* test_lsd.cpp: replace detect()
* test_lsd.cpp: add compareSegments tests
* lsd.cpp: LSD.compareSegments support Vec4i
* test_lsd.cpp: fix trailing whitespace
2018-04-09 17:31:56 +03:00
Dmitry Kurtaev
709cf5d038
OpenCL GPU target for Inference Engine deep learning backend
...
Enable FP16 GPU target for DL Inference Engine backend.
2018-04-09 17:21:35 +03:00
Vadim Pisarevsky
72cb06abf0
Merge pull request #11231 from saskatchewancatch:tiff-dpi-feature
2018-04-09 13:28:08 +00:00
Vadim Pisarevsky
fa5a6bfa02
Merge pull request #11251 from mshabunin:add-runtime-version
2018-04-09 13:24:29 +00:00
Vladislav Sovrasov
0d9c63744e
Add CPU default extensions loading in IE dnn backend ( #11252 )
...
* Add CPU default extensions loading in IE dnn backend
* Load cpu_extensions for the future Intel's Inference Engine
2018-04-09 16:22:19 +03:00
Vadim Pisarevsky
20334e3f09
Merge pull request #11264 from K-Shinotsuka:issue39
2018-04-09 13:20:48 +00:00
Vadim Pisarevsky
19de675a4e
Merge pull request #11270 from alalek:parallel_for_exception_fix_android
2018-04-09 13:18:39 +00:00
Alexander Alekhin
a22ee76b45
imgcodecs: exclude rle8.bmp from GDAL tests
...
GDAL message:
- ERROR 1: The BMP file is probably corrupted or too large. Image width = 480
2018-04-09 13:18:33 +03:00
Alexander Alekhin
854ab48de0
tbb: fix build warnings -Wshadow
2018-04-09 12:58:09 +03:00
Alexander Alekhin
8dacbe7584
android: std::exception_ptr is not available on some platforms (even with enabled C++11)
2018-04-09 12:54:57 +03:00
Vadim Pisarevsky
6a15910f0f
Merge pull request #11208 from terfendail:seamless_1
2018-04-09 09:52:28 +00:00
Vadim Pisarevsky
4617758053
Merge pull request #11247 from lopespt:fix_issue_10506
2018-04-09 09:39:17 +00:00
Vadim Pisarevsky
f0d22dabea
Merge pull request #11254 from terfendail:msmf_sourcereader
2018-04-09 09:34:15 +00:00
Vadim Pisarevsky
26a8ab5719
Merge pull request #11262 from alalek:fix_houghCircles_sync
2018-04-09 09:32:37 +00:00
Maksim Shabunin
d2cff38db6
Added interface to check library version during runtime
2018-04-09 12:30:39 +03:00
Alexander Alekhin
3c936ddcf9
Merge pull request #11259 from dkurt:fix_10965
2018-04-09 08:39:41 +00:00
Alexander Alekhin
47e476c9cd
Merge pull request #11217 from dan-masek:fix_issue_11206
2018-04-08 15:12:12 +00:00
Alexander Alekhin
814b78dad8
Merge pull request #11230 from tkonolige:master
2018-04-08 15:11:17 +00:00
k-shinotsuka
fbdcc0e8e4
add universal intrinsics for HSV2RGB_f
2018-04-08 01:47:22 +09:00
Alexander Alekhin
15837b43ca
imgproc: don't call .unlock() on non-holded mutex in houghCircles()
2018-04-07 13:00:17 +00:00
Dmitry Kurtaev
73ca194313
Fix convertFp16 in JavaScript build
2018-04-07 09:44:43 +03:00
Alexander Alekhin
23d866ad40
Merge pull request #11237 from alalek:cuda_refactor_memorypool
2018-04-06 15:37:37 +00:00
Vitaly Tuzov
24bd44f088
MSMF-based VideoCapture reworked to use SourceReader
2018-04-06 17:39:56 +03:00
Maksim Shabunin
b88609a921
Reduced direct TBB dependencies
2018-04-06 14:21:15 +03:00
lopespt
c17ce1a0af
Solves issue #10506
2018-04-05 20:25:32 -03:00
Alexander Alekhin
875b4e212a
Merge pull request #11200 from alalek:android_refactor_sdk_detection
2018-04-05 20:44:59 +00:00
Alexander Alekhin
a87a5dfdb3
Merge pull request #11192 from terfendail:setto_fix
2018-04-05 20:25:34 +00:00
Alexander Alekhin
e20fb7f429
Merge pull request #11197 from alalek:parallel_propagate_exception
2018-04-05 20:24:22 +00:00
Alexander Alekhin
e27ae6483a
Merge pull request #11221 from dkurt:dnn_fix_proposal_layer
2018-04-05 20:23:49 +00:00
Alexander Alekhin
6abfc6761e
android: refactor Android SDK detection
...
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
2018-04-05 19:19:31 +00:00
Alexander Alekhin
7818071ba2
cuda: eliminate part of build warnings
2018-04-05 17:53:22 +03:00
Alexander Alekhin
82ba3ac894
cuda: refactor MemoryPool
...
- make non-copyable (aligns inner mutex semantic to std::mutex)
- getMemoryPool() returns reference instead of pointer (NULL is not expected here)
2018-04-05 16:04:37 +03:00
Alexander Alekhin
f93c1b942a
Merge pull request #11222 from lopespt:add_binary_search_knearest
2018-04-05 11:00:00 +00:00
Vitaly Tuzov
628f04ae96
Merge pull request #11092 from terfendail:msmf_videocapture
...
Update for MSMF-based VideoCapture and VideoWriter (#11092 )
* MSMF based VideoCapture updated to handle video stream formats different from RGB24
* MSMF based VideoWriter updated to handle video frame top-bottom line ordering regardless of output format
* Fixed race condition in MSMF based VideoCapture
* Refactored MSMF based VideoCapture and VideoWriter
* Disabled frame rate estimation for MP43
* Removed test for unsupported avi container from MSMF VideoWriter tests
* Enabled MSMF-based VideoIO by default
2018-04-05 13:55:42 +03:00
Alexander Alekhin
c2fb4debc5
Merge pull request #11224 from alalek:fix_core_min_avx2
2018-04-05 10:37:31 +00:00
Alexander Alekhin
8f7e7cd343
Merge pull request #11071 from alalek:issue_11061_fix_error_message
2018-04-05 10:15:04 +00:00
Rajkiran Natarajan
4668836071
Support for setting TIFF DPI info in imwrite
2018-04-04 21:20:16 -07:00
Tristan Konolige
9d589379ec
don't reset camera in setViewerPose
2018-04-04 13:00:50 -06:00
Alexander Alekhin
d294e9d62a
Merge pull request #11216 from dan-masek:fix_issue_11205
2018-04-04 15:37:57 +00:00
yuki takehara
d57e5c31c0
Merge pull request #11214 from take1014:core_9720
...
* fix #9720
* Add regression test
* Fix calculation method for scale
2018-04-04 18:36:02 +03:00
Alexander Alekhin
45a69ebec8
core: fix AVX2 min implementation
2018-04-04 17:38:58 +03:00
Vitaly Tuzov
eb2c9f1519
Fixed mask reduction in seamless_clone
2018-04-04 16:33:28 +03:00
Vitaly Tuzov
ccd16f107d
Fixed IPP based implementation of setTo() for infinity value
2018-04-04 16:05:22 +03:00
lopespt
65d816c3b5
Adds efficient sort algorithm to KNearest
2018-04-04 09:35:58 -03:00
Dmitry Kurtaev
ef1aaf12c9
Fix Proposal deep learning layer
2018-04-04 14:48:29 +03:00
Alexander Alekhin
7bc980edaf
Merge pull request #10983 from dkurt:dnn_face_detection_uint8
2018-04-03 18:19:43 +00:00
Dan Mašek
8c1d8eccdd
Merge pull request #11207 from dan-masek:add_redirect_error
...
* Add Python support for error message handlers.
* Move the static variable to the only function that uses it.
* Remove the optional param (user data), since this can already be handled by closures.
* Correct the help string.
* python: added redirectError test
2018-04-03 21:16:34 +03:00
Alexander Alekhin
f95e91e2bc
Merge pull request #11199 from dkurt:update_torch_testdata
2018-04-03 18:02:58 +00:00
Dan Mašek
f6e299b58b
Fix #11206
2018-04-03 03:24:49 +02:00
Dan Mašek
eae3ed0c08
Fix a leak described in issue #11205
2018-04-03 03:02:21 +02:00
Dmitry Kurtaev
8d8f3bca6f
Update links to OpenCV's face detection network
2018-04-02 13:02:56 +03:00
Arkadiusz Raj
619e4c94d5
Protection to not run Eth config when USB camera is connected
2018-04-01 15:37:10 +02:00
Dmitry Kurtaev
818a91f4f7
Update Torch testdata
2018-03-31 12:04:44 +03:00
Dmitry Kurtaev
598039c0ed
Fix embedded Torch's nn.ConcatTable
2018-03-31 11:11:10 +03:00
Alexander Alekhin
dbcb454917
Merge pull request #11195 from alalek:fix_qt_build
2018-03-30 14:52:11 +00:00
Alexander Alekhin
6f69800d0c
core: propagate parallel_for() exceptions
2018-03-30 16:24:31 +03:00
Alexander Alekhin
e8a67de0d2
Merge pull request #11182 from dkurt:fix_11102_part_2
2018-03-30 13:11:01 +00:00
Alexander Alekhin
82fd00af99
fix build issues with QT/OpenGL
2018-03-30 12:49:09 +03:00
Vadim Pisarevsky
8fce25d788
Merge pull request #11187 from alalek:respect_threading_settings
2018-03-30 09:39:04 +00:00
Alexander Alekhin
2fb4812f6d
Merge pull request #11194 from ltqusst:fix_10557
2018-03-30 09:30:43 +00:00
ltqusst
0d646490f5
Fix #10557
...
Fix overflow bugs in conversion from NV12 VA-surface/D3D11texture2D to OpenCL UMat
2018-03-30 16:32:15 +08:00
catree
a885480c9e
Remove temporary file used for test.
2018-03-29 18:34:30 +02:00
Alexander Alekhin
1b7aa92eb6
Merge pull request #11188 from mshabunin:fix-clang-warnings
2018-03-29 14:34:30 +00:00
Alexander Alekhin
8c4b5b6a70
core(test): parallel_for test with exception
2018-03-29 16:59:51 +03:00
Alexander Alekhin
177be2adda
Merge pull request #11174 from corleypc:master
2018-03-29 13:50:44 +00:00
RAJKIRAN NATARAJAN
6d83a80385
Merge pull request #11176 from saskatchewancatch:issue-11165
...
* fix cv::imwrite to allow cv::UMat and vectors of it to be written
* cv::imwrite failure handling improvements
* Unit test for regression testing imwrite support for and fix whitespace
2018-03-29 16:47:31 +03:00
Maksim Shabunin
439072a2a6
Fixed two warnings produced by clang
2018-03-29 13:24:04 +03:00
Alexander Alekhin
7f63b31ca8
avoid calling of setNumThreads() to respect user settings
2018-03-29 13:04:26 +03:00
Alexander Alekhin
87498bc6d4
cmake: workaround CPATH ipp_iw issue
...
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
2018-03-28 18:43:28 +03:00
Alexander Alekhin
8a0cc5009e
build: eliminate MSVC warning
2018-03-28 18:43:28 +03:00
Alexander Alekhin
25be4186bc
python: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:28 +03:00
Alexander Alekhin
6c8014e7d1
cmake: disable checks for protobuf generated files
2018-03-28 18:43:28 +03:00
Alexander Alekhin
d7e9201434
misc: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:28 +03:00
Alexander Alekhin
2bd4f2c3a6
videostab: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:28 +03:00
Alexander Alekhin
a8eb3e1b29
superres: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
4a0fa57614
shape: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
4df4a37b11
flann: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
1ca7ae9630
video: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
e741b71dac
photo: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
225bae1387
stitching: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
4d0dd3e509
ml: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
3314966acb
objdetect: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
1060c0f439
dnn: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
bdbd0129af
calib3d: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
0854dc3320
features2d: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
8f0669c300
videoio: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
a91953b15c
imgcodecs: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
5d36ee2fe7
imgproc: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
9111538bfb
core: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
0587f92d96
cmake: disable override warnings in 3rdparty code and viz
2018-03-28 17:57:59 +03:00
Alexander Alekhin
773877cd12
ts: apply CV_OVERRIDE/CV_FINAL
...
- disable "-Wsuggest-override" in tests
2018-03-28 17:57:59 +03:00
Alexander Alekhin
84980741a8
core: add CV_OVERRIDE/CV_FINAL macros
2018-03-28 17:57:58 +03:00
Alexander Alekhin
167034fb04
Merge pull request #11098 from dkurt:dnn_native_inf_engine
2018-03-28 14:52:08 +00:00
Dmitry Kurtaev
e039fc3a63
Replace protobuf's ReleaseLast to RemoveLast to deallocate memory.
...
Change an order of PriorBox layer operations.
2018-03-28 17:27:36 +03:00
Alexander Alekhin
9badb0d903
[move sift.cpp] xfeatures2d: apply CV_OVERRIDE/CV_FINAL
...
original commit: ec65e5b29c
2018-03-28 16:50:00 +03:00
Dmitry Kurtaev
2f3a9ba1d4
Update OpenCVDetectInferenceEngine.cmake
2018-03-28 16:34:37 +03:00
Vadim Pisarevsky
1097d0e810
Merge pull request #11072 from alalek:explicit_autobuffer
2018-03-28 12:57:25 +00:00
Vadim Pisarevsky
284e5231c5
Merge pull request #11171 from codingforfun:fix_11143
2018-03-28 12:47:37 +00:00
Vadim Pisarevsky
6b041c8aeb
Merge pull request #11137 from alalek:core_fix_mat_ctor
2018-03-28 12:39:49 +00:00
Alexander Alekhin
8388b630ac
Merge pull request #11167 from alalek:cmake_compiler_vars
2018-03-28 12:38:31 +00:00
LaurentBerger
03eb463f1c
Solves #11156 ( #11160 )
...
* Solves #11156
* Check file size for all file format. Disable APPEND if file is empty
* Add test for APPEND mode
2018-03-28 15:35:38 +03:00
Alexander Alekhin
75b5e3fa64
Merge pull request #11175 from collenjones:hotfix/coreLinkFix
2018-03-28 12:21:11 +00:00
Tomoaki Teshima
c14578649d
fix build error on Jetson
2018-03-28 18:21:53 +09:00
Collen Jones
687ccdf8db
Fix link to Hershey fonts
2018-03-27 20:11:48 -07:00
corley
a4b9ce764c
Fixed silent failures in getting and setting properties
2018-03-28 00:05:54 +03:00
Alexander Alekhin
7d8f1dde26
core(persistence): disable checks for base64 streams
2018-03-27 17:02:04 +03:00
codingforfun
24e2e0d3f9
#11143 [FIX] Normalize node risk with sample weight sum
...
In case of regression trees, node risk is computed as sum of squared
error. To get a meaningfull value to compare with it needs to be
normalized to the number of samples in the node (or more generally to
the sum of sample weights in this node). Otherwise the sum of squared
error is highly dependend on the number of samples in the node and
comparision with `regressionAccuracy` parameter is not very meaningful.
After normalization `node_risk` means in fact sample variance for all
samples in the node, which makes much more sence and seams to be what
was originaly intended by the code given that node risk is later used as
a split termination criteria by
```
sqrt(node.node_risk) < params.getRegressionAccuracy()
```
2018-03-27 15:39:36 +02:00
Alexander Alekhin
017c217bb0
Merge pull request #11162 from kinchungwong:master
2018-03-27 13:27:43 +00:00
Alexander Alekhin
f4c4b01455
core: added checks and "fixit" items for persistence parsers
...
To raise errors with proper messages of the problems.
2018-03-27 16:19:43 +03:00
Alexander Alekhin
08941b7890
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
...
- Recommended compiler checks:
- GCC: CV_GCC
- Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Alexander Alekhin
7ee217285b
Merge pull request #11089 from terfendail:stereocalibrate_f32
2018-03-27 13:08:06 +00:00
Alexander Alekhin
9e0dee1259
Merge pull request #11112 from alalek:cmake_src_include_fix
2018-03-27 13:06:48 +00:00
Alexander Alekhin
d1311518a3
core: test-sample for FIXED_TYPE demonstration
...
with implementation of functions with multiple output formats
2018-03-27 15:41:41 +03:00
Vadim Pisarevsky
6e13ffe162
Merge pull request #11159 from alalek:samples_avoid_legacy_api
2018-03-27 10:05:35 +00:00
corley
f441515357
Fixed a couple of memory leaks in videoInput::getDevice() when multiple devices are present in the system
2018-03-27 00:54:48 +03:00
kinchungwong
333e53eee8
Minor improvement to SSE code in HOGDescriptor::computeGradient, replace emulation of _mm_mullo_epi32 with constant multiplicand 3 with two _mm_add_epi32. OpenCV issue #11161
2018-03-26 09:24:03 -07:00
Alexander Alekhin
7f9253ea0a
samples: avoid using of legacy C-like API
...
- CV_RGB() macro is moved into opencv2/imgproc.hpp from imgproc_c.h
- samples/cpp/filestorage_base64.cpp is dropped
2018-03-26 13:42:35 +03:00
Alexander Alekhin
24acbecd33
Merge pull request #11151 from AndreiCostinescu:patch-1
2018-03-26 10:22:38 +00:00
Dmitry Kurtaev
7972f47ed4
Load networks from intermediate representation of Intel's Deep learning deployment toolkit.
2018-03-26 07:24:21 +03:00
Namgoo Lee
a8f86af633
Update GpuMat, GpuMat::download, GpuMat::upload documentation
2018-03-26 10:59:05 +09:00
Andrei Costinescu
38d73123c1
#include <math.h> in cv2.cpp
...
My build fails with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/cmath:1136:11: error: '::hypot' has not been declared".
I have tried to fix it by adding "#include <cmath>" before the line "#include <Python.h>" but then the build has failed with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/math.h:91:12:: error: 'std::_hypot' has not been declared".
Adding "#include <math.h>" allowed me to build opencv.
2018-03-25 20:39:29 +02:00
Alexander Alekhin
e06d1e8083
Merge pull request #11141 from dkurt:dnn_no_aspect_ratios
2018-03-24 20:38:55 +00:00
Anthony Wertz
c6cf7f8080
Sets a higher limit on videoio's AVI container's maximum chunk size, and adds an explanation of the assertion. Closes #11126
2018-03-23 12:03:46 -04:00
Alexander Alekhin
cd4b748b44
Merge pull request #11064 from tomoaki0705:fixCudaStreamAsync
2018-03-23 13:04:18 +00:00
Dmitry Kurtaev
e8fe6ee4e3
Fix prior box generation in case of squared proposals.
...
Fix batch norm in training phase.
2018-03-23 09:44:59 +03:00
Alexander Alekhin
4378e8fcc0
core: fix cv::Mat constructor
2018-03-22 15:35:54 +03:00
Tomoaki Teshima
06babf90a5
let the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64
...
* disable carotenete when calling resize on ARM/Aarch64
* loosen eps on Aarch64
2018-03-22 21:35:34 +09:00
Tomoaki Teshima
f4e5d777e8
follow histogram
2018-03-22 21:33:51 +09:00
Tomoaki Teshima
6c25351049
make the asynchronous call to NPP safe
...
* Stop calling nppSetStream
2018-03-22 21:33:51 +09:00
Alexander Alekhin
2dff9f4c6d
Merge pull request #11136 from tomoaki0705:fixCalib3dClang
2018-03-22 10:24:36 +00:00
Alexander Alekhin
b390e86b12
Merge pull request #11124 from terfendail:minenctriangle_fix
2018-03-22 10:23:10 +00:00
Tomoaki Teshima
08e0c69dbf
apply the workaround to correct range
2018-03-22 18:28:47 +09:00
Vitaly Tuzov
91c35a7d01
Updated handling of collinear edges while searching for intersection.
2018-03-21 19:15:34 +03:00
Alexander Alekhin
0366c1b093
Merge pull request #11105 from dkurt:issue_11102
2018-03-21 09:18:14 +00:00
Alexander Alekhin
fed22f2f5c
Merge pull request #11074 from alalek:android_log_messages
2018-03-20 20:40:54 +00:00
Alexander Alekhin
6c051a55e5
cmake: don't add include <module>/src directory to avoid conflicts
...
during opencv_world builds
2018-03-19 11:14:15 +03:00
Namgoo Lee
90e1e41f5a
test_buffer_pool: synchronize after async copy
2018-03-19 09:30:06 +09:00
Aleksandr Tischenko
22ecdd16ef
Merge pull request #11101 from lamantine:fix_11100
...
* fixed bug #11100 Integer overflow in kmeans
* fixed integer overflow in other divUp-s in kmeans code
fixed warning about size_t to double conversion
2018-03-18 15:11:42 +03:00
Dmitry Kurtaev
069f9add80
Fix an issue https://github.com/opencv/opencv/issues/11102
2018-03-18 10:49:12 +03:00
yuki takehara
41f8e788b2
Merge pull request #11083 from take1014:lsd_#9363
...
* Fix #9363
* Renamed the structure and added a new function to the LineSegmentDetectorImpl class as a static member
* Added a new function to the LineSegmentDetectorImpl class as a static member
2018-03-16 19:31:55 +03:00
Vitaly Tuzov
7afaaef0eb
Allow CV_32FC3 objPoints in cv::fisheye::stereoCalibrate
2018-03-16 13:05:40 +03:00
Alexander Alekhin
dd259503c1
Merge pull request #11073 from geordi:qt-window-pixel-values
2018-03-15 14:35:29 +00:00
Rostislav Vasilikhin
64916d3d83
Merge pull request #10869 from savuor:color_cpp_split
...
color.cpp split (#10869 )
* initial split is done
* files renamed (these names are excluded during compilation)
* IPP code moved to corresponding files
* splineBuild, splineInterpolate -> color_lab.cpp
* Lab, Luv: little refactored
* it compiles (didn't check work); Lab OCL code moved to color_lab.cpp
* cvtcolor.cl: Lab/Luv part moved to color_lab.cl
* cvtcolor.cl: color_rgb.cl extracted
* cvtcolor.cl: color_yuv.cl separated
* cvtcolor.cl: color_hsv.cl extracted
* cvtcolor.cl: extracted to color_lab.cl and color_rgb.cl
* helper functions moved to hpp file
* Lab, Luv: moved to color_lab.cpp
* CPU XYZ: to color_lab.cpp
* OCL XYZ: to color_lab.cpp
* warning fixed
* CvtHelper added
* CPU YUV: to color_yuv.cpp, helpers to color.hpp
* CPU HLS/HSV: to color_hsv.cpp
* CPU BGR2BGR: to color_rgb.cpp
* CPU RGB: to color_rgb.cpp
* extra arg removed
* CPU YUV: to color_yuv.cpp
* color code decoded
* OclHelper added, some funcs rewritten
* color_lab.cpp: refactored to use OclHelper
* OCL RGB: to color_rgb.cpp
* OCL HLS/HSV: to color_hsv.cpp
* OCL YUV: to color_yuv.cpp
* OCL YUV planes: to color_yuv.cpp
* OCL: color code reduced
* licence to demosaicing.cpp
* IPP func tables to color_rgb.cpp
* code cleanup
* HAVE_OPENCL ifdefs added
* helpers made more common
* fixed two plane YUV with separate mats
* fixed warning in gcc7.2.0
* precomp header fixed
* color space classification functions fixed
* helpers fixed
* rename: isSRGB -> is_sRGB
2018-03-15 14:10:40 +03:00
Alexander Alekhin
d68466bb6a
Merge pull request #10940 from dkurt:dnn_tf_graph_optim
2018-03-14 14:36:25 +00:00
Alexander Alekhin
ab110c0ad1
Merge pull request #10979 from dkurt:unite_dnn_samples
2018-03-14 14:33:49 +00:00
Alexander Alekhin
8781ee971c
core: write log messages via __android_log_print (logcat) too
2018-03-14 17:24:29 +03:00
Alexander Alekhin
cc06935a10
Merge pull request #11065 from vasiliev-vb:BUGFIX_KAZE_orientation
2018-03-14 14:15:47 +00:00
miqlas
f3a9f13cb4
Merge pull request #10984 from extrowerk:advanced_haiku_patches
...
* Haiku supporting patches
* Revert uneeded changes
* Whitespace cleanup
2018-03-14 17:09:10 +03:00
Jan Gaura
eb3969e244
Better text contrast of pixel brightness values in Qt window
...
This offsets text brightness of pixel brightness values
by offsetting it by 127 to the curent pixel value.
The text is now readable even if pixels are black.
2018-03-14 13:27:11 +01:00
Alexander Alekhin
ee1ac1140d
core: use explicit for cv::AutoBuffer
...
To avoid compilation of this code:
- buf = 0;
This code can be received after refactoring of 1D cv::Mat to cv::AutoBuffer.
- "cv_mat = 0" calls setTo().
- cv::AutoBuffer calls "allocate(0)" - this is wrong.
2018-03-14 14:17:52 +03:00
vasiliev-vb
94c8e59bbe
Fixed bug in KAZE features orientation.
...
Bug was added in f6ceeaa
2018-03-13 15:09:36 +00:00
Alexander Alekhin
7e9578789b
Merge pull request #11057 from tomoaki0705:fixClangComplexCalib3d
2018-03-13 13:43:21 +00:00
Tomoaki Teshima
7fd53f6ca2
avoid clang weird behavior in calib3d
...
* add ifdef to apply on specific situation
2018-03-13 21:51:20 +09:00
Dmitry Kurtaev
538fd42363
Add test for Scalar arguments at CommandLineParser
2018-03-13 11:01:07 +03:00
yuki takehara
0792ef8789
Merge pull request #11049 from take1014:#10948
...
* Fix #10948
* Add test code
* Fixed build error
* Add value zero
* eigen: test cleanup
2018-03-12 21:49:10 +03:00
shimat
5bf7f09ac1
Merge pull request #11035 from shimat:refactoring_decolor
...
Refactor decolor (#11035 )
* decolor: modernize deprecated headers (math.h -> cmath)
* refactor contrast_preserve.cpp
* refactor contrast_preserve.hpp (add static/const)
* refactor contrast_preserve.hpp (join assignment and declaration)
* refactor contrast_preserve.hpp (format)
* refactor test_decolor.cpp (indent)
* refactor contrast_preserve.hpp (const)
* contrast_preserve.hpp : optimize by minMaxLoc
* fix trailing-whitespace
* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)
* use cvRound instead of round_num
* decrease indentation of test_decolor.cpp
* remove pow() to optimize
* remove redundant Mat initialization
2018-03-12 17:22:06 +03:00
Dmitry Kurtaev
ab20d2a3fc
Update assertions in batch norm layer
2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
69a8f110b6
Fuse subgraphs from Keras
2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
9457bf10ab
Fuse batch normalization and flatten TensorFlow subgraphs in runtime
2018-03-12 10:51:35 +03:00
Adam Rankin
d810c73396
Update precomp.hpp
...
Enabling build of visualization module when using VTK 9 (current HEAD of d5bbb9e99bbc6d11d2196c48bfd8f33508554551)
2018-03-11 22:28:18 -04:00
Alexander Alekhin
5b868ccd82
Merge pull request #10992 from dkurt:dnn_opencl_tests
2018-03-09 10:06:40 +00:00
Alexander Alekhin
5b6ee79cd6
Merge pull request #11033 from adamrankin:patch-1
2018-03-08 17:49:10 +00:00
Alexander Alekhin
8bb787cdf8
Merge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013
2018-03-08 14:28:14 +00:00
Dmitry Kurtaev
130546e1d9
Semantic segmentation sample.
2018-03-08 11:02:26 +03:00
Adam Rankin
f8061ba3c8
Enabling build of stitching when CUDA is available
...
Without proposed change, module throws build error regarding missing `opencv2/cudaimgproc.hpp`
2018-03-07 20:07:48 -05:00
Dmitry Kurtaev
0f01b40dd5
Reset OpenCL kernels if batch size changes
2018-03-07 17:06:59 +03:00
Alexander Alekhin
8edc2e5aaf
Merge pull request #10928 from Mehanik:fix_timeout
2018-03-07 12:34:09 +00:00
shimat
21d9c47bd0
Optimize decolor in photo ( #10997 )
...
* optimized cv::decolor by removing vector.push_back
* restored CV_INSTRUMENT_REGION() and original indent
* fix build warnings in contrast_preserve.hpp
* undo refactoring contrast_preserve.cpp/hpp
2018-03-07 14:20:45 +03:00
Eugene Mikhantiev
c790299906
Fix return code in case of timeout
2018-03-07 17:26:34 +07:00
Alexander Alekhin
514f4193db
Merge pull request #10959 from alalek:cmake_ocl4dnn
2018-03-07 10:26:14 +00:00
Dmitry Kurtaev
0a61ebdd66
Replace DNNTarget and DNNBackend in tests
2018-03-07 12:59:38 +03:00
Tomoaki Teshima
640d77be25
let the performance tests of WarpPerspective pass
...
* avoid misuse of vzeroupper on Visual Studio 2013 Update 5
* add ifdef to avoid unattended optimization
2018-03-07 18:55:27 +09:00
Maksim Shabunin
49dd0305f2
Merge pull request #10946 from mshabunin:add-license-install
2018-03-07 07:15:50 +00:00
Alexander Alekhin
1393fd9e8e
Merge pull request #10989 from tomoaki0705:fixOldGstreamerTest
2018-03-06 16:26:08 +00:00
Alexander Alekhin
3202062e77
Merge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012
2018-03-06 15:49:08 +00:00
Maksim Shabunin
7bbe002a2f
Add install component for 3rdparty libraries licenses
2018-03-06 16:32:30 +03:00
Tomoaki Teshima
9079d9ce17
let the test OCL_Filter/Bilateral pass
...
* avoid aggressive optimization on Visual Studio 2012 Update 5
* add code branch to avoid unattended optimization (keep the old code)
2018-03-06 19:48:04 +09:00
native-api
dc1d9ae973
Include error code description into the message ( #10982 )
2018-03-06 09:58:19 +03:00
Namgoo Lee
c219f97f48
SSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S ( #10987 )
...
* SSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S
* No need to define a new universal intrinsic
2018-03-06 09:50:53 +03:00
Dmitry Kurtaev
e1c3237532
Parametric OpenCL deep learning tests
2018-03-05 20:53:18 +03:00
Tomoaki Teshima
a9f3a7de39
add workaround of old gstreamer
2018-03-05 19:27:49 +09:00
Suleyman TURKMEN
5e1a656bbb
Update core.hpp
2018-03-04 23:02:47 +03:00
Dmitry Kurtaev
f2440ceae6
Update tutorials. A new cv::dnn::readNet function
2018-03-04 20:30:22 +03:00
Dmitry Kurtaev
e8d94ea87c
Unite deep learning object detection samples
2018-03-03 14:47:13 +03:00
cDc
667f5b655a
Merge pull request #10933 from cdcseacave:clean_npr
...
* clean npr functions of useless initializations (speed-up)
* photo: remove unnecessary code
2018-03-02 14:42:28 +03:00
Alexander Alekhin
0d2cee45e8
Merge pull request #10971 from alalek:ocl_error_code_string
2018-03-02 11:41:01 +00:00
Alexander Alekhin
f2ec7eeb37
Merge pull request #10966 from alalek:verbose_features2d_test
2018-03-02 11:39:14 +00:00
Alexander Alekhin
e869bb6b05
Merge pull request #10964 from alalek:fix_10956
2018-03-02 11:38:52 +00:00
Alexander Alekhin
fe97dc67dc
Merge pull request #10962 from alalek:dnn_precomp_hpp
2018-03-02 11:38:16 +00:00
Alexander Alekhin
97c1f09961
Merge pull request #10955 from pengli:dnn
2018-03-02 11:35:59 +00:00
Alexander Alekhin
fda7bb95d0
Merge pull request #10938 from mshabunin:fix-static-issues-9
2018-03-02 11:34:53 +00:00
Alexander Alekhin
90ff900387
Merge pull request #10926 from tomoaki0705:fixTinkerBoardOpenCL
2018-03-02 11:32:51 +00:00
Alexander Alekhin
b1fc7d46a5
ocl: update getOpenCLErrorString() code
2018-03-01 13:52:43 +03:00
Alexander Alekhin
a9ebc61f2a
dnn(workaround): switch to CPU target if compiled without OpenCL
2018-03-01 12:12:40 +03:00
Alexander Alekhin
1b83bc48a1
dnn: make OpenCL DNN code optional
2018-03-01 12:12:40 +03:00
Alexander Alekhin
da6dc6774b
features2d: add verbose messages into tests
...
To investigate sporadic failures of Features2d_FLANN_Auto.regression test.
2018-02-28 19:47:16 +00:00
Alexander Alekhin
76c40e8f0d
java: fix copy_java_files() in gen_java.py
...
- missing 'module'
- fixed '\r\n' EOL handling (blocked by '$' regex)
2018-02-28 17:58:31 +03:00
Alexander Alekhin
a838a97092
dnn: fix precomp.hpp usage
2018-02-28 17:06:26 +03:00
Wu Zhiwen
ef937dd676
ocl4dnn: Fix SAME padding mode for convolve
...
Signed-off-by: Wu, Zhiwen <zhiwen.wu@intel.com>
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-28 21:02:41 +08:00
Tomoaki Teshima
8fd1bbde76
fix test error on Tinker Board (OpenCL on Arm platform)
...
* loosen some test threshold mainly for integer types
* use relative error for floating points result
* avoid division by zero by following the comment
* fix the indentation
2018-02-26 22:55:06 +09:00
Maksim Shabunin
7c855aa3e1
Fixed two issues found by static analysis
2018-02-26 00:16:02 +03:00
Alexander Alekhin
24bed38c2b
Merge tag '3.4.1'
2018-02-25 16:56:57 +00:00
Alexander Alekhin
6ffc48769a
OpenCV version++
...
OpenCV 3.4.1
2018-02-23 11:38:33 +03:00
Alexander Alekhin
4a74408eee
experimental version++
2018-02-23 11:38:33 +03:00
Li Peng
608968aa83
Deconvolution ocl fix
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-23 18:31:30 +08:00
Li, Peng
5caf6244a3
Merge pull request #10922 from pengli:dnn
...
* ave pooling ocl fix
support the padded area control in ave pooling
Signed-off-by: Li Peng <peng.li@intel.com>
* warning fix: ununitialized field
2018-02-22 21:01:12 +03:00
Maksim Shabunin
92e9d4ec3a
Fixed several issues detected by static analysis
2018-02-22 17:11:33 +03:00
Maksim Shabunin
fbb2cabe77
Use fixed size types in AVIContainer structs
2018-02-22 17:11:25 +03:00
Maksim Shabunin
3fd2384b81
Fixed mingw compilation on Windows
2018-02-22 17:11:18 +03:00
Vadim Pisarevsky
5e0f95b948
Merge pull request #9708 from dkurt:tf_face_detector
2018-02-22 12:04:26 +00:00
Vadim Pisarevsky
a11b7a8293
Merge pull request #10916 from alalek:videoio_sample_aspect_ratio
2018-02-22 12:03:39 +00:00
Li Peng
e7d35d51fa
Fix for opencv face detector ocl test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-22 23:37:54 +08:00
Li Peng
c524f669c7
Fallback for "SAME" padMode in ocl convolution and pooling
...
It fixes tensorflow ocl testcase of MobileNetSSD and Inception_v2_SSD
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-22 21:17:59 +08:00
Alexander Alekhin
203ac0f818
Merge pull request #10914 from alalek:issue_10815
2018-02-21 18:26:15 +00:00
Dmitry Kurtaev
eab556e1e0
OpenCV face detection network in TensorFlow
2018-02-21 19:58:24 +03:00
Alexander Alekhin
9819ebc095
videoio: add missing CAP_PROP_SAR_NUM/DEN propepties into .hpp file
...
reuse av_guess_sample_aspect_ratio() if available in ffmpeg
2018-02-21 19:14:04 +03:00
Alexander Alekhin
48b8aa51cd
core: eliminate redundant cv::format() declarations
...
Existed includes sequence:
- utility.hpp -> core.hpp -> operations.hpp
2018-02-21 14:22:16 +03:00
Alexander Alekhin
6e8241b78d
imgcodecs: fix RBaseStream hang on truncated inputs
2018-02-21 13:17:18 +03:00
Vadim Pisarevsky
f61076a5d8
Merge pull request #10367 from savuor:multiwrite_tiff_renew
2018-02-20 23:13:55 +00:00
Alexander Alekhin
5f5fcef962
Merge pull request #10907 from alalek:cmake_ninja_fix
2018-02-20 18:54:43 +00:00
Namgoo Lee
12ce6b5c15
Merge pull request #10906 from nglee:dev_cudaFastMultiStreamSafety
...
cuda_fast : multi stream safety (#10906 )
* CUDA_Features2D/FAST Asynchronous test
* cuda_fast : multi stream safety
* Use parallel_for instead of OpenMP
2018-02-20 20:55:57 +03:00
Rostislav Vasilikhin
27b1f8f446
imwrite for multipage images implemented
2018-02-20 19:08:45 +03:00
Vadim Pisarevsky
c6e1e3acdc
Merge pull request #10892 from alalek:android_sdk_build_gradle
2018-02-20 14:59:32 +00:00
Vadim Pisarevsky
53661d55ae
Merge pull request #10406 from seiko2plus:coreUnvintrinCopy
2018-02-20 14:50:17 +00:00
Vadim Pisarevsky
120b7a61c3
Merge pull request #10745 from terfendail:tiff_fix
2018-02-20 14:47:13 +00:00
PalkoNazar
470d34ddbb
make tmpRow proper size before copyTo to avoid reallocated tmpCol ( #10860 )
...
* make tmpRow proper size before copyTo to avoid reallocated tmpCol
* do the transposition without creating temporary array; replace TAB with spaces.
* revert the previous commit
2018-02-20 16:55:25 +03:00
Vadim Pisarevsky
a0c2718adb
Merge pull request #10902 from alalek:port_10695
2018-02-20 13:26:59 +00:00
Vadim Pisarevsky
a836892edb
Merge pull request #10903 from alalek:ml_ann_test
2018-02-20 13:25:58 +00:00
Alexander Alekhin
2aa15ab3ff
ffmpeg: fix 'uchar' error
...
> cap_ffmpeg_impl.hpp:1710:11: error: 'uchar' does not name a type
2018-02-20 13:15:41 +03:00
Alexander Alekhin
807ec00b85
cmake: fix Ninja warning
...
about BYPRODUCTS bin/opencv-340.jar
2018-02-20 13:13:31 +03:00
Alexander Alekhin
53305d4a7e
Merge pull request #10891 from pengli:dnn
2018-02-20 08:59:07 +00:00
Li Peng
2863f950d6
ReLU6 layer ocl support
...
include relu6 ocl kernel and layer fusion support
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-20 15:11:09 +08:00
Alexander Alekhin
12d2bd4adb
ml: refactor ML_ANN test
2018-02-19 21:35:48 +03:00
Vitaly Tuzov
24ee7b5080
Fix for vertically flipped tiff files reading
2018-02-19 18:49:19 +03:00
mworchel
aab390c51d
Add mask support to SimpleBlobDetector
2018-02-19 17:54:27 +03:00
Dmitry Kurtaev
8b4871a28d
Use only absolute prior boxes explicit sizes. Remove scales attributes. ( #10874 )
...
* Use only absolute prior boxes explicit sizes. Remove scales attributes.
* Simplified PriorBox layer forward pass
2018-02-19 17:25:18 +03:00
Alexander Alekhin
cf31243c74
android: add build.grade into Android SDK
...
For using 'OpenCV for Android SDK' with Android Studio projects.
2018-02-19 17:19:26 +03:00
Vadim Pisarevsky
7da6e9086c
Merge pull request #10893 from alalek:fix_cpu_disable_flags
2018-02-19 14:11:11 +00:00
Vadim Pisarevsky
68043f4de9
Merge pull request #10896 from dkurt:tensorflow_tests_generator
2018-02-19 14:08:58 +00:00
Tomoaki Teshima
bcce25900b
read in gray scale mode when writing a gray scale video
2018-02-19 18:33:05 +09:00
Dmitry Kurtaev
34ba32ff27
Fix DNN flatten test
2018-02-18 12:45:43 +03:00
Alexander Alekhin
857007372d
Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf
2018-02-18 07:45:01 +00:00
Tomoaki Teshima
6a661e1e28
fix test error on VS2013
2018-02-18 09:29:38 +09:00
Alexander Alekhin
cc5a6f3b86
core: remove '-' from separators list of disabled CPU flags
...
To allow runtime disabling of AVX512-SKX via 'OPENCV_CPU_DISABLE' parameter
2018-02-18 00:03:04 +00:00
Alexander Alekhin
73a8369631
Merge pull request #10890 from Reputeless:patch-1
2018-02-17 12:02:48 +00:00
Florian Echtler
6a8f57e5d7
Merge pull request #10081 from floe:java-camera2-view
...
* add (untested) JavaCamera2View class
* initial fixes
* minor cleanup
* exclude JavaCamera2View from build for older SDK version
* fix method name typo
* add asserts + sanity checks
* fix preview format checks
* fix the memory leak
* export cvtTwoPlaneYUVtoBGR for Java usage
* add handling for two-plane YUV frames (C wrapper still missing)
* add two-plane cvtColor helper function
* fix warnings
* actually use the new cvtColorTwoPlane helper func
* fix wrong output matrix size
* fix wrong conversion type
* simplify method signature, add error condition
* minor fixes to Mat types
* remove leftover semaphore from camera api 1
* android: JavaCamera2View minor refactoring
- re-apply Java code style
- imports cleanup
- dump exceptions information
* android: JavaCamera2View: pause/resume fixes
* android: JavaCamera2View: fix mScale
2018-02-17 15:01:24 +03:00
Alexander Alekhin
eb94dfb442
Merge pull request #10885 from alalek:issue_10881
2018-02-17 11:58:51 +00:00
Patrik Huber
7be0c78533
Merge pull request #10589 from patrikhuber:patch-1
...
* Make <array> #ifdef true for MSVC
I think MSVC had `std::array` for quite a while (possibly going back as far as VS 2012, but it's definitely there in 2015 and 2017. So I think `_MSC_VER` `1900` is a safe bet. Probably `1800` and maybe even `1700` could work as well but I can't test that locally.
* fix test
2018-02-17 14:53:30 +03:00
Ryo Suzuki
97d9ea00fe
Fix typo in core/base.hpp
2018-02-17 19:35:25 +09:00
Alexander Alekhin
491502a349
core: fix parallel_for data race
2018-02-16 21:13:48 +03:00
Alexander Alekhin
0e4eed0ba1
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
2018-02-16 11:17:32 +00:00
Alexander Alekhin
c020a7bb67
build: portable integer types
2018-02-15 23:43:02 +03:00
Alexander Alekhin
e268fdc0ed
Merge pull request #10793 from denmatfoton:master
2018-02-15 15:52:52 +00:00
Alexander Nesterov
df8f61877e
Added avi-container with tests
2018-02-15 17:34:49 +03:00
Alexander Alekhin
f378f1d585
calib3d: add regression test for stereoCalibrate
2018-02-15 15:24:09 +03:00
Dmitry Kurtaev
f8d0d6365e
Add a flag to manage average pooling with padding
2018-02-14 16:56:31 +03:00
Alexander Alekhin
cff79609c8
Merge pull request #10854 from pengli:dnn
2018-02-14 12:49:53 +00:00
Vadim Pisarevsky
ef70b0baa4
Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo
2018-02-14 12:25:18 +00:00
Vadim Pisarevsky
b4ddf3d8c5
Merge pull request #10678 from terfendail:OutputArray_recreate
2018-02-14 11:36:51 +00:00
Vadim Pisarevsky
42b25d747b
Merge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt
2018-02-14 11:33:15 +00:00
Dmitry Kurtaev
a66b5e2c13
Add const getInputsInfo
2018-02-14 14:17:44 +03:00
Vadim Pisarevsky
8f0b72be9e
Merge pull request #10861 from nglee:dev_cudaDftAlgorithmTest
2018-02-14 10:50:05 +00:00
Vadim Pisarevsky
6dfd7e3da2
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests
2018-02-14 10:35:14 +00:00
Namgoo Lee
034dc3b0dd
Fix for CUDA_Arithm/Dft.Algorithm/0 test
2018-02-14 09:54:13 +09:00
Li Peng
80d1f2ddfa
re-enable tensor flow mobilenet ssd ocl test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 01:04:58 +08:00
luz.paz
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
Alexander Alekhin
252e871a8b
Merge pull request #10846 from luzpaz:misc-modules-typos-cont
2018-02-13 16:12:28 +00:00
Alexander Alekhin
59b91d6c31
Merge pull request #10821 from dkurt:dnn_layers_fusion
2018-02-13 16:08:48 +00:00
Li Peng
5992c46606
add fallback case for ocl convolution
...
The ocl convolution doesn't support tensorflow padMode well.
Add fallback check if we meet this situation, it could fix the
tensorflow MobileNet SSD failure.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 00:04:38 +08:00
Li Peng
00d2f34888
ocl fix for detection_output and prior_box layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-13 23:09:14 +08:00
Alexander Alekhin
a91a11e533
Merge pull request #10818 from mshabunin:install-samples-src
2018-02-13 14:37:38 +00:00
Alexander Alekhin
eb54e5c55c
core: generalize and fix x86 'cpuid' calls
2018-02-13 15:35:04 +03:00
Dmitry Kurtaev
514e6df460
Refactored deep learning layers fusion
2018-02-13 14:35:58 +03:00
Tomoaki Teshima
94253e8b83
fix build error on Visual Studio 2013 and earlier
2018-02-13 18:30:02 +09:00
Dmitry Kurtaev
a6baedd02c
Fix deconvolution layer. Add batch norm layer with mean-variance normalization from TensorFlow.
2018-02-13 11:00:27 +03:00
Maksim Shabunin
8393d755f6
Fixed OpenGL-specific compilation warning (unused function)
2018-02-12 18:42:36 +03:00
luz.paz
e805a55a5b
Misc. modules/ typos (cont.)
...
Found via `codespell`
2018-02-12 10:15:36 -05:00
Alexander Alekhin
17233c687e
Merge pull request #10797 from mshabunin:split-convert
2018-02-12 13:49:53 +00:00
Alexander Alekhin
57cbde3393
Merge pull request #10798 from mshabunin:split-stat
2018-02-12 13:49:41 +00:00
Alexander Alekhin
579781e35e
Merge pull request #10822 from alalek:ocl_fix_imgproc_amd
2018-02-12 13:48:06 +00:00
Alexander Alekhin
66f3c1ae79
Merge pull request #10843 from luzpaz:misc-modules-typos
2018-02-12 13:47:12 +00:00
Sui Libin
1ad814a191
fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). ( #10724 )
...
* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.
* find_odj onmouse bug about find matched point status.
* reverted AutoBuffer back to std::vector
2018-02-12 16:07:56 +03:00
Maksim Shabunin
221342fb25
Split convert.cpp into smaller pieces
2018-02-12 15:17:19 +03:00
luz.paz
5718d09e39
Misc. modules/ typos
...
Found via `codespell`
2018-02-12 07:09:43 -05:00
Rémi Ratajczak
b67523550f
dnn : Added an imagesFromBlob method to the dnn module ( #10607 )
...
* Added the imagesFromBlob method to the dnn module.
* Rewritten imagesFromBlob based on first dkurt comments
* Updated code with getPlane()
* Modify comment of imagesFromBlob() in dnn module
* modified comments, removed useless assertions & added OutputArrayOfArray
* replaced tabs with whitespaces & put vectorOfChannels instantiation outside the loop
* Changed pre-commit.sample to pre-commit in .git/hooks/
* Added a test for imagesFromBlob in test_misc.cpp (dnn)
* Changed nbOfImages, robustified test with cv::randu, modified assertion
2018-02-12 14:51:07 +03:00
Alexander Alekhin
5a791e6e06
cmake: update reporting of excluded dispatching files ( #10711 )
...
* cmake: add ocv_get_smart_file_name() macro
* cmake: avoid adding files for unavailable dispatch modes
2018-02-12 14:48:20 +03:00
Namgoo Lee
61e76e767d
Update BufferReader documentation with some example code ( #10803 )
...
* Update BufferReader documentation with some example code
* Add warning to BufferPool doc regarding deallocation of StackAllocator
* Added a sample code that satisfies LIFO rule for StackAllocator
2018-02-12 14:41:23 +03:00
Vadim Pisarevsky
51b5fdba25
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
2018-02-12 11:40:00 +00:00
yuki takehara
379ea15d16
Add new Mat constructor ( #10808 )
...
* Add new Mat constructor
* Fix build error
* Fix build error
* Fixed the code about 4 comments
* Fixed three comments
* delete previous local declaration
* fix build error
2018-02-12 14:36:54 +03:00
Maksim Shabunin
4437e0c3b9
Split stat.cpp into smaller pieces
2018-02-12 14:14:08 +03:00
Alexander Alekhin
fad3a6bf15
ocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL
2018-02-12 14:06:57 +03:00
Alexander Alekhin
ab0f0f26a1
Merge pull request #10839 from csukuangfj:fix-9486
2018-02-12 09:24:29 +00:00
Alexander Alekhin
b7ad95beaa
Merge pull request #10836 from csukuangfj:fix-10826
2018-02-12 09:23:55 +00:00
Alexander Alekhin
2c8da29f3a
Merge pull request #10835 from csukuangfj:fix-10827
2018-02-12 09:19:52 +00:00
Alexander Alekhin
efd3fafa25
Merge pull request #10834 from csukuangfj:fix-issue-9387
2018-02-12 09:19:25 +00:00
Alexander Alekhin
d61528b2d5
Merge pull request #10833 from csukuangfj:improve-viz3d
2018-02-12 09:12:39 +00:00
Fangjun Kuang
e8b2c5682e
fix issue #9387 and #9575 .
2018-02-11 21:04:20 +08:00
Fangjun Kuang
ce2a65db85
fix issue #9486 .
2018-02-11 20:08:53 +08:00
Fangjun Kuang
2f3d4df2f2
improve the doc for the viz module.
2018-02-11 16:14:09 +08:00
Fangjun Kuang
6205981235
Fix issue 10826.
2018-02-11 16:01:21 +08:00
Fangjun Kuang
28a78003f0
Fix issue 10827.
2018-02-11 15:54:36 +08:00
Alexander Alekhin
e2a99d24ec
Merge pull request #10813 from alalek:cmake_cxx_flags
2018-02-10 12:27:00 +00:00
Alexander Alekhin
601e3aaf98
Merge pull request #10820 from alalek:python_isystem
2018-02-09 15:32:50 +00:00
Alexander Alekhin
dd2fd39c05
Merge pull request #10819 from alalek:ocl_fix_dgpu_locks
2018-02-09 15:24:33 +00:00
Alexander Alekhin
84887d3011
cmake: use -isystem for Python/numpy include directories
2018-02-09 17:10:02 +03:00
Alexander Alekhin
9e298ea1bb
build: eliminate c++17 Python build warning
2018-02-09 17:09:36 +03:00
Alexander Alekhin
42e1fe301c
ocl: allow recursive UMatData lock() calls with the same objects
...
OpenCLAllocator::copy() may call upload()/download() methods
2018-02-09 14:19:10 +03:00
Dmitry Kurtaev
7fe97376c2
MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend
2018-02-09 13:45:45 +03:00
take1014
03407a9da0
Merge pull request #10646 from take1014:master
...
* Add a new interface for hough transform
* Fixed warning code
* Fix HoughLinesUsingSetOfPoints based on HoughLinesStandard
* Delete memset
* Rename HoughLinesUsingSetOfPoints and add common function
* Fix test error
* Change static function name
* Change using CV_Assert instead of if-block and add integer test case
* I solve the conflict and delete 'std :: tr1' and changed it to use 'tuple'
* I deleted std::tr1::get and changed int to use 'get'
* Fixed sample code
* revert test_main.cpp
* Delete sample code in comment and add snippets
* Change file name
* Delete static function
* Fixed build error
2018-02-08 22:54:43 +03:00
Vadim Pisarevsky
835acd3f31
Merge pull request #10799 from dkurt:dnn_inference_engine_face_detection
2018-02-07 13:42:08 +00:00
Alexander Alekhin
44d7435a48
build: eliminate calls of removed functionality from C++17
...
Most part is deprecated since C++11
2018-02-07 12:00:33 +03:00
Alexander Alekhin
f77f2876ff
Merge pull request #10800 from alalek:parallel_for_update
2018-02-06 17:56:33 +00:00
Alexander Alekhin
914f57f28d
core(parallel_for): fix data race
2018-02-06 18:19:50 +03:00
Dmitry Kurtaev
ed94136548
OpenCV face detection network using Inference Engine backend
2018-02-06 17:53:24 +03:00
Alexander Alekhin
c973aaabc5
Merge pull request #10787 from dkurt:dnn_tutorial_face_detection
2018-02-06 14:37:09 +00:00
Vitaly Tuzov
3267fb90c6
Updated check on OutputArray to allow recreation of fixed_size for 1-d sizes array
2018-02-06 17:07:36 +03:00
Alexander Alekhin
b10fedde56
core(parallel_for): cleanup
...
remove 'dont_wait' (can be replaced with has_wake_signal)
2018-02-06 16:10:41 +03:00
Dmitry Kurtaev
8817907647
Test for FP16 version of OpenCV face detection network
2018-02-06 13:16:07 +03:00
Alexander Alekhin
398ebbac98
Merge pull request #10795 from pengli:dnn
2018-02-06 10:04:29 +00:00
Li Peng
c43498c6ad
check vector emptiness before access it
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-06 22:59:51 +08:00
Li Peng
389fa5d38e
slice layer ocl update
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-06 22:59:47 +08:00
Alexander Alekhin
2a1f46c42d
Merge pull request #9770 from alalek:refactor_test_files
2018-02-06 09:33:58 +00:00
Maksim Shabunin
e225850cc6
Split persistence.cpp into smaller pieces ( #10788 )
...
* Extracted base64 persistence functionality
* Extracted YML persistence functionality
* Extracted JSON persistence functionality
* Extracted XML persistence functionality
* Extracted public C and C++ interfaces implementation in persistence
* Persistence: cleanup and fixes
* fixup! Persistence: cleanup and fixes
2018-02-06 11:59:32 +03:00
Dmitry Kurtaev
10e1de74d2
Intel Inference Engine deep learning backend ( #10608 )
...
* Intel Inference Engine deep learning backend.
* OpenFace network using Inference Engine backend
2018-02-06 11:57:35 +03:00
Vadim Pisarevsky
292dfc2d72
Merge pull request #10789 from mshabunin:split-matrix
2018-02-06 08:54:16 +00:00
denmatfoton
b085158d59
Fix unstable work of stereoRectify function. Issue description: https://github.com/opencv/opencv/issues/10791
2018-02-05 15:30:26 -05:00
Maksim Shabunin
904640c9ae
Split matrix.cpp into smaller pieces
2018-02-05 19:16:33 +03:00
Alexander Alekhin
06455fc0cd
Merge pull request #10764 from sturkmen72:update_cmake
2018-02-05 14:07:40 +00:00
Suleyman TURKMEN
3b191bf2dd
update CMakeList.txt
2018-02-05 16:23:52 +03:00
csukuangfj
f1c91a8d34
Fix issue #10781
...
Fix issue #10781 .
2018-02-05 11:26:25 +08:00
Alexander Alekhin
0d01b97b75
cuda: don't use std::numeric_limits
...
CUDA code uses own implementation in cuda/limits.hpp
2018-02-03 19:43:05 +00:00
Alexander Alekhin
7fedfa0380
cudev(test): avoid namespace check
2018-02-03 19:39:47 +00:00
Alexander Alekhin
4a297a2443
ts: refactor OpenCV tests
...
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
2018-02-03 19:39:47 +00:00
Alexander Alekhin
f1e50ecab3
ts: fix missing std::tr1 (C++17)
2018-02-02 20:02:45 +00:00
Alexander Alekhin
a0ce12f8ba
Merge pull request #10767 from alalek:fix_cmake
2018-02-02 19:26:49 +00:00
Alexander Alekhin
3d6659112f
cmake: fix includes processing
2018-02-02 21:52:54 +03:00
Rostislav Vasilikhin
1055f9d208
Merge pull request #10757 from savuor:test_hist_renew
...
* old types removed
* QueryHist tests: new types
* ThreshHist tests: new types
* CalcHist tests: new types
* CalcBackProject tests: new types
* CalcBackProjectPatch tests: new types
* const ref added
2018-02-02 21:35:44 +03:00
Alexander Alekhin
877b175565
Merge pull request #10758 from mshabunin:allow-many-contrib
2018-02-02 16:07:48 +00:00
Alexander Alekhin
82f889d9b8
Merge pull request #10765 from BelBES:sb/findContours_fix
2018-02-02 16:03:15 +00:00
Harshal Nishar
384fa95680
Fix in Canny when Sobel apertureSize is 7 ( #10743 )
...
* Fixing a bug in Canny implemetation when Sobel aperture size is 7.
* Fixing the bug in Canny accross variants and in test_canny.cpp
* Replacing a tab with white space
2018-02-02 17:00:11 +03:00
sergeybe
2266a8c85f
fix FindContours default offset for CV_LINK_RUNS method
2018-02-02 16:46:05 +03:00
Vadim Pisarevsky
83761d5f8e
Merge pull request #10761 from seiko2plus:issue10753
2018-02-02 11:27:26 +00:00
Alexander Alekhin
ecbd5b0574
Merge pull request #10751 from nglee:dev
2018-02-02 10:48:50 +00:00
Ya-Chiu Wu
c8d8b1fbcd
Merge pull request #10553 from GlueCrow:bgfg_knn_opencl
...
Add ocl version BackgroundSubtractorKNN (#10553 )
* Add ocl version bgfg_knn
* Add ocl KNN perf test
* ocl KNN: Avoid unnecessary initializing when non-UMat parameters are used
* video: turn off OpenCL for color KNN on Intel devices
due performance degradation
* video: turn off KNN OpenCL on Apple devices with Intel iGPU
due process freeze during clBuildProgram() call
2018-02-02 13:20:46 +03:00
Alexander Alekhin
02bc17be6f
js: filterout OpenCL headers
2018-02-02 12:26:22 +03:00
Sayed Adel
534dcbe017
core:ppc Fix compile issue with Eigen
2018-02-02 03:31:25 +00:00
Alexander Alekhin
12cd3b55ec
Merge pull request #10756 from terfendail:orb_firstlevel
2018-02-01 18:34:57 +00:00
Alexander Alekhin
bbfa239036
Merge pull request #10706 from alalek:exception_opencv_version
2018-02-01 18:32:13 +00:00
Alexander Alekhin
c96630c9f0
Merge pull request #10705 from alalek:opencv_version_update
2018-02-01 18:31:52 +00:00
Maksim Shabunin
82aff110b7
cmake: allow providing list of extra modules paths
2018-02-01 19:02:02 +03:00
Vitaly Tuzov
26321795f7
Fixed assertion in ORB::setFirstLevel()
2018-02-01 16:58:35 +03:00
Vadim Pisarevsky
f780ee12a0
Merge pull request #10690 from terfendail:orb_firstlevel
2018-02-01 13:41:29 +00:00
Maksim Shabunin
e56d6054aa
Do not build protobuf without dnn ( #10689 )
...
* Do not build protobuf if dnn is disabled
* Added BUILD_LIST cmake option to the cache
* Moved protobuf to the top level
* Fixed static build
* Fixed world build
* fixup! Fixed world build
2018-02-01 16:30:23 +03:00
Vadim Pisarevsky
36222c9eed
Merge pull request #10730 from dkurt:dnn_faster_rcnn_rfcn_tests
2018-02-01 13:28:10 +00:00
Vadim Pisarevsky
8436dac090
Merge pull request #10742 from alalek:fix_winrt_fs_build
2018-02-01 13:23:49 +00:00
Vadim Pisarevsky
713ec7be45
Merge pull request #10746 from dkurt:dnn_batch_norm_from_nvidia_caffe
2018-02-01 13:22:09 +00:00
Alexander Alekhin
42569cfd61
Merge pull request #10748 from dkurt:fix_dnn_slice_layer
2018-02-01 13:21:17 +00:00
Alexander Alekhin
9d25bd583f
Merge pull request #10754 from dkurt:dnn_ocl_gemv_min_globalsize
2018-02-01 12:39:27 +00:00
Aditya Rohan
ccea0a831a
Merge pull request #10732 from Riyuzakii:10598
...
* Introduces error throw for line drawn with THICKNESS=0
2018-02-01 15:21:00 +03:00
Dmitry Kurtaev
65a6674c6e
ocl4dnnGEMV in case of row_size < 4
2018-02-01 14:06:47 +03:00
Alexander Alekhin
9698b93d10
Merge pull request #10717 from pengli:dnn
2018-02-01 10:49:54 +00:00
Li Peng
6aec71d7ee
mvn layer ocl update
...
it fuse ocl kernels to reduce kernel enqueue
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:48:12 +08:00
Li Peng
83b16ab7b7
fix extra spaces in build option
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:46:11 +08:00
Li Peng
54c81cbde4
eltwise layer SUM op update
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:46:06 +08:00
Namgoo Lee
3cf535926a
cuda_stream: do not allocate GPU memory by default ( fixes #8725 )
2018-02-01 03:55:52 +09:00
Dmitry Kurtaev
184862582c
Fix slice layer from TensorFlow
2018-01-31 19:12:37 +03:00
Arjan van de Ven
a75840d19c
Merge pull request #10468 from fenrus75:avx512-2
...
* Add a 512 bit codepath to the AVX512 fastConv function
this patch adds a 512 wide codepath to the fastConv() function for
AVX512 use.
The basic idea is to process the first N * 16 elements of the vector
with avx512, and then run the rest of the vector using the traditional
AVX2 codepath.
* dnn: use unaligned AVX512 load (OpenCV aligns data on 32-byte boundary)
* dnn: change "vecsize" condition for AVX512
* dnn: fix indentation
2018-01-31 16:34:12 +03:00
Alexander Alekhin
f06c44f1f1
Merge pull request #10701 from dkurt:tf_ave_pooling
2018-01-31 13:28:09 +00:00
Dmitry Kurtaev
844f1d0281
Fix Batch Normalization layer imported from NVIDIA Caffe.
2018-01-31 16:25:45 +03:00
Dmitry Kurtaev
a2e9bfbaf4
Fix padding for average pooling from TensorFlow
2018-01-31 15:54:30 +03:00
Alexander Alekhin
2e45095e8d
winrt: fix build
2018-01-31 15:00:45 +03:00
Alexander Alekhin
027da35c33
Merge pull request #10738 from tomoaki0705:fixBuildVisualStudio
2018-01-31 09:57:29 +00:00
Tomoaki Teshima
5f4b48da34
fix build error on Visual Studio 2013 and earlier
2018-01-31 18:22:09 +09:00
Sayed Adel
4e1d396ce1
core:ppc Add yield support
2018-01-31 04:03:35 +00:00
Alexander Alekhin
f57630d92b
Merge pull request #10691 from alalek:parallel_for_2018
2018-01-30 14:13:29 +00:00
Dmitry Kurtaev
ae2e4af4a1
Faster-RCNN and RFCN tests
...
https://github.com/rbgirshick/py-faster-rcnn
https://github.com/YuwenXiong/py-R-FCN
2018-01-30 13:17:35 +03:00
Vadim Pisarevsky
cb66f82c1d
Merge pull request #10707 from alalek:update_reports
2018-01-30 09:22:46 +00:00
Vadim Pisarevsky
1389fd67ab
Merge pull request #10721 from alalek:ocl_force_clBuildProgram
2018-01-30 09:20:58 +00:00
Li Peng
7a4c5e9421
slice layer ocl support
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-29 22:34:32 +08:00
Alexander Alekhin
ebdb0eb0c1
ocl: force clBuildProgram() call after clCreateProgramWithBinary()
2018-01-29 15:51:07 +03:00
Ali Sentas
4d80419f29
Fix cv::CommandLineParser::check() documentation
2018-01-29 15:14:21 +03:00
Alexander Alekhin
2876670de3
dnn(ocl): fix build options for Apple OpenCL
2018-01-28 01:54:25 +00:00
Alexander Alekhin
c8930cc279
opencv_version: dump detected HW features
2018-01-27 17:08:29 +00:00
Alexander Alekhin
01f4a173ab
opencv_version: dump OpenCL information via opencv_version
...
fix missing "opencv2/core/opencl" headers from core module (updated install list)
2018-01-27 17:08:28 +00:00
Alexander Alekhin
daf3368d2e
perf reports: remove units from table cells
...
- moved to table title
- can be restored via '--show_units' option
- fix microseconds: mks -> us
2018-01-27 14:38:40 +00:00
Alexander Alekhin
f6fd3abd31
core: add OpenCV version information into Exception messages
2018-01-27 13:51:16 +00:00
Woody Chow
f1c52e426b
Merge pull request #10697 from woodychow:tbb_task_arena
...
* Use Intel TBB's task arena if possible
2018-01-27 08:46:54 +03:00
Pavel Rojtberg
203dc3bb48
Merge pull request #10667 from paroj:stereo_calib_ex
...
calib3d: add stereoCalibrateExtended (#10667 )
* cvCalibrateCamera2Internal: simplify per view error computation
* calib3d: add stereoCalibrateExtended
- allow CALIB_USE_EXTRINSIC_GUESS
- returns per view errors
* calib3d: add stereoCalibrateExtended test
2018-01-26 22:05:13 +03:00
Alexander Alekhin
7b8ab4e5c6
Merge pull request #10688 from LaurentBerger:calcback
2018-01-26 19:01:48 +00:00
Alexander Alekhin
fe4fbc2c3b
Merge pull request #10693 from travbid:IntrinsicParams_fix
2018-01-26 16:22:38 +00:00
LaurentBerger
2ebf4e084a
solve issue #10687
2018-01-26 17:01:02 +01:00
Alexander Alekhin
df22bafe6d
Merge pull request #10681 from hmaarrfk:python_stitching_scans
2018-01-26 10:04:41 +00:00
Alexander Alekhin
c49d5d5252
core: fix pthreads performance
...
OpenCV pthreads-based implementation changes:
- rework worker threads pool, allow to execute job by the main thread too
- rework synchronization scheme (wait for job completion, threads 'pong' answer is not required)
- allow "active wait" (spin) by worker threads and by the main thread
- use _mm_pause() during active wait (support for Hyper-Threading technology)
- use sched_yield() to avoid preemption of still working other workers
- don't use getTickCount()
- optional builtin thread pool profiler (disabled by compilation flag)
2018-01-26 04:09:11 +00:00
Alexander Alekhin
104502c5be
Merge pull request #10676 from dkurt:dnn_for_newer_mobilenet_ssd
2018-01-26 04:02:21 +00:00
Travers
7d6cf66303
IntrinsicParams operator+ fix
2018-01-26 14:04:45 +13:00
Maksim Shabunin
d1b08486ae
Merge pull request #10619 from mshabunin:fix-run-py-without-java
2018-01-25 13:47:47 +00:00
Vitaly Tuzov
205022ceee
Fixed issue in ORB detection if firstLevel property is set above 0
2018-01-25 16:14:16 +03:00
Alexander Alekhin
47998c03f8
perf: update message
2018-01-25 13:18:47 +03:00
Alexander Alekhin
27cddfb8e9
Merge pull request #10661 from alalek:parallel_kmeans
2018-01-25 10:18:37 +00:00
Alexander Alekhin
8c2563be41
Merge pull request #10672 from pengli:dnn
2018-01-25 07:18:25 +00:00
Li Peng
2493083935
mvn, batch_norm and relu layer fusion
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-25 18:57:05 +08:00
Li Peng
e15928b49e
convolution and tanh layer fusion
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-25 17:45:33 +08:00
Mark Harfouche
df434298b8
Exported a high level stitcher the DLL
...
allows Stitcher to be used for scans from within python.
I had to use very strange notation because I couldn't export the `enum`
`Mode` making the Cpython generated code unable to compile.
```c++
class Stitcher {
public:
enum Mode
{
PANORAMA = 0,
SCANS = 1,
};
...
```
Also removed duplicate code from the `createStitcher` function making
use of the `Stitcher::create` function
2018-01-24 12:43:00 -08:00
Alexander Alekhin
81c5fae56f
core(lapack): fix build issues related to 'extern "C"'
2018-01-24 14:53:04 +03:00
Dmitry Kurtaev
9e9926a2f0
PriorBox layer with explicit normalized sizes
2018-01-24 14:01:42 +03:00
Elena Gvozdeva
b97b650ab3
add HAL for FAST ( #10362 )
...
* add HAL for FAST
* add new interface
2018-01-24 01:48:06 +03:00
Vadim Pisarevsky
a1d2258ac3
Merge pull request #10635 from csukuangfj:doc-checkVector
2018-01-23 10:42:05 +00:00
Vadim Pisarevsky
8f04c8b16c
Merge pull request #10644 from csukuangfj:doc-fundamental-matrix
2018-01-23 10:38:14 +00:00
Pavel Rojtberg
2d674fc151
persistence: replace arbitrary limit of cn to 4 by CV_CN_MAX ( #10636 )
...
* persistence: replace arbitrary limit of cn to 4 by CV_CN_MAX
* python: added persistence test, remove temp files
* fixup! python: added persistence test, remove temp files
* fixup! python: added persistence test, remove temp files
2018-01-23 13:36:30 +03:00
Alexander Alekhin
479179638e
Merge pull request #10655 from dkurt:dnn_tests
2018-01-23 10:16:55 +00:00
Dmitry Kurtaev
a3d74704e5
OpenCV face detection network test
2018-01-23 09:27:58 +03:00
Alexander Alekhin
90aac764dd
core: kmeans refactoring
...
- reduce scope of i,k,j variables
- use cv::AutoBuffer
- template<bool onlyDistance> class KMeansDistanceComputer
- eliminate manual unrolling: CV_ENABLE_UNROLLED
2018-01-22 14:26:41 +03:00
Alexander Alekhin
46470d92a0
core: fix kmeans multi-threaded performance
2018-01-22 14:26:41 +03:00
Alexander Alekhin
a5cd62f7bf
core(perf): refactor kmeans test
...
- don't use RNG for "task size" parameters (N, K, dims)
- add "good" kmeans test data (without singularities: K > unique points)
2018-01-22 14:25:29 +03:00
Vitaly Tuzov
12ea8477a3
bitexact gaussianblur implementation ( #10345 )
...
* Bit-exact implementation of GaussianBlur smoothing
* Added universal intrinsics based implementation for bit-exact CV_8U GaussianBlur smoothing.
* Added parallel_for to evaluation of bit-exact GaussianBlur
* Added custom implementations for 3x3 and 5x5 bit-exact GaussianBlur
2018-01-22 13:26:32 +03:00
Glue Crow
c5c620bab0
ocl: Avoid unnecessary initializing when non-UMat parameters are used
2018-01-21 23:02:05 +08:00
Gregory Morse
d84c7e5143
Merge pull request #10649 from GregoryMorse:patch-3
...
* Fix for QT image window rectangle
* Update window_QT.h
* Update window_QT.cpp
* trailing whitespace
* highgui: fix QT getWindowImageRect()
2018-01-21 09:26:48 +03:00
Maksim Shabunin
8ba88892d7
run.py: simplified scripts, fixed most of PEP8 warnings
2018-01-19 17:05:40 +03:00
Fangjun Kuang
eb2901bd69
Improve the doc for fundamental matrix.
2018-01-19 13:41:47 +01:00
Vadim Pisarevsky
c89ae6e537
Merge pull request #10629 from GlueCrow:ocl_mog2_test_fix
2018-01-19 11:12:19 +00:00
Namgoo Lee
25c36fb05f
cv::cuda::cvtColor bug fix ( #10640 )
...
* cuda::cvtColor bug fix
Fixed bug in conversion formula between RGB space and LUV space.
Testing with opencv_test_cudaimgproc.exe, this commit reduces the number
of failed tests from 191 to 95. (96 more tests pass)
* Rename variables
2018-01-19 14:06:05 +03:00
Vadim Pisarevsky
71ba54b2f4
Merge pull request #10637 from catree:fix_perf_build_cuda_9
2018-01-19 11:02:14 +00:00
Alexander Alekhin
18ce529256
Merge pull request #10633 from csukuangfj:doc-estimateAffine
2018-01-19 10:11:56 +00:00
Alexander Alekhin
26e0f408f0
Merge pull request #10639 from pengli:dnn
2018-01-19 10:01:41 +00:00
Li Peng
fe494297e4
more update on MVN layer ocl implementation
...
cut one ocl kernel if normVariance is disabled,
also use native_powr for performance reason.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-19 22:54:04 +08:00
Alexander Alekhin
c3569211d5
Merge pull request #10591 from drkoller:master
2018-01-19 09:44:21 +00:00
catree
dcc5a2cb22
Fix perf build with CUDA 9.
2018-01-19 00:23:02 +01:00
Fangjun Kuang
67842df9e2
Improve the documentation for affine transform estimation.
2018-01-18 19:54:18 +01:00
Alexander Alekhin
8226bd25c4
Merge pull request #10625 from pengli:dnn
2018-01-18 18:26:30 +00:00
Fangjun Kuang
8efe7bafaa
Improve the doc for cv::Mat::checkVector.
2018-01-18 16:48:59 +01:00
Li Peng
2124361ff7
ocl support for Deconvolution layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-18 23:40:22 +08:00
Alexander Alekhin
0def2dbb73
Merge pull request #10605 from alalek:ocl_fix_deadlock
2018-01-18 13:39:36 +00:00
Maksim Shabunin
1b0ff57562
Merge pull request #10621 from mshabunin:disable-docs
...
Documentation generation refactoring (#10621 )
* Documentation build updates:
- disable documentation by default, do not add to ALL target
- combine Doxygen and Javadoc
- optimize Doxygen html
* javadoc: fix path in build directory
* cmake: fix "Documentation" status line
2018-01-18 16:37:19 +03:00
Glue Crow
95ce21d407
Fix #10525
2018-01-18 18:49:29 +08:00
Gregory Morse
ec353dbdda
Merge pull request #10412 from GregoryMorse:patch-2
...
Update to add window position and size retrieval to HighGUI (#10412 )
* Update highgui.hpp
Add read only property retrieval for enhanced rendering capabilities and more sophisticated research tools
* Update window.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_QT.h
* Update window_gtk.cpp
* Update precomp.hpp
* Update highgui_c.h
* Update highgui_c.h
* Update window_w32.cpp
* Update precomp.hpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_gtk.cpp
* Update window_gtk.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_carbon.cpp
* Update window_cocoa.mm
* Update precomp.hpp
* Update window_cocoa.mm
* Update window_w32.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_cocoa.mm
* Update window_carbon.cpp
* Update window_w32.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_cocoa.mm
* Update window.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update highgui_c.h
* Update highgui.hpp
* Update window.cpp
* Update highgui_c.h
* Update test_gui.cpp
* Update highgui.hpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
2018-01-18 07:49:47 +03:00
Alexander Alekhin
f056e713c3
Merge pull request #10512 from sturkmen72:update_documentation
2018-01-18 04:44:59 +00:00
David Koller
d1a3b530be
Make DNN Crop layer match Caffe default offset behavior
...
and add parametric unit test for crop layer.
2018-01-17 10:52:36 -05:00
Alexander Alekhin
b067e0ca5d
Merge pull request #10613 from csukuangfj:fix-10612
2018-01-17 09:58:34 +00:00
Alexander Alekhin
4a086cf517
Merge pull request #10609 from csukuangfj:patch-1
2018-01-17 09:02:50 +00:00
razerhell
fb22028be3
Merge pull request #10574 from razerhell:patch-1
...
* Newton's method can be more efficient
when we get the result of function distortPoint with a point (0, 0) and then undistortPoint with the result, we get the point not (0, 0). and then we discovered that the old method is not convergence sometimes. finally we have gotten the right values by Newton's method.
* modify by advice Newton's method...#10574
* calib3d(fisheye): fix codestyle, update theta before exit EPS check
2018-01-17 12:05:13 +03:00
Alexander Alekhin
6728b40ad3
Merge pull request #10602 from pengli:dnn
2018-01-17 08:58:25 +00:00
Li Peng
e77af4ae33
MVN layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-17 17:11:32 +08:00
Li Peng
7bc017601f
Power, Tanh and Channels ReLU layer ocl support
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-17 17:11:27 +08:00
csukuangfj
decf6cab5e
Improve the documentation for cv::completeSymm and cv::RANSACUpdateNumIters.
2018-01-17 08:05:39 +01:00
Fangjun Kuang
2b635edce6
fix issue #10612 .
2018-01-16 23:47:15 +01:00
Alexander Alekhin
4dc788ff84
Merge pull request #10606 from alalek:update_copyright_2018
2018-01-16 17:47:30 +00:00
Alexander Alekhin
cec700525c
core(ocl): fix deadlock in UMatDataAutoLock
...
UMatData locks are not mapped on real locks (they are mapped to some "pre-initialized" pool).
Concurrent execution of these statements may lead to deadlock:
- a.copyTo(b) from thread 1
- c.copyTo(d) from thread 2
where:
- 'a' and 'd' are mapped to single lock "A".
- 'b' and 'c' are mapped to single lock "B".
Workaround is to process locks with strict order.
2018-01-16 17:33:06 +03:00
Woody Chow
20b3261204
Propagate calculated Gaussian kernel size(ref). Otherwise, ipp_GaussianBlur will fail if user doesn't specify a kernel size. ( #10579 )
2018-01-16 17:15:23 +03:00
Maksim Shabunin
8b87c4b96a
Fixed several warnings produced by clang 6 and static analyzers
2018-01-16 15:26:28 +03:00
Alexander Alekhin
cbb21f3cf2
Merge pull request #10595 from oqtvs:updateProtobuf
2018-01-16 12:18:18 +00:00
Li Peng
4189214d04
batch_norm layer ocl update
...
use a batch_norm ocl kernel to do the work
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-16 19:01:58 +08:00
Alexander Alekhin
e6ed853905
copyright: 2018
2018-01-16 13:55:42 +03:00
Vadim Pisarevsky
59915a3fc9
Merge pull request #10575 from ioxp:getFontScale
2018-01-16 10:51:04 +00:00
Alexander Alekhin
4d84999452
dnn: protobuf build warnings
2018-01-15 21:15:23 +00:00
oqtvs
6d4b778303
dnn: Updated protobuf files (3.5.1)
2018-01-15 15:51:38 +00:00
Alexander Alekhin
be1207e5e4
Merge pull request #10580 from woodychow:parallel_initUndistortRectifyMap
2018-01-15 15:05:32 +00:00
Alexander Alekhin
1255bd8d4b
Merge pull request #10585 from dkurt:dnn_weightless_scale
2018-01-15 06:07:50 +00:00
woody.chow
f5d9a2a9c1
Parallelize initUndistortRectifyMap
2018-01-15 09:20:35 +09:00
Dmitry Kurtaev
6a395d88ff
dnn::blobFromImage with OutputArray
2018-01-13 18:20:24 +03:00
Dmitry Kurtaev
1f4fdfd599
Untrainable version of Scale layer from Caffe
2018-01-13 10:35:29 +03:00
Alexander Alekhin
839cffdefe
java: fix MacOS Java problem
2018-01-13 02:12:39 +00:00
Alexander Alekhin
a362fd80df
java: fix bindings generator
...
- fix imports override.
Problem is observed with BoostDesc.
- add Ptr<> handling (constructor is protected from other packages).
Observed in ximgproc:
Ptr<StereoMatcher> createRightMatcher(Ptr<StereoMatcher> matcher_left)"
where, "StereoMather" is from another package (calib3d)
2018-01-13 02:12:39 +00:00
Alexander Alekhin
1237faef80
java: disable highgui wrapped code
2018-01-13 02:12:39 +00:00
Alexander Alekhin
a0d9d6db5b
fixes for old CMake (2.8.12.2)
2018-01-13 02:12:39 +00:00
Alexander Alekhin
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00:00
Suleyman TURKMEN
dcd4f8f5db
Update documentation
2018-01-12 22:21:14 +03:00
Alexander Alekhin
0cad2d2a83
java: files rename
...
intermediate commit (to simplify code review)
2018-01-12 19:14:00 +00:00
Alexander Alekhin
73316e10a0
java(test): fix test names
2018-01-12 19:14:00 +00:00
Maksim Shabunin
594a93316c
Fixed concurrent OpenCL cache folder name generation
2018-01-12 19:03:16 +03:00
SarenT
c6d9ce8fd3
Merge pull request #10489 from SarenT:offset-mat_put
...
Adding capability to parse subsections of a byte array in Java bindings (#10489 )
* Adding capability to parse subsections of a byte array in Java bindings. (Because Java lacks pointers. Therefore, reading images within a subsection of a byte array is impossible by Java's nature and limitations. Because of this, many IO functions in Java require additional parameters offset and length to define, which section of an array to be read.)
* Corrected according to the review. Previous interfaces were restored, instead internal interfaces were modified to provide subsampling of java byte arrays.
* Adding tests and test related files.
* Adding missing files for the test.
* Simplified the test
* Check was corrected according to discussion. An OutOfRangeException will be thrown instead of returning.
* java: update MatOfByte implementation checks / tests
2018-01-12 18:00:58 +03:00
Stanislaw Halik
c8794c89c7
modules/videoio: fix PS3Eye camera property window
...
v2: fix stray trailing whitespace
v3: only allow for up to one property window at the time
Opening multiple windows in the same process will just confuse
the camera filter or outright crash.
Suggested-by: @alalek
Also return whether a dialog was opened at the time.
2018-01-11 16:37:02 +01:00
Alexander Alekhin
18edd917e3
Merge pull request #10391 from ElenaGvozdeva:HAL_minMaxIdx
2018-01-11 14:15:40 +00:00
Philipp Hasper
6032d86e23
Added getFontScaleFromHeight()
2018-01-11 14:00:27 +01:00
Dmitry Kurtaev
64a9e92390
Merge pull request #10466 from dkurt:reduce_umat_try_2
...
* UMat blobs are wrapped
* Replace getUMat and getMat at OpenCLBackendWrapper
2018-01-10 21:50:54 +03:00
Alexander Alekhin
b6075e11b8
Merge pull request #10549 from Sahloul:bug_fix/FLANN
2018-01-10 11:39:47 +00:00
Alexander Alekhin
c19764e557
Merge pull request #10568 from alalek:fix_10565
2018-01-10 11:35:25 +00:00
Alexander Alekhin
f943261847
Merge pull request #10566 from alalek:jasper_checks
2018-01-10 10:15:41 +00:00
Alexander Alekhin
7763b58a60
Merge pull request #10563 from alalek:issue_10540
2018-01-10 10:15:10 +00:00
Alexander Alekhin
6113dc1b99
core: fix unresolved symbols from utils::fs
2018-01-09 19:29:50 +00:00
Alexander Alekhin
4d4f291553
Merge pull request #10513 from pengli:dnn
2018-01-09 19:24:28 +00:00
Alexander Alekhin
435a3e337b
imgcodecs: add more Jasper checks for supported and tested cases
2018-01-09 19:06:03 +03:00
Alexander Alekhin
f92e880d3d
Merge pull request #10544 from alalek:issue_10535
2018-01-09 15:32:42 +00:00
Alexander Alekhin
8a76fadaa3
imgcodecs: add overflow checks
2018-01-09 18:05:24 +03:00
Alexander Alekhin
be5247921d
imgcodecs: remove assert() usage
2018-01-09 17:49:38 +03:00
Li Peng
e3b42bf93b
batch_norm and blank layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-09 21:58:46 +08:00
tobycollins
f34a0a874a
Merge pull request #10522 from tobycollins:issue10519
2018-01-09 15:54:36 +03:00
Alexander Alekhin
f3dde79ed6
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
2018-01-08 19:24:39 +00:00
Alexander Alekhin
da0904df2d
Merge pull request #10550 from dkurt:replace_psroi_pooling_tag
2018-01-08 19:19:00 +00:00
Dmitry Kurtaev
27b55ea761
Replace Caffe's psroi_pooling_param tag from 10001 to 10002
2018-01-08 13:29:20 +03:00
Hamdi Sahloul
8943441115
resolves #10548 - FLANN::knnSearch garbage bug (when kNN is larger than the dataset size)
2018-01-08 18:58:55 +09:00
Alexander Alekhin
6674a024fc
dnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option
...
replaces REUSE_DNN_MEMORY compile-time option
2018-01-07 18:38:14 +00:00
Moshe
84596bff09
Bitwise "and false"
...
Bitwise "and false" is always false.
2018-01-07 10:12:53 +02:00
Alexander Alekhin
e3a6d74945
Merge pull request #10536 from Sahloul:bug_fix/BLOB
2018-01-07 06:50:49 +00:00
Alexander Alekhin
3a5cd12dee
Merge pull request #10527 from csukuangfj:local
2018-01-07 06:46:45 +00:00
Hamdi Sahloul
2d2499f610
BLOB - Support RGBA
2018-01-07 14:30:40 +09:00
Alexander Alekhin
d0b2e60edc
Merge pull request #10514 from alalek:build_warnings
2018-01-05 20:54:01 +00:00
Alexander Alekhin
8e1f31f543
Merge pull request #10521 from DabatoIsCool:master
2018-01-05 23:56:07 +03:00
Fangjun Kuang
a2869109f0
Improve the documentation for cv::Affine3.
2018-01-05 19:35:38 +01:00
Arthur Williams
8a67858068
Fixed missing #include "../precomp.hpp"
2018-01-05 15:10:39 +00:00
Alexander Alekhin
f5862dacb6
Merge pull request #10432 from GlueCrow:bgfg_knn_fix
2018-01-05 14:16:17 +00:00
Li Peng
67f9406cbe
add normalize_bbox layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-05 19:38:36 +08:00
Li Peng
f99a135eda
add eltwise layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-05 19:38:30 +08:00
Alexander Alekhin
e1ec45c948
Merge pull request #10517 from alalek:perf_video_bgfg
2018-01-05 10:27:24 +00:00
Alexander Alekhin
8acd05f12a
Merge pull request #10421 from cezheng:patch-1
2018-01-05 09:24:33 +00:00
Alexander Alekhin
be01ea734d
video(perf): add Mog2/KNN tests, fixed bug in prepareData()
...
prepareData() bug feeds the same image (the latest)
OCL perf test doesn't pass accuracy(!) check now, so this check is disabled.
2018-01-05 08:50:38 +00:00
Alexander Alekhin
59c6661db0
cmake: eliminate ninja generator warning (CMake 3.10), refactor code
2018-01-05 04:42:24 +00:00
Alexander Alekhin
f0453bd853
build: eliminate warning
...
warning: 'layout.channel_layout::gchan' may be used uninitialized in this function [-Wmaybe-uninitialized]
2018-01-05 04:33:30 +00:00
Alexander Alekhin
116c8d0ddf
build: eliminate warnings
...
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-01-05 04:30:08 +00:00
Coralie RACHEX
16821b877c
Merge pull request #10493 from RachexCoralie:tiff32FC1Codec
...
* Load and save tiff images in CV_32FC1 format (1 channel of floats).
* Add test
* Fix error handling and resources leak. Improve test.
2018-01-04 15:51:58 +03:00
Alexander Alekhin
f46eff4eb0
Merge pull request #10492 from pengli:dnn
2018-01-04 04:40:02 +00:00
Li Peng
34bfd7ef51
add ocl implementation of proposal layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-04 18:40:51 +08:00
Alexander Alekhin
ea5a3e557f
python: filter modules headers (from <module>/include directory)
2018-01-01 15:56:14 +00:00
Alexander Alekhin
4ca89db22d
imgproc(hdr): fix bounds check in HdrDecoder::checkSignature()
2018-01-01 13:12:21 +00:00
victor-ludorum
ad23c10600
Updating rotcalipers.cpp to resolve issue #10096
...
Updating the documentation of the rotcalipers.cpp to resolve issue #10096
2017-12-30 10:21:46 +05:30
Alexander Alekhin
7d67d60fb1
cmake(opt): AVX512_SKX
2017-12-29 07:18:11 +00:00
Alexander Alekhin
fc1d85bf59
Merge pull request #10329 from jasjuang:master
2017-12-28 16:45:16 +00:00
Alexander Alekhin
125f9f0be1
Merge pull request #10410 from GlueCrow:master
2017-12-28 16:43:17 +00:00
Alexander Alekhin
8e7af7f089
Merge pull request #10456 from dkurt:dnn_allocate_mem_for_optimized_concat
2017-12-28 16:04:51 +00:00
Alexander Alekhin
a65b5df5da
Merge pull request #10416 from fenrus75:avx512
2017-12-28 15:56:56 +00:00
Alexander Alekhin
2b3c140f04
Merge pull request #10436 from alalek:test_threads
2017-12-28 18:29:30 +03:00
Alexander Alekhin
ec32022bdf
Merge pull request #10444 from alalek:fix_asan_imgcodecs
2017-12-28 18:28:29 +03:00
Alexander Alekhin
898ca38257
cmake: AVX512 -> AVX_512F
2017-12-28 15:20:27 +00:00
Vinay Sharma
5aac909046
Merge pull request #10352 from vinay0410:write_pbm
...
* added write as pbm
* add tests for pbm
* imgcodecs: PBM support
- drop additional PBM parameters
- write: fix P1/P4 mode (no maxval 255 value after width/height)
- write: invert values for P1/P4
- write: P1: compact ASCII mode (no spaces)
- simplify pbm test
- drop .pxm extension (http://netpbm.sourceforge.net/doc/ doesn't know such extension)
2017-12-28 17:28:34 +03:00
Tom Becker
592f8d8c1b
Merge pull request #10232 from TomBecker-BD:hough-many-circles
...
Hough many circles (#10232 )
* Add Hui's optimization. Merge with latest changes in OpenCV.
* Use conditional compilation instead of a runtime flag.
* Whitespace.
* Create the sequence for the nonzero edge pixels only if using that approach.
* Improve performance for finding very large numbers of circles
* Return the circles with the larger accumulator values first, as per API documentation.
Use a separate step to check distance between circles. Allows circles to be sorted by strength first. Avoids locking in EstimateRadius which was slowing it down.
Return centers only if maxRadius == 0 as per API documentation.
* Sort the circles so results are deterministic. Otherwise the order of circles with the same strength depends on parallel processing completion order.
* Add test for HoughCircles.
* Add beads test.
* Wrap the non-zero points structure in a common interface so the code can use either a vector or a matrix.
* Remove the special case for skipping the radius search if maxRadius==0.
* Add performance tests.
* Use NULL instead of nullptr.
OpenCV should compile with C++98 compiler.
* Put test suite name first.
Use different test suite names for each test to avoid an error from the test runner.
* Address build bot errors and warnings.
* Skip radius search if maxRadius < 0.
* Dynamically switch to NZPointList when it will be faster than NZPointSet.
* Fix compile error: missing 'typename' prior to dependent type name.
* Fix compile error: missing 'typename' prior to dependent type name.
This time fix it the non C++ 11 way.
* Fix compile error: no type named 'const_reference' in 'class cv::NZPointList'
* Disable ManySmallCircles tests. Failing on Mac.
* Change beads image to JPEG for smaller file size.
Try enabling the ManySmallCircles tests again.
* Remove ManySmallCircles tests. They are failing on the Mac build.
* Fix expectations to check all circles.
* Changing case on a case-insensitive file system
Step 1: remove the old file names
* Changing case on a case-insensitive file system
Step 2: add them back with the new names
* Fix cmpAccum function to be strictly weak ordered.
* Add tests for many small circles.
* imgproc(perf): fix HoughCircles tests
* imgproc(houghCircles): refactor code
- simplify NZPointList
- drop broken (de-synchronization of 'current'/'mi' fields) NZPointSet iterator
- NZPointSet iterator is replaced to direct area scan
- use SIMD intrinsics
- avoid std exceptions (build for embedded systems)
2017-12-28 17:23:11 +03:00
Dmitry Kurtaev
a9807d8f54
Allocate new memory for optimized concat to prevent collisions.
...
Add a flag to disable memory reusing in dnn module.
2017-12-28 16:45:53 +03:00
Maksim Shabunin
f0b606ff77
Changed VA device in MediaSDK session initialization
2017-12-28 14:10:36 +03:00
Li Peng
00f03c5739
Add ocl version FasterRCNN accuracy test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-28 19:15:15 +08:00
Alexander Alekhin
4f6c493b87
imgcodecs(png): resolve ASAN issue with vars scope and setjmp() call
2017-12-28 02:43:07 +00:00
Alexander Alekhin
73c2a12449
Merge pull request #10435 from DabatoIsCool:master
2017-12-28 05:30:59 +03:00
Alexander Alekhin
99a9c10b57
Merge pull request #10424 from dkurt:fix_concat_optim
2017-12-28 01:26:14 +00:00
Alexander Alekhin
9b131b5f7e
dnn(test): avoid calling of cv::setNumThreads() in tests directly
...
It is not necessary by default.
Also it breaks test system command-line parameters: --perf_threads / --test_threads
2017-12-27 15:16:41 +00:00
Alexander Alekhin
5232ea1ee6
ts(feature): add "--test_threads=<N>" command-line option
2017-12-27 15:16:41 +00:00
Arthur Williams
d8d4ea857a
Fixed #10433
2017-12-27 14:09:25 +00:00
Alexander Alekhin
f3880c60a6
Merge pull request #10428 from pengli:dnn
2017-12-27 13:18:10 +00:00
Glue Crow
6045608330
Parallelization of BackgroundSubtractorKNN
2017-12-27 19:28:09 +08:00
Arjan van de Ven
2938860b3f
Provide a few AVX512 optimized functions for the DNN module
...
This patch adds AVX512 optimized fastConv as well as the hookups
needed to get these called in the convolution_layer.
AVX512 fastConv is code-identical on a C level to the AVX2 one,
but is measurably faster due to AVX512 having more registers available
to cache results in.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
2017-12-26 16:00:17 +00:00
Alexander Alekhin
1e4395a8e1
Merge pull request #10418 from mypopydev:master
2017-12-26 14:21:59 +00:00
Dmitry Kurtaev
70c605a03d
Limit Concat layer optimization
2017-12-26 16:49:33 +03:00
Li Peng
84e2fa79a0
dnn(ocl4dnn): update pre-tuned kernel config
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-26 20:14:41 +08:00
Jun Zhao
0369431ebd
opencl/cvtclr_dx: fix not compile-time constants issue.
...
fix the "initializing global variables with values that are not
compile-time constants" issue in Intel SDK for OpenCL. The root cause
is when initializing global variables with value, the variable need is
compile-time constants.
Thanks Zheng, Yang <yang.zheng@intel.com>,
Chodor, Jaroslaw <jaroslaw.chodor@intel.com> give a help.
Signed-off-by: Liu,Kaixuan <kaixuan.liu@intel.com>
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
2017-12-26 13:44:37 +08:00
Sayed Adel
fd0ac962fb
core: replace raw intrinsics with universal intrinsics in copy.cpp
...
- use universal intrinsic instead of raw intrinsic
- add performance check for Mat::copyTo/setTo with mask
2017-12-26 05:30:32 +02:00
Arjan van de Ven
fc8e848a54
Add basic plumbing for AVX512 support
...
The opencv infrastructure mostly has the basics for supporting avx512 math functions,
but it wasn't hooked up (likely due to lack of users)
In order to compile the DNN functions for AVX512, a few things need to be hooked up
and this patch does that
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
2017-12-25 21:06:52 +00:00
GlueCrow
26d288bd11
Optimize OpenCL BackgroundSubstractionMOG2
2017-12-23 21:57:17 +08:00
Alexander Alekhin
adf43e7d2a
build: fix MSVS2010 build error
2017-12-23 00:06:34 +00:00
Alexander Alekhin
047764f476
Merge tag '3.4.0'
2017-12-22 23:22:50 +00:00
Alexander Alekhin
6d4f66472e
OpenCV version++
...
3.4.0
2017-12-22 19:46:21 +00:00
Alexander Alekhin
eba176c299
Merge pull request #10398 from alalek:ml_simplify_simulated_annealing
2017-12-22 22:43:59 +03:00
Alexander Alekhin
00e43a9022
ml(ANN_MLP): ensure that train() call is always successful
2017-12-22 18:50:04 +00:00
Alexander Alekhin
9148a37624
Merge pull request #10401 from terfendail:resize_linear_revert
2017-12-22 16:18:50 +00:00
Alexander Alekhin
019b7c5a66
Merge pull request #10402 from dkurt:dnn_tf_quantized
2017-12-22 15:58:56 +00:00
Alexander Alekhin
59e825ee02
Merge pull request #10385 from pengli:dnn
2017-12-22 15:48:40 +00:00
Dmitry Kurtaev
bcc669f3f7
TensorFlow weights dequantization
2017-12-22 17:25:10 +03:00
Vitaly Tuzov
e5313246a7
Reverted calls to linear resize back to generic version for floating point matrices
2017-12-22 17:10:03 +03:00
Alexander Alekhin
97af608030
Merge pull request #10397 from mshabunin:fix-incorrect-assert
2017-12-22 14:07:02 +00:00
Li Peng
181b448c4d
add one more convolution kernel tuning candidate
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-22 21:37:00 +08:00
Alexander Alekhin
289a8da39e
ml: simplify interfaces of SimulatedAnnealingSolver
2017-12-22 16:35:48 +03:00
Vadim Pisarevsky
0742e12f0b
Merge pull request #10265 from dkurt:nms_for_region_layer
2017-12-22 13:29:37 +00:00
Vadim Pisarevsky
69a6765bf7
Merge pull request #10387 from terfendail:resize23_perftest
2017-12-22 13:26:05 +00:00
Vadim Pisarevsky
3f68d6d8a7
Merge pull request #10392 from terfendail:bitexact_fallback
2017-12-22 13:23:55 +00:00
Alexander Alekhin
83b8cd0152
Merge pull request #10375 from tomoaki0705:buildWarningMSVC
2017-12-22 13:17:12 +00:00
Alexander Alekhin
4e542a65a3
Merge pull request #10390 from alalek:ocl_option_buffer_rect
2017-12-22 12:52:56 +00:00
Maksim Shabunin
aa46e31c6d
Replaced incorrect CV_Assert calls with CV_Error
2017-12-22 15:20:13 +03:00
Vitaly Tuzov
5fdb42a7c9
Added fallback to generic linear resize in case bit-exact resize of provided matrix isn't supported
2017-12-22 14:29:50 +03:00
Vadim Pisarevsky
636b7ec0c4
Merge pull request #10386 from terfendail:resizeexact_c3
2017-12-22 10:54:49 +00:00
Alexander Alekhin
534645a12f
ocl: workaround option to disable usage of buffer "Rect" operations
2017-12-22 13:05:03 +03:00
elenagvo
cd1c8693d8
HAL for minMaxIdx
2017-12-22 12:56:52 +03:00
Vadim Pisarevsky
325cbd7c84
Merge pull request #10364 from dkurt:dnn_smooth_tf_data_layout
2017-12-22 09:56:45 +00:00
Ce Zheng
602b08d9c7
Update resize inline comments
...
Reading through the implementation, I feel this line of comment is not consistent with the actually code, so this is for correcting it.
2017-12-22 16:03:12 +08:00
Vitaly Tuzov
019162486c
Disabled universal intrinsic based implementation for bit-exact resize of 3-channel images
2017-12-22 10:08:30 +03:00
Tomoaki Teshima
fe7b3f1228
clean up the code
...
* disable the warning in CMake, not int the code using pragma
2017-12-22 08:42:21 +09:00
Alexander Alekhin
1bc1f3d311
Merge pull request #10374 from tomoaki0705:removeGstreamerTest
2017-12-21 19:02:13 +00:00
Vadim Pisarevsky
a8a51db42b
Merge pull request #10316 from terfendail:bitexact_c234
2017-12-21 18:56:54 +00:00
Vadim Pisarevsky
70d49446e9
Merge pull request #10369 from alalek:issue_10351
2017-12-21 18:48:38 +00:00
Alexander Alekhin
a2620f72c7
Merge pull request #10370 from pengli:dnn
2017-12-21 15:36:23 +00:00
Tomoaki Teshima
50d44e06e3
avoid the test which is too strict
...
* confirmed test failure on Jetson TX1 and TX2
* show the performance but not bit exact result
2017-12-22 00:14:10 +09:00
Li Peng
c5fc8e03ff
cleanup unnecessary macros in convolution ocl kernel
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-21 20:32:36 +08:00
Li Peng
0aa5e43a14
refactor candidate generation of convolution auto-tuning
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-21 23:05:54 +08:00
jasjuang
235889ddbb
handle legacy VTK functions
2017-12-21 01:33:25 -08:00
Dmitry Kurtaev
c67e75b68f
Refactor NMS procedure at RegionLayer
2017-12-21 12:21:45 +03:00
Vadim Pisarevsky
047ad4ff71
Merge pull request #10366 from alalek:ocl_fix_cvtcolor_read
2017-12-21 08:33:59 +00:00
Vadim Pisarevsky
ae8bb718cd
Merge pull request #10340 from alalek:log_level_option
2017-12-21 08:33:18 +00:00
Alexander Alekhin
7bbe1a53cf
imgcodecs(pxm): fix memcpy size
2017-12-21 01:10:24 +00:00
Vitaly Tuzov
b6fe4cc807
Added performance tests for linear resize of 2 and 3-channel images
2017-12-20 18:11:21 +03:00
Vadim Pisarevsky
eecb64a973
Merge pull request #10331 from arrybn:python_dnn_net
2017-12-20 14:30:27 +00:00
LaurentBerger
e43997dbb5
Calcerror uses now weighted samples ( #10346 )
...
* Calcerror uses now sample weights
* catree comment in #10319
2017-12-20 17:24:46 +03:00
Alexander Alekhin
813ff37967
imgproc(ocl): fix RGB2RGBA kernel out of range access
2017-12-20 14:19:46 +00:00
Vadim Pisarevsky
b8a24b36ce
Merge pull request #10356 from dkurt:dnn_rfcn
2017-12-20 14:19:46 +00:00
Vitaly Tuzov
1eb2fa9efb
Added universal intrinsics based implementations for CV_8UC2, CV_8UC3, CV_8UC4 bit-exact resizes.
2017-12-20 17:17:10 +03:00
Dmitry Kurtaev
7e48fa58eb
Manage TensorFlow's NHWC data layout is smoother
2017-12-20 14:13:40 +03:00
Dmitry Kurtaev
0ed2cbc931
R-FCN models support
2017-12-20 10:43:22 +03:00
Alexander Alekhin
b450811e4b
core(logger): add log level configuration option
2017-12-19 22:57:07 +00:00
catree
87160cb297
Add Demo 5: Basic panorama stitching from a rotating camera in the homography tutorial.
2017-12-19 22:45:35 +01:00
Alexander Alekhin
dcdd6af5a8
Merge pull request #10341 from pengli:dnn
2017-12-19 14:04:55 +00:00
Alexander Alekhin
badc3bd312
Merge pull request #10348 from ElenaGvozdeva:Canny_HAL
2017-12-19 13:07:59 +00:00
Vadim Pisarevsky
b1ed8bc0d1
Merge pull request #10347 from dkurt:dnn_remove_deprecated_importer
2017-12-19 11:03:06 +00:00
Li Peng
3b84acfc48
add ocl accuracy test for tf mobilenet ssd
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-19 18:38:55 +08:00
Li Peng
436d7e4eaf
add depthwise convolution kernel
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-19 17:59:13 +08:00
Li Peng
910d7dab1f
prior box layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-19 17:44:10 +08:00
elenagvo
b0e9d76ced
HAL for canny
2017-12-19 11:03:10 +03:00
Dmitry Kurtaev
6aabd6cc7a
Remove cv::dnn::Importer
2017-12-18 18:08:28 +03:00
Alexander Rybnikov
19c914db51
Changed wrapping mode for cv::dnn::Net::forward
2017-12-18 15:56:09 +03:00
Suleyman TURKMEN
1654dfe3a9
Update samples ( #10333 )
...
* Update samples
* Update calib3d.hpp
* Update calib3d.hpp
* Update calib3d.hpp
* Update calib3d.hpp
2017-12-18 13:44:11 +03:00
Vadim Pisarevsky
d3a124c820
Merge pull request #10339 from catree:add_doc_solvepnp_figure_desc
2017-12-18 09:13:06 +00:00
Vadim Pisarevsky
86cc4f3aa4
Merge pull request #10337 from dkurt:fix_pooling_layer
2017-12-18 09:11:54 +00:00
catree
fcb537bacd
Add a figure and some formulas to illustrate the PnP pose estimation principle.
2017-12-17 21:38:22 +01:00
Jiri Horner
3dbf392d48
fix build with intrinsics enabled
...
* since #10231 opencv with instrumentation does not build
2017-12-17 20:23:15 +01:00
Dmitry Kurtaev
2b43d4f477
Fix default pooling layer type
2017-12-17 16:46:40 +03:00
Alexander Alekhin
cac4a7e5b5
OpenCV version++
...
OpenCV 3.4.0-rc
2017-12-16 01:30:43 +03:00
Alexander Alekhin
3fddce67c6
experimental version++
2017-12-16 01:30:36 +03:00
Alexander Alekhin
361bb1197f
cmake: fix opencv_world build with contrib
2017-12-15 21:36:22 +00:00
Alexander Alekhin
70e1b4ddf0
Merge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp
...
Move SimulatedAnnealingSolver::Impl in cpp file
2017-12-15 23:06:48 +03:00
Rostislav Vasilikhin
bab86d65cb
Merge pull request #10258 from savuor:fix/kmeans_channels
...
* kmeans: number of channels in _centers fixed
* fixedType() is checked now
2017-12-15 21:48:48 +03:00
Alexander Alekhin
aef3019152
ml: fix SimulatedAnnealingSolver interface
2017-12-15 21:44:32 +03:00
Alexander Alekhin
28b19d6e3e
Merge pull request #10313 from alalek:rename_fix
...
Fix file names
2017-12-15 21:40:22 +03:00
Maksim Shabunin
1033f2b1bd
Fixed 3 issues found by static analysis
2017-12-15 17:29:26 +03:00
catree
0a439570a0
Move SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.
2017-12-15 14:09:59 +01:00
Vadim Pisarevsky
62359f70ff
Merge pull request #10306 from dkurt:faster_rcnn
2017-12-15 12:23:53 +00:00
Alexander Alekhin
7d4a67f2a8
Merge pull request #10315 from alalek:issue_10147_debug
...
dnn: more debug information
2017-12-15 15:01:12 +03:00
Alexander Alekhin
d5f152494b
fix file names
2017-12-15 14:59:35 +03:00
Sayed Adel
1b8acd662f
core:ppc Fix several issues for VSX ( #10303 )
...
- fix conversion intrinsics compatibility with xlc
- implement odd-elements 2 to 4 conversion intrinsics
- improve implementation of universal intrinsic v_popcount
- rename FORCE_INLINE to VSX_FINLINE in vsx_utils.hpp
2017-12-15 14:03:46 +03:00
LaurentBerger
7ad308ea47
Simulated Annealing for ANN_MLP training method ( #10213 )
...
* Simulated Annealing for ANN_MLP training method
* EXPECT_LT
* just to test new data
* manage RNG
* Try again
* Just run buildbot with new data
* try to understand
* Test layer
* New data- new test
* Force RNG in backprop
* Use Impl to avoid virtual method
* reset all weights
* try to solve ABI
* retry
* ABI solved?
* till problem with dynamic_cast
* Something is wrong
* Solved?
* disable backprop test
* remove ANN_MLP_ANNEALImpl
* Disable weight in varmap
* Add example for SimulatedAnnealing
2017-12-15 13:57:39 +03:00
zhijackchen
6df8ac0342
Merge pull request #10283 from zhijackchen:exr_export
...
* Fix issue #10114
Convert table change
From:
CV_8U -> HALF
CV_8S -> HALF
CV_16U -> UINT
CV_16S -> UINT
CV_32S -> UINT
CV_32F -> FLOAT
To:
CV_8U -> HALF
CV_8S -> HALF
CV_16U -> UINT
CV_16S -> FLOAT
CV_32S -> FLOAT loss precision
CV_32F -> FLOAT
Signed integer can't be presented well with UINT. Even adjust bias, CV16S and CV32S will be confused when load from exr file.
Also fix CV_8S negative value incorrect bug
* EXR import and export
imread() from EXR returns CV_32F only
imwrite() accepts CV_32 cv::Mat only and stores FLOAT images by default. Add imwrite() flag to store in HALF format.
* fix compiling error
* clean up
* fix EXR import issues
2017-12-15 12:23:44 +03:00
Dmitry Kurtaev
08112f3821
Faster-RCNN models support
2017-12-15 12:16:21 +03:00
Vadim Pisarevsky
84535a60f2
Merge pull request #10307 from savuor:fix/expect_softfloat
2017-12-14 21:00:46 +00:00
Tomoaki Teshima
ca1a0a1108
core: remove raw SSE2/NEON implementation from convert.cpp ( #9831 )
...
* remove raw SSE2/NEON implementation from convert.cpp
* remove raw implementation from Cvt_SIMD
* remove raw implementation from cvtScale_SIMD
* remove raw implementation from cvtScaleAbs_SIMD
* remove duplicated implementation cvt_<float, short>
* remove duplicated implementation cvtScale_<short, short, float>
* add "from double" version of Cvt_SIMD
* modify the condition of test ConvertScaleAbs
* Update convert.cpp
fixed crash in cvtScaleAbs(8s=>8u)
* fixed compile error on Win32
* fixed several test failures because of accuracy loss in cvtScale(int=>int)
* fixed NEON implementation of v_cvt_f64(int=>double) intrinsic
* another attempt to fix test failures
* keep trying to fix the test failures and just introduced compile warnings
* fixed one remaining test (subtractScalar)
2017-12-15 00:00:35 +03:00
Rostislav Vasilikhin
7d18f49a49
SoftFloat tests: assert => expect
2017-12-14 21:03:25 +03:00
Alexander Alekhin
0da947e6b3
dnn: more debug information
2017-12-14 19:21:17 +03:00
Vadim Pisarevsky
d0d2faf551
Merge pull request #10294 from alalek:fix_copyToMask_dst_initialization
2017-12-14 11:05:09 +00:00
Vitaly Tuzov
c5f06814bc
[move sift.cpp] Updated internal calls to linear resize to use bit-exact version
...
original commit: 8c394a4f2e
2017-12-14 13:00:09 +03:00
Vadim Pisarevsky
7b701fee60
Merge pull request #10302 from alalek:issue_10254
2017-12-13 17:31:40 +00:00
Vadim Pisarevsky
99183e98d3
Merge pull request #10293 from alalek:fix_persistence_with_deprecated_traits
2017-12-13 17:30:23 +00:00
Alexander Alekhin
c231472ad6
Merge pull request #10290 from tomoaki0705:fixVS2012Round
2017-12-13 15:30:21 +00:00
Alexander Alekhin
9930076dc5
core(test): avoid filename duplicates in tests
2017-12-13 18:21:55 +03:00
Tomoaki Teshima
ecb6bcf2e0
fix build error on Visual Studio 2012
...
* round doesn't exists in standard library of Visual Studio 2012
* apply the correct computation of ROI
2017-12-13 17:40:07 +03:00
Vitaly Tuzov
51cb56ef2c
Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. ( #9468 )
2017-12-13 15:00:38 +03:00
Vadim Pisarevsky
84ee4d701a
Merge pull request #10297 from tomoaki0705:suppressOclWarning
2017-12-13 07:56:35 +00:00
Tomoaki Teshima
267c5a747b
suppress warnings on OpenCL build
...
* stop re-enabling the warning C4127
* disabling is done in CMakeLists.txt
2017-12-13 15:07:51 +09:00
Alexander Alekhin
62ed6cdc74
core: fix copyTo(with mask) dst initialization
2017-12-12 18:40:13 +03:00
Alexander Alekhin
ce20efb8e7
Merge pull request #9804 from woodychow:optimize_cveigen
2017-12-12 14:58:04 +00:00
Alexander Alekhin
825b14278e
core: fix persistence with deprecated traits
2017-12-12 17:07:36 +03:00
Alexander Alekhin
c0b6061a5e
core(test): Core_Eigen.vector_32 use relative norm
2017-12-12 15:07:31 +03:00
Alexander Alekhin
2324674dfb
core(test): update eps in testEigen<float>: 1e-6 => 1e-4
2017-12-12 15:07:31 +03:00
Alexander Alekhin
53b5afbba9
core(test): refactor Java Eigenvalues/PCA tests
2017-12-12 15:07:31 +03:00
Alexander Alekhin
d48d2d7fe2
core(test): refactor PCA test
...
- CV_L2 -> relative NORM_L2
- eigenEps: 1e-6 ==> 1e-4
- evalEps: 1e-6 ==> 1e-5
- evecEps: 1e-3 ==> 5e-3
- RNG seed: 12345
- drop non-informative legacy test code (ts->printf, etc)
2017-12-12 15:07:27 +03:00
Alexander Alekhin
b0bce60c16
Merge pull request #10284 from alalek:dnn_debug_error
2017-12-12 09:33:50 +00:00
Alexander Alekhin
eff42f6387
dnn: more debug info
2017-12-12 12:04:10 +03:00
Alexander Alekhin
5404930112
Merge pull request #9260 from Cartucho:add_python_signatures
2017-12-12 08:58:14 +00:00
Alexander Alekhin
e49febb70f
Merge pull request #10269 from terfendail:softdouble_round
2017-12-11 12:48:03 +00:00
Vadim Pisarevsky
7e680bd9ff
Merge pull request #10215 from dkurt:dnn_js
2017-12-11 12:47:52 +00:00
Vadim Pisarevsky
9fa505027a
Merge pull request #10263 from mshabunin:embedded-build
2017-12-11 12:42:45 +00:00
Vadim Pisarevsky
61c2f094b9
Merge pull request #10280 from alalek:python_cv2_to_cv
2017-12-11 12:39:00 +00:00
Vadim Pisarevsky
558b17dede
Merge pull request #10231 from alalek:ocl_refactor_program_api
2017-12-11 12:34:22 +00:00
Vitaly Tuzov
86b128dbb3
Added implementation of softdouble rounding to int64_t
2017-12-11 14:29:32 +03:00
Alexander Alekhin
5560db73bf
python: 'cv2.' -> 'cv.' via 'import cv2 as cv'
2017-12-11 13:46:55 +03:00
Maksim Shabunin
7349b8f5ce
Build for embedded systems
2017-12-11 13:27:37 +03:00
Alexander Alekhin
768f4cb7bc
python: 'sub-module' for binding sources and documentation meta information
2017-12-09 21:01:46 +00:00
Alexander Alekhin
66e09bc9a4
Merge pull request #10260 from native-api:ffmpeg_load_from_package
2017-12-08 20:58:17 +00:00
Vadim Pisarevsky
cd7526c973
Merge pull request #10266 from ChristofKaufmann:warp_documentation
2017-12-08 18:48:48 +00:00
Vadim Pisarevsky
c24f10d647
Merge pull request #10268 from dkurt:fix_scale_layer
2017-12-08 18:46:50 +00:00
Ivan Pozdeev
4bee238cf8
GetModuleFileName() doesn't reset last error on success
2017-12-08 21:11:41 +03:00
Dmitry Kurtaev
f503515082
JavaScript bindings for dnn module
2017-12-08 18:33:48 +03:00
Dmitry Kurtaev
e307065c8e
Scale layer in case of 2D inputs
2017-12-08 17:34:59 +03:00
Elena Gvozdeva
6185f7209e
Merge pull request #10172 from ElenaGvozdeva:eg/HAL_sobel
...
* add HAL for SobelFilter
* add HAL for pyrDown
* add HAL for Scharr
2017-12-08 16:36:24 +03:00
Christof Kaufmann
9c5b231b2d
doc: Add type restriction note for geometric transformations
...
This is added according to #7862 .
2017-12-08 12:33:51 +01:00
Alexander Alekhin
f2070c9f5d
Merge pull request #10255 from dkurt:dnn_roi_pooling
2017-12-08 11:20:07 +00:00
Riyuzakii
8f1345091e
Remove typo/repeated code block
2017-12-08 12:10:00 +05:30
Dmitry Kurtaev
17dcf0e82d
ROIPooling layer
2017-12-07 19:04:38 +03:00
Alexander Alekhin
d329674f68
Merge pull request #8198 from mshabunin:cmakeex
2017-12-07 15:02:41 +00:00
Dmitry Kurtaev
ef0650179b
Fix conv/deconv/fc layers FLOPS computation
2017-12-07 11:42:04 +03:00
Pavel Rojtberg
6fb9d42c3f
Hid symbols in static builds, added LTO flags, removed exports from ts
2017-12-07 10:26:48 +03:00
Alexander Alekhin
6074f92d48
Merge pull request #10228 from pengli:dnn_new
2017-12-06 15:50:12 +00:00
Alexander Alekhin
0b688cd23f
Merge pull request #10240 from alalek:dnn_perf_ssd
2017-12-06 15:41:18 +00:00
Li Peng
59cbaca4d3
detection_output layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-06 22:35:59 +08:00
Li Peng
66feea6cac
region layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-07 02:26:46 +08:00
Li Peng
7707c9bfba
reorg layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-07 02:26:46 +08:00
Li Peng
85b1c4060c
support axis in concat layer ocl path
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-07 02:26:46 +08:00
Li Peng
07bec6bdcd
reshape layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-07 02:26:40 +08:00
Alexander Alekhin
d8a737b4b0
dnn: SSD performance test
2017-12-06 15:55:18 +03:00
Alexander Alekhin
3a8a73ef6c
ocl: skip unstable tests
...
during pre-commit testing
2017-12-06 12:58:35 +03:00
Vadim Pisarevsky
4781f0a337
Merge pull request #10024 from iago-suarez:bugfix-lsd-multiple-imgs-issue#10023
2017-12-06 09:01:37 +00:00
Vadim Pisarevsky
4b8275061e
Merge pull request #10058 from ElenaGvozdeva:eg/HAL
2017-12-05 20:56:24 +00:00
Vadim Pisarevsky
2c4d3d92c7
Merge pull request #10221 from dkurt:non_spatial_torch_layers
2017-12-05 20:52:00 +00:00
Alexander Alekhin
15b909e80b
ocl: add SPIR Program loading test
...
SPIR kernels are located in opencv_extra
2017-12-05 22:25:14 +03:00
Alexander Alekhin
a82d2363f4
ocl: refactor Program API
...
- don't store ProgramSource in compiled Programs (resolved problem with "source" buffers lifetime)
- completelly remove Program::read/write methods implementation:
- replaced with method to query RAW OpenCL binary without any "custom" data
- deprecate Program::getPrefix() methods
2017-12-05 22:25:14 +03:00
Alexander Alekhin
13c4a02157
ocl: low-level API to support OpenCL binary programs
2017-12-05 22:25:14 +03:00
Alexander Alekhin
4d721e368a
Merge pull request #10218 from catree:fix_cuda_integral
2017-12-05 15:10:00 +00:00
Li Peng
7b7033ac60
permute layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-05 22:10:05 +08:00
Juha Reunanen
5b41599911
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
2017-12-05 15:49:44 +03:00
Vadim Pisarevsky
5ce38e516e
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
2017-12-05 13:32:28 +03:00
woody.chow
611cf8d86f
Use Eigen::SelfAdjointEigenSolver in cv::eigen
2017-12-05 02:40:55 +03:00
Dmitry Kurtaev
bbbec300a6
nn.BatchNormalization and nn.Dropout layers from Torch
2017-12-04 12:57:21 +03:00
catree
6d06fcb414
Fix CUDA integral.
2017-12-04 02:22:52 +01:00
Alexander Alekhin
fc9e031454
Merge pull request #10212 from alalek:ocl_cache_with_address_bits
2017-12-01 15:42:28 +00:00
Alexander Alekhin
74d321d901
Merge pull request #10199 from alalek:fix_calib3d_fisheye_rectify_test
2017-12-01 15:26:50 +00:00
elenagvo
7bfb38055c
remove matrix release
2017-12-01 14:38:00 +03:00
elenagvo
81519537ae
fix the parameters order
2017-12-01 14:38:00 +03:00
elenagvo
0f12351a41
fix accelerators order
2017-12-01 14:38:00 +03:00
elenagvo
7aadbc9607
remove complex data structs
2017-12-01 14:38:00 +03:00
elenagvo
ce65975625
call HAL for GaussianBlur is fixed
2017-12-01 14:38:00 +03:00
elenagvo
a25c443d1f
add perf test for boxFilter CV8U to CV16U
2017-12-01 14:38:00 +03:00
elenagvo
c2c7333107
add hal for GaussianBlur
2017-12-01 14:38:00 +03:00
elenagvo
cb9e110adb
add HAL for BoxFilter
2017-12-01 14:38:00 +03:00
Alexander Alekhin
0595ab3eef
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.
2017-12-01 14:20:18 +03:00
Maksim Shabunin
800294ad4b
Merge pull request #10060 from allnes:videoio_tests_backend
2017-12-01 09:38:19 +00:00
Alexander Alekhin
ac58405a71
calib3d: fix fisheye stereoRectify test
...
- don't write into testdata directory
- check matrices instead of result images
2017-11-30 15:50:29 +03:00
Alexander Alekhin
9bf6ec6fe1
Revert "Adapted estimateNewCameraMatrix to make it work with pincushion-like distortion."
...
This reverts commit 5384a2205a
2017-11-30 15:47:48 +03:00
Vadim Pisarevsky
7ae19467b5
Merge pull request #10171 from ElenaGvozdeva:Threshold
2017-11-30 10:02:47 +00:00
Vadim Pisarevsky
fe95d5a720
Merge pull request #10200 from alalek:cmake_fix_dependencies
2017-11-30 10:00:51 +00:00
Alexander Alekhin
0105518422
Merge pull request #10190 from seiko2plus:issue10189
2017-11-30 07:16:12 +00:00
Alexander Alekhin
22c0bb7dc9
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_').
2017-11-29 21:43:09 +03:00
Alexander Alekhin
e703c3090a
Merge pull request #10184 from catree:solvePnP_iterative_guess_3_pts
2017-11-29 18:24:04 +00:00
Maksim Shabunin
7eb1065944
Fixed/disabled warnings produced by GCC 7
2017-11-29 17:21:22 +03:00
Alexander Alekhin
cc2ee923e4
Merge pull request #10164 from pengli:dnn
2017-11-29 12:05:10 +00:00
Vadim Pisarevsky
f5dba12762
Merge pull request #10180 from alalek:ocl_avoid_unnecessary_initialization
2017-11-29 11:42:22 +00:00
Vadim Pisarevsky
86ff4a1ccf
Merge pull request #10182 from romanc:fix/divByZeroSimdDouble
2017-11-29 10:01:58 +00:00
Vadim Pisarevsky
614e254331
Merge pull request #10170 from LaurentBerger:Issue10166
2017-11-29 09:51:20 +00:00
Sayed Adel
6fe6436162
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
2017-11-29 07:48:26 +00:00
elenagvo
73ac5321f5
fix threshold HAL
2017-11-28 17:42:29 +03:00
catree
2e56a47f8c
Allow to use 3 points in SolvePnP if SOLVEPNP_ITERATIVE and useExtrinsicGuess==true. Add bibtex citations for P3P. Update SolvPnP tests.
2017-11-28 15:04:59 +01:00
Vadim Pisarevsky
666fc0ba69
Merge pull request #9986 from terfendail:drawcontours_docfix
2017-11-28 13:19:06 +00:00
Vadim Pisarevsky
cfd845ac07
Merge pull request #10141 from LaurentBerger:MLP_ReLU
2017-11-28 13:17:43 +00:00
Vadim Pisarevsky
2a8344f75b
Merge pull request #10149 from mshabunin:fix-saturate-intrin
2017-11-28 13:17:10 +00:00
elenagvo
762138e77e
define adaptiveMethod and thresholdType for HAL
2017-11-28 16:02:06 +03:00
Roman Cattaneo
d381e499ea
Fixes Issue #10181
...
This PR fixes incorrect division by zero handling in template
specialization of `Div_SIMD` for type `double`.
2017-11-28 13:48:40 +01:00
Alexander Alekhin
0ed3209b00
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)
2017-11-28 14:02:42 +03:00
Vadim Pisarevsky
bc547c4290
Merge pull request #10124 from zhongwuzw:master
2017-11-28 10:53:00 +00:00
Vadim Pisarevsky
9e4a8a31e1
Merge pull request #10173 from dkurt:update_priorbox_layer
2017-11-28 10:51:06 +00:00
Vadim Pisarevsky
b900496c40
Merge pull request #10152 from alalek:py_fix_isalgorithm
2017-11-28 10:46:41 +00:00
Alexander Alekhin
abad8977b6
Merge pull request #9247 from paroj:wrap_alog_rw
2017-11-28 10:35:33 +00:00
Maksim Shabunin
6c135261b2
Universal Intrinsics: aligned v_pack behavior on different platforms, fixed 64-bit register on ARM, added more saturate_cast variants
2017-11-28 13:31:56 +03:00
LaurentBerger
a44573c43b
Add ReLU and LeakyReLU activation function in ml module
2017-11-28 11:02:05 +01:00
Alexander Alekhin
378e05c16b
Merge pull request #10178 from alalek:ts_message
2017-11-28 05:39:29 +00:00
Alexander Alekhin
486cfd1040
ts: detailed message
2017-11-27 19:22:39 +03:00
Pavel Rojtberg
3c795a0dab
add test_algorithm_rw using AKAZE
2017-11-27 17:04:56 +01:00
Pavel Rojtberg
6fbf0758bc
Python: wrap Algorithm::read and Algorithm::write
2017-11-27 17:04:56 +01:00
Wu Zhiwen
1f465a0ef9
dnn(ocl4dnn): fuseLayer() use umat_input/outputBlobs for OpenCL target
...
Also, fix bug when use OPENCL target but no OpenCL runtime
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-27 22:25:53 +08:00
Li Peng
a47fbd2610
Add ocl accuracy test for a few dnn nets
...
They are alexnet, mobilenet-ssd, resnet50, squeezeNet_v1_1,
yolo and fast_neural_style.
Signed-off-by: Li Peng <peng.li@intel.com>
2017-11-27 23:33:21 +08:00
Dmitry Kurtaev
99ed085752
Update PriorBox layer
2017-11-27 16:47:20 +03:00
elenagvo
c95bc0c7fd
add HAL for threshold
2017-11-27 15:35:02 +03:00
elenagvo
11ddb9332c
add HAL for adaptiveThreshold
2017-11-27 15:35:02 +03:00
LaurentBerger
606a5fd537
Try to solve issue 10166
2017-11-27 13:13:05 +01:00
Alexander Alekhin
c4b158ff91
Merge pull request #10167 from alalek:ocl_fix_issue_contrib1467
2017-11-27 11:05:07 +00:00
Vadim Pisarevsky
ec076bfba3
Update imgproc.hpp
...
rewrote the added note in perhaps a cleaner way
2017-11-27 13:42:10 +03:00
Vadim Pisarevsky
92be112388
Merge pull request #10107 from ElenaGvozdeva:medianBlur_HAL
2017-11-27 10:12:16 +00:00
Vadim Pisarevsky
a83c12c3d5
Merge pull request #10154 from alalek:ocl_cleanup_obsolete_cache
2017-11-27 10:04:04 +00:00
Vadim Pisarevsky
7f554f3cc4
Merge pull request #10155 from alalek:ocl_update_loader
2017-11-27 10:03:31 +00:00
Alexander Alekhin
92b35e6758
ocl: fix null pointer access crash
2017-11-27 12:43:29 +03:00
Alexander Alekhin
11330b9253
Merge pull request #10095 from alalek:fix_canny_intrinsics
2017-11-25 12:31:47 +00:00
Alexander Alekhin
c38620e966
ocl: update OpenCL runtime loader
...
- fix compilation on Apple (undefined 'oclpath')
- don't warn on OPENCV_OPENCL_RUNTIME=disabled
2017-11-24 19:18:22 +03:00
Alexander Alekhin
b6abf0d3f9
ocl: drop obsolete cache directories after upgrade of OpenCL driver
...
Entries with the same platform name, the same device name and with different driver versions
are assumed obsolete.
2017-11-24 17:02:28 +03:00
Alexander Alekhin
cbf2b51e40
bindings(py): fix handling of 'isalgorithm'
2017-11-24 09:54:44 +03:00
Alexander Alekhin
13f374660f
dnn(ocl4dnn): drop unused batch_size_ in pooling
2017-11-23 20:46:56 +00:00
Alexander Alekhin
e34b64c979
dnn(ocl4dnn): refactor pooling OpenCL calls
2017-11-23 20:46:44 +00:00
Alexander Alekhin
f071a48ec7
Merge pull request #10143 from pengli:ocl4dnn
2017-11-23 18:47:14 +00:00
Maksim Shabunin
a1479cc2c1
Merge pull request #10148 from alalek:fix_ffmpeg_sws_scale_crash
2017-11-23 18:35:00 +00:00
Alexander Alekhin
107582c767
Merge pull request #9996 from dkurt:dnn_multiple_inputs
2017-11-23 18:22:37 +00:00
Li Peng
636d6368ee
use OutputArrayOfArrays in net forward interface
...
It allows umat buffers used in net forward interface
Signed-off-by: Li Peng <peng.li@intel.com>
2017-11-24 02:19:10 +08:00
Wu, Zhiwen
04edc8fe3a
cleanup ocl4dnn spatial convolution kernels
...
remove unused macros and half definition macros,
also remove unused ocl::Queue
Signed-off-by: Li Peng <peng.li@intel.com>
2017-11-24 02:19:10 +08:00
Alexander Alekhin
559235ac74
videoio(ffmpeg): more workarounds for sws_scale() crash
...
Prevents access data after the end of input buffer near 4K page boundaries
2017-11-23 18:56:19 +03:00
Alexander Alekhin
49a5280198
Merge pull request #10139 from alalek:dnn_rename_caffe_proto_package
2017-11-23 14:10:42 +00:00
Alexander Alekhin
e5d1790b7b
Merge pull request #10018 from alalek:ocl_binary_cache
2017-11-23 13:37:32 +00:00
Vadim Pisarevsky
fed2a277e0
Merge pull request #10142 from alalek:pytests_update
2017-11-23 12:51:55 +00:00
Maksim Shabunin
6f48dc2482
Fixed GStreamer pipeline building on Ubuntu 17
2017-11-23 15:03:20 +03:00
Alexander Nesterov
8082011546
Update videoio tests
2017-11-23 14:57:38 +03:00
Maksim Shabunin
7628c143f4
videoio: fixed capture open order, added apiPrefernce to FFMPEG tests
2017-11-23 13:33:48 +03:00
elenagvo
5d0a8d2aaf
fix the parameters order
2017-11-23 13:30:00 +03:00
Alexander Alekhin
019de554a0
python(test): don't write bytecode
...
Tests are usually lauched from source directory, so additional unnecessary
files should be eliminated.
Alternative ways (command line):
- python -B ...
- PYTHONDONTWRITEBYTECODE=1 python ...
2017-11-23 13:13:11 +03:00
Alexander Alekhin
3ee8079f35
python(test): add tests filter
...
Usage example (bash):
$ OPENCV_PYTEST_FILTER=test_digits python test.py -v
2017-11-23 12:16:59 +03:00
Alexander Alekhin
e4aa2ccd66
Merge pull request #10136 from alalek:issue_10134
2017-11-22 18:39:47 +00:00
Alexander Alekhin
f37f4cf3b4
Merge pull request #9994 from r2d3:dnn_memory_load
2017-11-22 18:15:00 +00:00
Alexander Alekhin
e7d62d6ef3
Merge pull request #10126 from alalek:dnn_issue_10125
2017-11-22 18:03:51 +00:00
Alexander Alekhin
b29893b938
dnn: autogenerated files
2017-11-22 18:34:07 +03:00
Alexander Alekhin
1c88a566e0
dnn: rename caffe protobuf package
2017-11-22 18:34:07 +03:00
Alexander Alekhin
3f37be5a30
core: fix compilation of intrinsic code
2017-11-22 17:28:50 +03:00
Alexander Alekhin
9db5cbf9a4
dnn: sync output/internals blobs back
2017-11-22 14:00:58 +03:00
Alexander Alekhin
8e6280fc8e
ocl: binary program cache
2017-11-22 12:56:38 +03:00
Vadim Pisarevsky
f8ad289311
Merge pull request #10092 from alalek:dnn_rename_caffe_proto
2017-11-22 08:16:20 +00:00
Maksim Shabunin
e57f22a386
Fixed allocSingleton
2017-11-21 18:07:30 +03:00
Maksim Shabunin
12662e064b
align singleton malloc
2017-11-21 17:55:23 +03:00
Maksim Shabunin
1c46034166
Other buffers
2017-11-21 17:55:23 +03:00
Maksim Shabunin
2178c5e95e
init ABtoXZ
2017-11-21 17:55:23 +03:00
Maksim Shabunin
b3018ba89e
LUV tables
2017-11-21 17:55:23 +03:00
Maksim Shabunin
e75056a084
static init
2017-11-21 17:55:23 +03:00
Maksim Shabunin
51fc891a5c
cvtColor: fixed tables init, moved some tables to heap
2017-11-21 17:55:23 +03:00
Alexander Alekhin
0f34628af7
dnn: drop OpenCL code path for DetectionOutputLayer
...
getUMat()/getMat() calls are scope based. Results of these calls can't be
stored somewhere for future usage.
2017-11-21 17:28:42 +03:00
Vadim Pisarevsky
c3cced0f89
Merge pull request #10121 from alalek:ocl_syntax_fix
2017-11-21 12:40:19 +00:00
Rostislav Vasilikhin
397b57dd72
Merge pull request #10041 from savuor:RevHoughWorks
...
HoughCircles rewritten (PR #7434 updated) (#10041 )
* initial version of renewed HoughCircles done
* fixed compilation
* fixed SIMD ability & compilation warning
* fixed accumulator nonmax comparison
* common Mutex for all invokers
* nzLocal is std::vector
* nz is std::vector
* SSE2 -> SIMD128
* centers is now std::vector
* circles is std::vector
* estimateRadius updated
* accum calculation w/o mutex
* less deprecated code
* several bugs fixed
* back to mutex, TLS gathering doesn't work
* extra code removed
* little refactoring
* docs note updated
* a little speedup
* warning fixed
2017-11-21 14:18:47 +03:00
zhongwuzw
01b581048d
Fix customPreviewLayer layout issue when rotateVideo is NO in iOS
2017-11-21 12:56:23 +08:00
Alexander Alekhin
438e456ce9
Merge pull request #10113 from wzw-intel:fusion
2017-11-20 18:13:33 +00:00
Alexander Alekhin
b389c1cfe7
core(ocl): syntax fix
2017-11-20 19:19:35 +03:00
Alexander Alekhin
f19f2bbcde
dnn: autogenerated files
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:02 +03:00
Alexander Alekhin
f6d927ef3b
dnn: avoid conflicts with original caffe.proto
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:00 +03:00
Alexander Alekhin
75b980ac64
Merge pull request #10120 from dkurt:remove_caffe_header_from_layer
2017-11-20 15:59:56 +00:00
David Geldreich
f723cede2e
add loading TensorFlow/Caffe net from memory buffer
...
add a corresponding test
2017-11-20 16:28:22 +01:00
Dmitry Kurtaev
6c5dd5cf6d
Replace caffe::NormalizedBBox to local structure
2017-11-20 18:03:31 +03:00
elenagvo
3a09da71d8
add HAL for medianBlur
2017-11-20 17:09:22 +03:00
Tomoaki Teshima
3cbe60cca2
Merge pull request #9753 from tomoaki0705:universalMatmul
...
* add accuracy test and performance check for matmul
* add performance tests for transform and dotProduct
* add test Core_TransformLargeTest for 8u version of transform
* remove raw SSE2/NEON implementation from matmul.cpp
* use universal intrinsic instead of raw intrinsic
* remove unused templated function
* add v_matmuladd which multiply 3x3 matrix and add 3x1 vector
* add v_rotate_left/right in universal intrinsic
* suppress intrinsic on some function and platform
* add pure SW implementation of new universal intrinsics
* add test for new universal intrinsics
* core: prevent memory access after the end of buffer
* fix perf tests
2017-11-20 15:56:53 +03:00
gdkessler
2674c6b5e0
Merge pull request #10093 from gdkessler/gdal_image_read_fix_10089
...
Fix GDAL image decoding color problems identified by issue #10089 , by: (#10093 )
* Fix GDAL image decoding color problems identified by issue #10089 , by:
Fixing CV_8UC1 symbol, which should be CV_8UC3 for RGB GDAL color table images.
Fixing image.ptr<VecX>(row,col)[] to be (*image.ptr<VecX>(row,col))[] to correctly access VecX array elements, as ptr<VecX>() returns a pointer to the VecX, not the first element of VecX. This fixes the color problem with color table gif images, and avoids out-of-bounds memory access.
Respecting the color identification of raster bands provided by the GDAL image driver, and produce BGR or BGRA images. Note that color bands of images using the HSL, CMY, CMYK, or YCbCr color space are ignored, rather than converting them to BGR.
* When reading image files using the GDAL decoder, exit with an error if a color band is encountered that isn't used (eg. from CMYK or YCbCbr), rather than silently ignoring the band's data.
2017-11-20 15:07:24 +03:00
Wu Zhiwen
45d11dde57
dnn(ocl4dnn): add fusion support for Power activation and eltwise add
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-20 14:58:53 +08:00
Jonathan Viney
b1d208891b
Merge pull request #10011 from jviney:master
...
Fix build with FFmpeg master. Some deprecated APIs have been removed. (#10011 )
* Fix build with FFmpeg master.
* ffmpeg: update AVFMT_RAWPICTURE support removal
2017-11-18 21:08:41 +03:00
Alexander Alekhin
017a38a54e
Merge pull request #10108 from mshabunin:fix-eigen-stride
2017-11-17 20:09:08 +00:00
Alexander Alekhin
b45403ed75
Merge pull request #10102 from seiko2plus:coreVsxPacksFix
2017-11-17 19:01:38 +00:00
Maksim Shabunin
f50ec229de
Eigen: fix Mat construction stride
2017-11-17 18:27:09 +03:00
Alexander Alekhin
3e33820ee5
Merge pull request #10104 from wzw-intel:fusion_debug
2017-11-17 13:57:36 +00:00
elenagvo
20c08eab73
change border type for medianBlur to BORDER_ISOLATED
2017-11-17 15:13:04 +03:00
Maksim Shabunin
eb136ebba6
Do not reset step for single-row Mat created on user data
2017-11-17 13:15:15 +03:00
elenagvo
1a9d8e9447
test for GaussianBlur with border
2017-11-17 13:15:15 +03:00
Alexander Alekhin
0eb1bfa874
Merge pull request #10099 from alalek:fix_js_tests
2017-11-17 09:16:34 +00:00
Wu Zhiwen
394101d6ed
dnn(ocl4dnn): Fix relu fusion bug
...
Incorrect type of negative_slope result in this bug.
Also and OCL test for darknet to validate this patch.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-11-17 16:21:56 +08:00
Sayed Adel
56bda8917d
core:vsx Fix vec_packs in gcc-5
2017-11-16 21:54:56 +00:00
Maksim Shabunin
e730048f69
Merge pull request #10078 from justdoitqd:master
2017-11-16 15:20:44 +00:00
Maksim Shabunin
751cee8e67
Merge pull request #9907 from seiko2plus:vsxFixesImproves
2017-11-16 15:20:16 +00:00
Jcrist99
0608227e10
Merge pull request #9698 from abratchik:parse.doxygen
...
Support @deprecated tag in java wrappers (#9698 )
2017-11-16 16:48:12 +03:00
Alexander Alekhin
2210ed4fdd
js: fix tests (qunit -> node-qunit)
2017-11-16 15:00:33 +03:00
Alexander Alekhin
65061948af
Merge pull request #10091 from alalek:build_python_reduce_global_symbols
2017-11-16 10:17:39 +00:00
Wu Zhiwen
88e6daa315
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>
2017-11-16 13:09:57 +08:00
Alexander Alekhin
baff521b63
imgproc(Canny): eliminate unnecessary operations
...
drop manual loop unrolling:
- don't block compiler optimizations
- no effect on i5
2017-11-15 19:29:59 +00:00
Alexander Alekhin
3a0039d204
core(intrinsics): v_load_low
2017-11-15 16:04:18 +03:00
Alexander Alekhin
aa70199ce1
build: avoid exporting of unnecessary symbols from Python bindings
2017-11-15 13:21:35 +03:00
Alexander Alekhin
42f449880c
Merge pull request #10068 from paroj:fs_doc
2017-11-13 09:18:42 +00:00
Simon Guo
2610a47c89
core:ppc Fix 2 interleave logic errors in vsx_utils.hpp
...
When elements are 64 bits, the vec_st_interleave()/vec_ld_deinterleave()
doesn't interleave 4 elements correctly.
For vec_st_interleave(), following is saved into mem:
a0 b0 a1 b1 c0 d0 c1 d1
-> we expected:
a0 b0 c0 d0 a1 b1 c1 d1
for vec_ld_deinterleave(), following is loaded into a b c d for memory
string { 1 2 3 4 5 6 7 8 }:
a: 1 3
b: 2 4
c: 5 7
d: 6 8
-> we expected:
a: 1 5
b: 2 6
c: 3 7
d: 4 8
This patch corrects this behavior.
Signed-off-by: Simon Guo <wei.guo.simon@gmail.com>
2017-11-13 12:47:10 +08:00
Li Peng
55260a8d3c
reshape mat before doing computation in fc layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-11-13 09:29:50 +08:00
Suleyman TURKMEN
992a81dcaa
Update lsd.cpp
2017-11-11 22:26:44 +03:00
Florian Echtler
2e772510ea
Merge pull request #10050 from floe/android-studio-3.3.1
...
Add Android Mat constructor with support for native buffer (#10050 )
2017-11-10 19:35:32 +00:00
Alexander Alekhin
c6fb99357c
Merge pull request #10057 from LaurentBerger:ParaCalcError
2017-11-10 19:04:36 +00:00
Pavel Rojtberg
7190028b23
FileStorage: use copydoc to add base64 info to constructor
2017-11-10 13:06:36 +01:00
Alexander Alekhin
bafdc44d37
Merge pull request #10061 from Sahloul:dnn_torch_fix
2017-11-10 05:05:52 +00:00
Alexander Alekhin
1af16afb89
Merge pull request #10062 from alalek:gtest_show_params
2017-11-10 05:04:55 +00:00
LaurentBerger
b9cf65e905
Parallel version of calcError in statmodel
2017-11-09 21:29:06 +01:00
Alexander Alekhin
8a3a75cc16
Merge pull request #9882 from pengli:ocl4dnn
2017-11-09 18:54:43 +00:00
Alexander Alekhin
fbe18e80f6
ts: dump test parameters value
2017-11-09 19:11:49 +03:00
Hamdi Sahloul
06bda58a2c
DNN Torch - workaround when torch importer is disabled
2017-11-10 00:44:06 +09:00
Alexander Alekhin
e89ae986fa
Merge pull request #10053 from terfendail:intersectconvex_fix
2017-11-09 11:05:56 +00:00
Li Peng
8f99083726
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>
2017-11-09 15:59:39 +08:00
Vitaly Tuzov
0205238dca
Fix for intersectConvexConvex nested contours check
2017-11-08 20:27:07 +03:00
Fakabbir Amin
a0c658b012
Merge pull request #9979 from fakabbir:ImproveDoc
...
* Improve Documentation
Fixes Spelling Mistakes.
2017-11-08 16:55:48 +00:00
Suleyman TURKMEN
e51a8e047c
update grfmt_gdal.cpp
2017-11-08 17:47:43 +03:00
Alexander Alekhin
48ed769b18
Merge pull request #10036 from alalek:fix_ocl4dnn_invalid_kernel
2017-11-07 19:17:21 +00:00
Alexander Alekhin
bffe254a81
Merge pull request #10003 from sturkmen72:documentation_updates
2017-11-07 16:52:15 +00:00
Suleyman TURKMEN
63fb79b519
updates documentation and samples
2017-11-07 19:21:21 +03:00
Alexander Alekhin
97181a90ba
dnn(ocl4dnn/conv): bailout on missing kernel configuration
2017-11-07 17:02:17 +03:00
Alexander Alekhin
981009ac1f
Merge pull request #9999 from mshabunin:fix-gcc72-warnings
2017-11-07 13:37:25 +00:00
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
Iago Suárez
42d942e19c
Clearing data into the detect method of the class cv::LineSegmentDetectorImpl
2017-11-04 17:12:20 +01: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
Maksim Shabunin
184daa155f
Fixed minor issues reported by GCC 7.2
2017-11-03 18:06:39 +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
Dmitry Kurtaev
20a2dc6ac5
Fix multiple inputs models from Caffe.
...
Fixed Concat optimization.
2017-11-02 18:55:08 +03: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
Vitaly Tuzov
b9b553b8bc
Add more details to drawContour description
2017-11-01 16:01:12 +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
Sayed Adel
def444d99f
core: Several improvements to Power/VSX
...
- changed behavior of vec_ctf, vec_ctu, vec_cts
in gcc and clang to make them compatible with XLC
- implemented most of missing conversion intrinsics in gcc and clang
- implemented conversions intrinsics of odd-numbered elements
- ignored gcc bug warning that caused by -Wunused-but-set-variable in rare cases
- replaced right shift with algebraic right shift for signed vectors
to shift in the sign bit.
- added new universal intrinsics v_matmuladd, v_rotate_left/right
- avoid using floating multiply-add in RNG
2017-10-28 17:46:12 +00: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
Alexander Alekhin
9cdeb6dfbf
ocl: increase SURF stitching test tolerance
...
OpenCL SURF implementation is unstable
2017-10-26 13:03:44 +03:00
catree
f9aa411c92
Fix double definitions, correct comment.
2017-10-25 18:11:31 +02:00
Alexander Alekhin
436a1f72a5
dnn: fix sporadic crashes in getUMat()
...
Incorrect "total" buffer size calculated in StdMatAllocator::allocate() due wrong step values.
2017-10-25 18:07:05 +03:00
Vladislav Sovrasov
7e3e9144de
dnn: add an accuracy test for NMS
2017-10-25 13:40:56 +03:00
Vladislav Sovrasov
c704942b8a
dnn: add a documentation for NMS, fix missing experimantal namespace
2017-10-25 13:35:49 +03:00
Vladislav Sovrasov
acedb4a579
dnn: make NMS function public
2017-10-25 13:35:49 +03:00
Vitaly Tuzov
2eb61a4a99
AVX2 optimized implementation of FAST corner tracking migrated to separate file
2017-10-24 20:00:48 +03:00
Vitaly Tuzov
868ad16041
Python wrappers for Vec and Matx
2017-10-23 18:50:49 +03:00
Alexander Alekhin
21c8e6d02d
Merge tag '3.3.1'
2017-10-23 18:42:41 +03:00
Alexander Alekhin
a871f9e4f7
Merge branch 'update_version' into release
2017-10-23 18:41:12 +03:00
Rostislav Vasilikhin
fb5cd42c6b
enabled tests for fitEllipse since the issue is fixed
2017-10-23 16:28:49 +03:00
Dmitry Kurtaev
a36ebaecdc
PReLU layer for multidimensional input
2017-10-23 16:13:03 +03:00
Maksim Shabunin
bf418ba342
Merge pull request #9917 from alalek:ocl_cache_program_failures
2017-10-23 12:25:25 +00:00
Maksim Shabunin
be9767e014
Merge pull request #9919 from alalek:ocl_fix_macosx_invalid_options
2017-10-23 12:24:42 +00:00
Alexander Alekhin
9e9881aacc
ts(misc): support tables exporting in markdown format
...
basic support only (no symbol escapes/sanitizing)
2017-10-23 14:57:45 +03:00
Alexander Alekhin
734ea77c9a
ocl(macosx): fix CL_INVALID_BUILD_OPTIONS for gemm programs
...
MacOSX OpenCL compiler is very strict to whitespace issues
2017-10-23 13:56:11 +03:00
Alexander Alekhin
d96cac1341
ocl: cache program build failures
...
To prevent unnecessary compiler invocations
2017-10-23 13:46:56 +03:00
Suleyman TURKMEN
d1c5e79ec3
Update grfmt_gdal.cpp
2017-10-22 19:01:34 +03:00
blendin
08a5fe3661
Fix out of bounds write
2017-10-21 12:12:53 -07:00
Dmitry Kurtaev
410d44d67d
Binary data for batch normalization test from Torch
2017-10-20 12:01:42 +03:00
Igor Wodiany
d7cbe6e947
Add const to getViewerPose()
...
getViewerPose() doesn't modify an object of the class so it can be
made const. It also makes this method consistent with other getters
in the class as they are defined as const.
2017-10-19 22:05:49 +01:00
Vitaly Tuzov
ad051cdd99
Fixed CAP_PROP_FORMAT evaluation in case CvCaptureCAM_V4L returns CV_16U image
2017-10-19 20:51:00 +03:00
Maksim Shabunin
c97c1a2454
Merge pull request #9879 from alalek:fix_build
2017-10-18 14:49:44 +00:00
Alexander Alekhin
185faf99bd
ocl: simplify ocl::Timer interface
2017-10-18 16:01:21 +03:00
Dmitry Kurtaev
b903ff8992
Ceil mode from experimental version of Caffe, https://github.com/BVLC/caffe/pull/3057
2017-10-18 14:04:53 +03:00
Alexander Alekhin
3fd03964a3
fix code style
2017-10-18 13:08:01 +03:00
Vitaly Tuzov
8d5a5d5ceb
AVX2 optimizations for FAST corner tracking provided by Victoria Zhislina
2017-10-17 18:53:15 +03:00
Dmitry Kurtaev
a3a446c197
Output blobs shapes initialization in case of identity permutation (NCHW->NCHW)
2017-10-17 17:15:25 +03:00
Mattia Rizzolo
d026d7dcfb
Fix build for non-linux architectures but still glibc-based
...
Exampls of these are gnu/kfreebsd and gnu/hurd, both available as
unofficial Debian ports.
They don't define __linux__ (as they are non-linux…) but still define
__GLIBC__, so check on that.
Signed-off-by: Mattia Rizzolo <mattia@mapreri.org>
2017-10-17 00:45:27 +02:00
Alexander Alekhin
110af09bf9
Merge pull request #9853 from catree:fix_dnn_samples_python3
2017-10-16 16:18:22 +00:00
Alexander Alekhin
73af899b7c
Merge pull request #9860 from mshabunin:fix-static-9
2017-10-16 14:39:08 +00:00
Wu Zhiwen
2d8f2c2aea
dnn(ocl4dnn): add fusion support
...
ocl4dnn supports following fusion styles:
Conv + [BN] + [Scale] + [ReLU/PReLU]
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-10-16 19:18:36 +08:00
Maksim Shabunin
b066dd36ff
Fixed uninitialized class fields
2017-10-16 13:47:43 +03:00
Vadim Pisarevsky
1563300197
Merge pull request #9833 from tomoaki0705:universalMathFuncs
2017-10-16 10:46:56 +00:00
Vadim Pisarevsky
2914443685
Merge pull request #9848 from jet47:features2d-optional-flann-dep
2017-10-16 10:45:16 +00:00
Vadim Pisarevsky
2808bea7fa
Merge pull request #9857 from americast:mat_fix
2017-10-16 10:43:37 +00:00
Gregory Morse
d30a0c6f03
Merge pull request #9856 from GregoryMorse:patch-1
...
* Update OpenCVCompilerOptimizations.cmake
Neon not supported on MSVC ARM breaking build fix
* Update OpenCVCompilerOptimizations.cmake
Whitespace
* Update intrin.hpp
Many problems in MSVC ARM builds (at least on VS2017) being fixed in this PR now.
C:\Users\Gregory\DOCUME~1\MYLIBR~1\OPENCV~3\opencv\sources\modules\core\include\opencv2/core/hal/intrin.hpp(444): error C3861: '_tzcnt_u32': identifier not found
* Update hal_replacement.hpp
Passing variadic expansion in a macro to another macro does not work properly in MSVC and a famous known workaround is hereby applied. Discussion of it: https://stackoverflow.com/questions/5134523/msvc-doesnt-expand-va-args-correctly
Only needed the fix for ARM builds: TEGRA_ macros are used for cv_hal_ functions in the carotene library.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): warning C4003: not enough actual parameters for macro 'TEGRA_ADD'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2143: syntax error: missing ')' before ','
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2059: syntax error: ')'
* Update hal_replacement.hpp
All hal_replacement's using carotene\hal\tegra_hal.hpp TEGRA_ functions as macros preprocessed by variadic macros should be changed, identical as was done in core.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): warning C4003: not enough actual parameters for macro 'TEGRA_CVTBGRTOBGR'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): error C2059: syntax error: '=='
* Update OpenCVCompilerOptimizations.cmake
* Update hal_replacement.hpp
* Update hal_replacement.hpp
2017-10-16 12:12:35 +03:00
catree
22dece8146
Fix DNN samples for compatibility with Python 3.
...
Add PyInt_Check in pyopencv_dnn.hpp.
2017-10-15 20:24:56 +02:00
dtmoodie
4566105578
fixed non c++11 warnings.
2017-10-15 12:12:00 -04:00
Igor Wodiany
e2499e5b2f
Move vector_size_t and vector_vector_Mat
...
These two typdefs are not compiled when BUILD_opencv_dnn is set to
false, however there are other modules that uses these typedef so
it may cause build errors. Moving typedef to the python module
ensures they are always defined.
2017-10-14 19:06:15 +01:00
Sayan Sinha
60bcb16ca8
Fix typo in mat.hpp
2017-10-14 21:46:11 +05:30
Tomoaki Teshima
2a781bb616
remove raw SSE2/NEON implementation from mathfuncs.cpp
...
* replace the implementation by universal intrinsic
* make sure no degradation happens on ARM platform
2017-10-15 00:24:31 +09:00
James Perkins
4eb9f175a4
test_stereomatching.cpp: validate min disparity affect on valid ROI
2017-10-13 13:36:33 -07:00
Nickola
b2b56b6896
Fix Issue #9797 minEnclosingCircle from three points
...
and add test for only 3 pts
2017-10-13 19:26:54 +03:00
klchang
d4ef5bc16a
fix the possible bug for key mapping in Linux GTK library
2017-10-13 20:05:55 +08:00
Vladislav Vinogradov
26fe8bd4f2
made flann dependency for features2d optional
...
it will allow to build features2d even if flann module is not available
2017-10-13 14:59:39 +03:00
Alexander Alekhin
4857cae6ed
dnn: don't use "experimental_dnn_v1" namespace directly
2017-10-12 18:16:53 +03:00
Maksim Shabunin
1ba29cc95d
Merge pull request #9834 from mshabunin:mediasdk-win-support
2017-10-12 12:08:54 +00:00
Alexander Alekhin
df5b2224d7
Merge pull request #9829 from pengli:ocl4dnn
2017-10-12 11:26:20 +00:00
Alexander Alekhin
b0c6bd0a5b
build: resolve naming issue
2017-10-12 13:28:30 +03:00
Alexander Alekhin
4ae30ecdd9
Merge pull request #9838 from alalek:fix_ocl_world_build
2017-10-12 09:40:32 +00:00
Li Peng
937b8e4277
dnn(ocl4dnn): support log softmax in ocl4dnn
...
Signed-off-by: Li Peng <peng.li@intel.com>
2017-10-12 09:51:13 +08:00
Vadim Pisarevsky
e356ca2369
Merge pull request #9835 from sovrasov:blob_from_img_crop_opt
2017-10-11 17:18:40 +00:00
Vadim Pisarevsky
e955bcb872
Merge pull request #9824 from sturkmen72:upd_minEnclosingTriangle
2017-10-11 17:11:15 +00:00
Alexander Alekhin
88225eb65e
ocl: fix world compilation on Windows
2017-10-11 19:04:42 +03:00
Alexander Alekhin
024be9b8c9
Merge pull request #9818 from tz70s:issue#9570
2017-10-11 15:19:17 +00:00
Suleyman TURKMEN
29c186a022
Update min_enclosing_triangle.cpp
2017-10-11 17:48:19 +03:00
Suleyman TURKMEN
baf9e32af3
Update imgproc.hpp
2017-10-11 17:37:38 +03:00
Vadim Pisarevsky
8b168175ec
Merge pull request #9636 from dkurt:duplicate_lp_norm_layer
2017-10-11 13:36:14 +00:00
Maksim Shabunin
83655ba9be
MediaSDK video backend: Windows support
2017-10-11 16:33:37 +03:00
Vadim Pisarevsky
0873ebb9b0
Merge pull request #9820 from sovrasov:text_detector_dnn
2017-10-11 13:31:46 +00:00
Vadim Pisarevsky
5e82c98a9f
Merge pull request #9828 from berak:fix_c++17_9572
2017-10-11 13:31:18 +00:00
Vadim Pisarevsky
babd21c764
Merge pull request #9823 from alalek:dnn_halide_bypass_tbb_threads
2017-10-11 13:28:38 +00:00
Vladislav Sovrasov
47e1133e71
dnn: add crop flag to blobFromImage
2017-10-11 15:46:20 +03:00
Vladislav Sovrasov
f7175f5050
dnn: fix additional text boxes handling after the latest adaptations for TF
2017-10-11 14:04:48 +03:00
Vladislav Sovrasov
050916fd6b
dnn: modify priorBox layer
2017-10-11 11:43:50 +03:00
berak
ada753a54c
fix c++17 namsespace issues
2017-10-11 09:50:22 +02:00
Geoff McIver
b2d8e8c508
This statement was keeping HAAR cascades from leveraging opencl on nvidia devices. "localSize" on the featureEvaluator remains Size(0, 0) which sets the bool "use_ocl" to false. Adding this allows NVidia GPUs to leverage opencl HAAR Cascades
2017-10-11 09:32:38 +13:00
Suleyman TURKMEN
b2673a19cf
Updates min_enclosing_triangle.cpp
2017-10-10 23:23:36 +03:00
Dmitry Kurtaev
905a9dada2
Removed LPNormalize layer.
2017-10-10 20:38:55 +03:00
Alexander Alekhin
3935e13603
dnn(halide): don't compile Halide via parallel_for_()
...
To avoid problem with reduced stack size of inner threads.
2017-10-10 18:06:03 +03:00
Vadim Pisarevsky
af8ed9d09f
Merge pull request #9816 from opalmirror:fix_stereobm_mindisp_truncation_1
2017-10-10 14:23:02 +00:00
Vadim Pisarevsky
3562a05d90
Merge pull request #8940 from 678098:nonblocking_haar_detector_parallel_for
2017-10-10 13:51:40 +00:00
tz70s
6c1247b38c
fix#9570: implement mat ptr for generic types
...
The original template based mat ptr for indexing is not implemented,
add the similar implementation as uchar type, but cast to
user-defined type from the uchar pointer.
2017-10-10 21:46:49 +08:00
Vadim Pisarevsky
b7ff9ddcdd
Merge pull request #9705 from AlexeyAB:dnn_darknet_yolo_v2
2017-10-10 12:02:03 +00:00
Vadim Pisarevsky
0739f28e56
Merge pull request #9786 from LaurentBerger:Histo3d
2017-10-10 10:58:34 +00:00
Vadim Pisarevsky
046045239c
Merge pull request #9750 from dkurt:feature_dnn_tf_text_graph
2017-10-10 10:06:24 +00:00
Vadim Pisarevsky
7d55c09a9f
Merge pull request #9763 from seiko2plus:addVsxCore
2017-10-10 10:00:31 +00:00
Vadim Pisarevsky
0be1f4a573
Merge pull request #9811 from dkurt:prelu_with_shared_channels
2017-10-10 09:57:51 +00:00
Alexander Alekhin
bd6fb497bc
OpenCV version++
...
OpenCV 3.3.1
2017-10-10 12:29:57 +03:00
Alexander Alekhin
949ec486c5
experimental version++
2017-10-10 12:29:57 +03:00
James Perkins
2cfe29276e
fix StereoBM disparity map right margin truncation when minDisparities > 0
2017-10-09 14:51:36 -07:00
LaurentBerger
752f232335
It's done
2017-10-09 22:25:57 +02:00
Alexander Alekhin
3ae7515955
qt: fix non-world builds
2017-10-09 22:23:05 +03:00
AlexeyAB
ecc34dc521
Added DNN Darknet Yolo v2 for object detection
2017-10-09 21:08:44 +03:00
Dmitry Kurtaev
eabf728682
PReLU layer from Caffe
2017-10-09 20:30:37 +03:00
Alexander Alekhin
3010cc5971
js: skip 'utils' headers
2017-10-09 16:14:01 +03:00
Vadim Pisarevsky
bfb12acde6
Merge pull request #9792 from alalek:port_9776
2017-10-09 12:46:06 +00:00
Vadim Pisarevsky
44699c59b3
Merge pull request #9799 from alalek:ocl_program
2017-10-09 12:43:46 +00:00
Vadim Pisarevsky
fee87ea3f7
Merge pull request #9800 from alalek:fix_build_msvs2010
2017-10-09 12:33:08 +00:00
Vadim Pisarevsky
6a80834ed4
Merge pull request #9803 from wzw-intel:ocl_timer
2017-10-09 12:11:22 +00:00
Vadim Pisarevsky
593329401a
Merge pull request #9806 from mshabunin:fix-static-7
2017-10-09 12:09:55 +00:00
Maksim Shabunin
ef332dc550
Fixed and suppressed warnings produced by GCC 6.3.0
2017-10-09 13:52:07 +03:00
Alexander Alekhin
746d5f5021
Merge pull request #9790 from mevatron:patch-1
2017-10-09 10:46:50 +00:00
Maksim Shabunin
5a22d81fe5
Fixed warnings produced by static analyzer
2017-10-09 13:37:18 +03:00
Wu Zhiwen
dbe9ee0924
ocl: simplify ocl::Timer
...
Use clFinish to gurantee commands completed, instead of waiting for events.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2017-10-09 13:48:38 +08:00
Sayed Adel
4b968d1fe2
Added universal intrinsic for VSX
2017-10-09 00:32:41 +00:00
Sayed Adel
d077778074
Added support for VSX
2017-10-09 00:32:29 +00:00
Alexander Alekhin
e615fafe2d
build: fix MSVS2010
2017-10-08 23:32:22 +03:00
Dmitry Kurtaev
e4aa39f9e5
Text TensorFlow graphs parsing. MobileNet-SSD for 90 classes.
2017-10-08 22:25:29 +03:00
Alexander Alekhin
6be25727ec
ocl: refactor program compilation
2017-10-08 19:55:01 +03:00
Alexander Alekhin
04b4495493
ocl: define ProgramSource before program
...
no changes in code
2017-10-08 19:55:01 +03:00
Igor Wodiany
ffb9554787
Extract code from scalarToRawData
...
The same code was repeated several time for different data types, so
it was extracted as a templated function to improve maintability and
make a code more clear.
2017-10-07 19:46:45 +01:00
Igor Wodiany
b638aa74d7
Fix a memory leak in the Mat copying constructor
...
Exception may be rasied inside the body of a copying constructor after
refcount has been increased, and beacause in the case of the exception
destrcutor is never called what causes memory leak. This commit adds a
workaround that calls the release() function before the exception is
thrown outside the contructor.
2017-10-07 10:50:17 +03:00
mevatron
fdc4344acb
Small fix for using Qt 5.x with opencv_world
2017-10-06 16:03:39 -05:00
Vadim Pisarevsky
d25ee8a273
Merge pull request #9761 from Jazmann:ellipseFitAMS&Direct
2017-10-06 14:35:42 +00:00
Vadim Pisarevsky
21bd834a59
Merge pull request #9772 from dkurt:fix_caffe_eltwise_and_fc_layers
2017-10-06 13:47:54 +00:00
Vadim Pisarevsky
b969d86415
Merge pull request #9787 from dkurt:feature_dnn_resize_nearest_neighbor
2017-10-06 13:46:50 +00:00
Vadim Pisarevsky
fe58b58937
Merge pull request #9778 from dkurt:dnn_colorization
2017-10-06 11:48:05 +00:00
Vadim Pisarevsky
87595a6b3a
Merge pull request #9779 from Lightricks:feature/assetslibrary-remove-link
2017-10-06 11:45:36 +00:00
Dmitry Kurtaev
b9f94c9315
Nearest neighbor resize layer
2017-10-06 14:33:26 +03:00
Dmitry Kurtaev
e268606e26
Grayscale colorization model ( https://github.com/richzhang/colorization ) test.
2017-10-06 09:33:41 +03:00
Yaron Inger
0d979a741b
videoio: remove AssetsLibrary dependency.
...
The entire AssetsLibrary framework is deprecated since iOS 8.0. The code
used in the camera example code can use UIKit to save videos to the
camera instead, which allows to avoid linking with PhotoKit instead to
prevent increasing the iOS deployment target.
2017-10-05 20:22:56 +03:00
Vadim Pisarevsky
5f6ce6f4b0
Merge pull request #9762 from dkurt:fix_tensorflow_split_layer
2017-10-05 10:51:49 +00:00
Dmitry Kurtaev
ad8bbaf008
Multidimensional eltwise layer.
...
Fixed fully-connected layer axis.
2017-10-04 14:01:44 +03:00
Peter J. Stieber
5669ee815b
Replace private.cuda.hpp with conditional include of cuda_fp16.h.
2017-10-03 17:47:52 -07:00
Dmitry Kurtaev
2a21c10837
Fix TensorFlow split layer
2017-10-02 22:44:42 +03:00
Jasper Shemilt
800da724a3
Fix Transposed eigenvals and vecs. Didn't notice at first
2017-10-02 17:56:08 +01:00
Jasper Shemilt
0136711cf4
Adds fitEllipseAMS to imgproc: The Approximate Mean Square (AMS) proposed by Taubin 1991.
...
Adds fitEllipseDirect to imgproc: The Direct least square (Direct) method by Fitzgibbon1999.
New Tests are included for the methods.
fitEllipseAMS Tests
fitEllipseDirect Tests
Comparative examples are added to fitEllipse.cpp in Samples.
2017-10-02 16:38:41 +01:00
Vadim Pisarevsky
49afb28738
Merge pull request #9744 from sturkmen72:Update_HOGDescriptor_Documentation
2017-10-02 14:50:46 +00:00
Alexander Alekhin
ab748188b1
Merge pull request #9596 from paroj:circle_board_params
2017-10-02 14:47:21 +00:00
pengli
e340ff9c3a
Merge pull request #9114 from pengli:dnn_rebase
...
add libdnn acceleration to dnn module (#9114 )
* import libdnn code
Signed-off-by: Li Peng <peng.li@intel.com>
* add convolution layer ocl acceleration
Signed-off-by: Li Peng <peng.li@intel.com>
* add pooling layer ocl acceleration
Signed-off-by: Li Peng <peng.li@intel.com>
* add softmax layer ocl acceleration
Signed-off-by: Li Peng <peng.li@intel.com>
* add lrn layer ocl acceleration
Signed-off-by: Li Peng <peng.li@intel.com>
* add innerproduct layer ocl acceleration
Signed-off-by: Li Peng <peng.li@intel.com>
* add HAVE_OPENCL macro
Signed-off-by: Li Peng <peng.li@intel.com>
* fix for convolution ocl
Signed-off-by: Li Peng <peng.li@intel.com>
* enable getUMat() for multi-dimension Mat
Signed-off-by: Li Peng <peng.li@intel.com>
* use getUMat for ocl acceleration
Signed-off-by: Li Peng <peng.li@intel.com>
* use CV_OCL_RUN macro
Signed-off-by: Li Peng <peng.li@intel.com>
* set OPENCL target when it is available
and disable fuseLayer for OCL target for the time being
Signed-off-by: Li Peng <peng.li@intel.com>
* fix innerproduct accuracy test
Signed-off-by: Li Peng <peng.li@intel.com>
* remove trailing space
Signed-off-by: Li Peng <peng.li@intel.com>
* Fixed tensorflow demo bug.
Root cause is that tensorflow has different algorithm with libdnn
to calculate convolution output dimension.
libdnn don't calculate output dimension anymore and just use one
passed in by config.
* split gemm ocl file
split it into gemm_buffer.cl and gemm_image.cl
Signed-off-by: Li Peng <peng.li@intel.com>
* Fix compile failure
Signed-off-by: Li Peng <peng.li@intel.com>
* check env flag for auto tuning
Signed-off-by: Li Peng <peng.li@intel.com>
* switch to new ocl kernels for softmax layer
Signed-off-by: Li Peng <peng.li@intel.com>
* update softmax layer
on some platform subgroup extension may not work well,
fallback to non subgroup ocl acceleration.
Signed-off-by: Li Peng <peng.li@intel.com>
* fallback to cpu path for fc layer with multi output
Signed-off-by: Li Peng <peng.li@intel.com>
* update output message
Signed-off-by: Li Peng <peng.li@intel.com>
* update fully connected layer
fallback to gemm API if libdnn return false
Signed-off-by: Li Peng <peng.li@intel.com>
* Add ReLU OCL implementation
* disable layer fusion for now
Signed-off-by: Li Peng <peng.li@intel.com>
* Add OCL implementation for concat layer
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* libdnn: update license and copyrights
Also refine libdnn coding style
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Signed-off-by: Li Peng <peng.li@intel.com>
* DNN: Don't link OpenCL library explicitly
* DNN: Make default preferableTarget to DNN_TARGET_CPU
User should set it to DNN_TARGET_OPENCL explicitly if want to
use OpenCL acceleration.
Also don't fusion when using DNN_TARGET_OPENCL
* DNN: refine coding style
* Add getOpenCLErrorString
* DNN: Use int32_t/uint32_t instread of alias
* Use namespace ocl4dnn to include libdnn things
* remove extra copyTo in softmax ocl path
Signed-off-by: Li Peng <peng.li@intel.com>
* update ReLU layer ocl path
Signed-off-by: Li Peng <peng.li@intel.com>
* Add prefer target property for layer class
It is used to indicate the target for layer forwarding,
either the default CPU target or OCL target.
Signed-off-by: Li Peng <peng.li@intel.com>
* Add cl_event based timer for cv::ocl
* Rename libdnn to ocl4dnn
Signed-off-by: Li Peng <peng.li@intel.com>
Signed-off-by: wzw <zhiwen.wu@intel.com>
* use UMat for ocl4dnn internal buffer
Remove allocateMemory which use clCreateBuffer directly
Signed-off-by: Li Peng <peng.li@intel.com>
Signed-off-by: wzw <zhiwen.wu@intel.com>
* enable buffer gemm in ocl4dnn innerproduct
Signed-off-by: Li Peng <peng.li@intel.com>
* replace int_tp globally for ocl4dnn kernels.
Signed-off-by: wzw <zhiwen.wu@intel.com>
Signed-off-by: Li Peng <peng.li@intel.com>
* create UMat for layer params
Signed-off-by: Li Peng <peng.li@intel.com>
* update sign ocl kernel
Signed-off-by: Li Peng <peng.li@intel.com>
* update image based gemm of inner product layer
Signed-off-by: Li Peng <peng.li@intel.com>
* remove buffer gemm of inner product layer
call cv::gemm API instead
Signed-off-by: Li Peng <peng.li@intel.com>
* change ocl4dnn forward parameter to UMat
Signed-off-by: Li Peng <peng.li@intel.com>
* Refine auto-tuning mechanism.
- Use OPENCV_OCL4DNN_KERNEL_CONFIG_PATH to set cache directory
for fine-tuned kernel configuration.
e.g. export OPENCV_OCL4DNN_KERNEL_CONFIG_PATH=/home/tmp,
the cache directory will be /home/tmp/spatialkernels/ on Linux.
- Define environment OPENCV_OCL4DNN_ENABLE_AUTO_TUNING to enable
auto-tuning.
- OPENCV_OPENCL_ENABLE_PROFILING is only used to enable profiling
for OpenCL command queue. This fix basic kernel get wrong running
time, i.e. 0ms.
- If creating cache directory failed, disable auto-tuning.
* Detect and create cache dir on windows
Signed-off-by: Li Peng <peng.li@intel.com>
* Refine gemm like convolution kernel.
Signed-off-by: Li Peng <peng.li@intel.com>
* Fix redundant swizzleWeights calling when use cached kernel config.
* Fix "out of resource" bug when auto-tuning too many kernels.
* replace cl_mem with UMat in ocl4dnnConvSpatial class
* OCL4DNN: reduce the tuning kernel candidate.
This patch could reduce 75% of the tuning candidates with less
than 2% performance impact for the final result.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
* replace cl_mem with umat in ocl4dnn convolution
Signed-off-by: Li Peng <peng.li@intel.com>
* remove weight_image_ of ocl4dnn inner product
Actually it is unused in the computation
Signed-off-by: Li Peng <peng.li@intel.com>
* Various fixes for ocl4dnn
1. OCL_PERFORMANCE_CHECK(ocl::Device::getDefault().isIntel())
2. Ptr<OCL4DNNInnerProduct<float> > innerProductOp
3. Code comments cleanup
4. ignore check on OCL cpu device
Signed-off-by: Li Peng <peng.li@intel.com>
* add build option for log softmax
Signed-off-by: Li Peng <peng.li@intel.com>
* remove unused ocl kernels in ocl4dnn
Signed-off-by: Li Peng <peng.li@intel.com>
* replace ocl4dnnSet with opencv setTo
Signed-off-by: Li Peng <peng.li@intel.com>
* replace ALIGN with cv::alignSize
Signed-off-by: Li Peng <peng.li@intel.com>
* check kernel build options
Signed-off-by: Li Peng <peng.li@intel.com>
* Handle program compilation fail properly.
* Use std::numeric_limits<float>::infinity() for large float number
* check ocl4dnn kernel compilation result
Signed-off-by: Li Peng <peng.li@intel.com>
* remove unused ctx_id
Signed-off-by: Li Peng <peng.li@intel.com>
* change clEnqueueNDRangeKernel to kernel.run()
Signed-off-by: Li Peng <peng.li@intel.com>
* change cl_mem to UMat in image based gemm
Signed-off-by: Li Peng <peng.li@intel.com>
* check intel subgroup support for lrn and pooling layer
Signed-off-by: Li Peng <peng.li@intel.com>
* Fix convolution bug if group is greater than 1
Signed-off-by: Li Peng <peng.li@intel.com>
* Set default layer preferableTarget to be DNN_TARGET_CPU
Signed-off-by: Li Peng <peng.li@intel.com>
* Add ocl perf test for convolution
Signed-off-by: Li Peng <peng.li@intel.com>
* Add more ocl accuracy test
Signed-off-by: Li Peng <peng.li@intel.com>
* replace cl_image with ocl::Image2D
Signed-off-by: Li Peng <peng.li@intel.com>
* Fix build failure in elementwise layer
Signed-off-by: Li Peng <peng.li@intel.com>
* use getUMat() to get blob data
Signed-off-by: Li Peng <peng.li@intel.com>
* replace cl_mem handle with ocl::KernelArg
Signed-off-by: Li Peng <peng.li@intel.com>
* dnn(build): don't use C++11, OPENCL_LIBRARIES fix
* dnn(ocl4dnn): remove unused OpenCL kernels
* dnn(ocl4dnn): extract OpenCL code into .cl files
* dnn(ocl4dnn): refine auto-tuning
Defaultly disable auto-tuning, set OPENCV_OCL4DNN_ENABLE_AUTO_TUNING
environment variable to enable it.
Use a set of pre-tuned configs as default config if auto-tuning is disabled.
These configs are tuned for Intel GPU with 48/72 EUs, and for googlenet,
AlexNet, ResNet-50
If default config is not suitable, use the first available kernel config
from the candidates. Candidate priority from high to low is gemm like kernel,
IDLF kernel, basick kernel.
* dnn(ocl4dnn): pooling doesn't use OpenCL subgroups
* dnn(ocl4dnn): fix perf test
OpenCV has default 3sec time limit for each performance test.
Warmup OpenCL backend outside of perf measurement loop.
* use ocl::KernelArg as much as possible
Signed-off-by: Li Peng <peng.li@intel.com>
* dnn(ocl4dnn): fix bias bug for gemm like kernel
* dnn(ocl4dnn): wrap cl_mem into UMat
Signed-off-by: Li Peng <peng.li@intel.com>
* dnn(ocl4dnn): Refine signature of kernel config
- Use more readable string as signture of kernel config
- Don't count device name and vendor in signature string
- Default kernel configurations are tuned for Intel GPU with
24/48/72 EUs, and for googlenet, AlexNet, ResNet-50 net model.
* dnn(ocl4dnn): swap width/height in configuration
* dnn(ocl4dnn): enable configs for Intel OpenCL runtime only
* core: make configuration helper functions accessible from non-core modules
* dnn(ocl4dnn): update kernel auto-tuning behavior
Avoid unwanted creation of directories
* dnn(ocl4dnn): simplify kernel to workaround OpenCL compiler crash
* dnn(ocl4dnn): remove redundant code
* dnn(ocl4dnn): Add more clear message for simd size dismatch.
* dnn(ocl4dnn): add const to const argument
Signed-off-by: Li Peng <peng.li@intel.com>
* dnn(ocl4dnn): force compiler use a specific SIMD size for IDLF kernel
* dnn(ocl4dnn): drop unused tuneLocalSize()
* dnn(ocl4dnn): specify OpenCL queue for Timer and convolve() method
* dnn(ocl4dnn): sanitize file names used for cache
* dnn(perf): enable Network tests with OpenCL
* dnn(ocl4dnn/conv): drop computeGlobalSize()
* dnn(ocl4dnn/conv): drop unused fields
* dnn(ocl4dnn/conv): simplify ctor
* dnn(ocl4dnn/conv): refactor kernelConfig localSize=NULL
* dnn(ocl4dnn/conv): drop unsupported double / untested half types
* dnn(ocl4dnn/conv): drop unused variable
* dnn(ocl4dnn/conv): alignSize/divUp
* dnn(ocl4dnn/conv): use enum values
* dnn(ocl4dnn): drop unused innerproduct variable
Signed-off-by: Li Peng <peng.li@intel.com>
* dnn(ocl4dnn): add an generic function to check cl option support
* dnn(ocl4dnn): run softmax subgroup version kernel first
Signed-off-by: Li Peng <peng.li@intel.com>
2017-10-02 15:38:00 +03:00
Pavel Rojtberg
629a06d9b6
calib3d: export parameters of CALIB_CB_CLUSTERING
2017-10-02 14:27:32 +02:00
Vadim Pisarevsky
f646f61dad
Merge pull request #9752 from alalek:eigenNonSymmetric
2017-10-02 11:51:13 +00:00
Vadim Pisarevsky
eca5906a75
Merge pull request #9746 from alalek:fix_msvs2017_warning
2017-10-02 11:15:48 +00:00
Suleyman TURKMEN
20c11d3b7b
Update HOGDescriptor documentation
2017-10-02 07:14:35 +03:00
berak
089aac61f3
imgcodecs: fix 4 reading channel bmp images
2017-10-01 15:32:55 +02:00
Alexander Alekhin
1f18282f04
build: fix MSVS2017 warning
2017-10-01 10:48:35 +00:00
Alexander Alekhin
529632f8d0
core: cv::eigenNonSymmetric() via EigenvalueDecomposition
2017-10-01 07:45:32 +00:00
Alexander Alekhin
69103a9fab
Merge pull request #9740 from tomoaki0705:universalArithm
2017-09-29 14:17:01 +00:00
Alexander Alekhin
a729f985fd
Merge pull request #9726 from blendin:fix_oob
2017-09-29 14:16:40 +00:00
Alexander Alekhin
d43087cafe
Merge pull request #9741 from alalek:stitching_test_update
2017-09-29 13:10:53 +00:00
Alexander Alekhin
0bf823e1eb
stitching(perf): update condition threshold
2017-09-29 14:33:13 +03:00
Alexander Alekhin
39ee07b8f6
test: clarify fail messages
2017-09-29 14:33:00 +03:00
Tomoaki Teshima
e187219699
use universal intrinsic in arithm.cpp
...
* remove raw NEON/SSE2 implementation as much as possible
* replace them to universal intrinsic in InRange/Compare/AddWeighted
2017-09-29 08:33:15 +09:00
Vadim Pisarevsky
5e93c82023
Merge pull request #9491 from dkurt:tf_lstm
2017-09-28 21:04:06 +00:00
Vadim Pisarevsky
a6d634b5b8
Merge pull request #9683 from terfendail:grects_weights
2017-09-28 14:02:12 +00:00
Vadim Pisarevsky
af8fc3e209
Merge pull request #9604 from alalek:ocl_kernel_profiling
2017-09-28 13:48:34 +00:00
Vadim Pisarevsky
22467599c4
Merge pull request #9692 from alalek:dnn_perf_net
2017-09-28 13:44:24 +00:00
Vadim Pisarevsky
68cc2e292d
Merge pull request #9734 from dkurt:fix_deconv_layer_kernel_layout
2017-09-28 11:42:57 +00:00
Vadim Pisarevsky
45365e4df1
Merge pull request #9691 from dkurt:padding_layer_refactoring
2017-09-28 11:34:28 +00:00
Tomoaki Teshima
139b32734e
Merge pull request #9714 from tomoaki0705:universalBilateral
...
imgproc: use universal intrinsic as much as possible (#9714 )
* use universal intrinsic as much as possible
* make SSE3 part as common as possible with universal intrinsic implementation
* put the reducing part out of the main loop
* follow the comment
* fix the typo
* use v_reduce_sum4
* follow the comment again
* remove all CV_SSE3 part from smooth.cpp
2017-09-28 12:30:22 +03:00
Alexander Alekhin
488d4df520
Merge pull request #9710 from savuor:ovx_harris_build_fix
2017-09-28 09:27:09 +00:00
Dmitry Kurtaev
6e593cd1f0
Swap dimensions of deconvolution kernel
2017-09-27 22:38:34 +03:00
Alexander Alekhin
55b7073aae
Merge pull request #9730 from yanlend:patch-1
2017-09-27 16:02:09 +00:00
Alexander Alekhin
0f0f5652fb
Merge pull request #9717 from alalek:fix_fma
2017-09-27 13:48:09 +00:00
Peter Fischer
332588fcee
Fix bug: non-maximum suppression for hough circle
...
The non-maximum suppression in the Hough accumulator incorrectly ignores maxima that extend over more than one cell, i.e. two neighboring cells both have the same accumulator value. This maximum is dropped completely instead of picking at least one of the entries. This frequently results in obvious circles being missed.
The behavior is now changed to be the same as for hough_lines.
See also https://github.com/opencv/opencv/issues/4440
2017-09-27 11:47:30 +02:00
blendin
c58152d94b
Fix out of bounds write
2017-09-26 23:04:01 -07:00
Deric Crago
a0d7cf89f2
Fixed 'boundary' spelling
2017-09-26 23:42:48 -04:00
Alexander Alekhin
7475d23fec
Merge pull request #9707 from woodychow:fix_undistortrectifymap_avx2
2017-09-26 16:42:47 +00:00
Alexander Alekhin
3dee92ec50
fix usage of CV_FMA3 macro
2017-09-26 17:23:54 +03:00
Alexander Alekhin
513c2b92a4
Merge pull request #9709 from savuor:softfloat_r3d
2017-09-26 11:16:42 +00:00
Dmitry Kurtaev
84cec17913
LSTM layer for TensorFlow importer
2017-09-26 12:59:36 +03:00
woody.chow
69d43e2997
[move sift.cpp] Remove unnecessary _mm256_round_ps
...
original commit: b5340f6428
2017-09-26 10:12:30 +09:00
woody.chow
ef8c919e3f
Minor optimization of initUndistortRectifyMapLine_AVX
2017-09-26 09:12:22 +09:00
Alexander Alekhin
d9107601c3
Merge pull request #9690 from tomoaki0705:universalSmooth
2017-09-25 19:42:06 +00:00
Alexander Alekhin
a08044d6f2
Merge pull request #8833 from terfendail:resizenn_perftest
2017-09-25 16:42:07 +00:00
Alexander Alekhin
aea25e7f90
Merge pull request #9676 from jrobble:fix_caffe_swaprb
2017-09-25 16:05:11 +00:00
Congxiang Pan
89b6e68e1e
Merge pull request #9466 from huningxin:js
...
GSoC 2017: Improve and Extend the JavaScript Bindings for OpenCV (#9466 )
* Initial support for build with emscripten
mkdir build_js
cd build_js
cmake -D CMAKE_TOOLCHAIN_FILE=/path/to/emsdk/emsdk-portable/emscripten/master/cmake/Modules/Platform/Emscripten.cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local ..
* Add js module
The output is build/bin/opencv_js.js
* Fix opencv2/calib3d.hpp not found issue
* Add module name
Usage:
var cv = cv();
* Add total memory as 128MB and allow growth
* Add compilation flags for emscripten
* Use EMSCRIPTEN build target
* Disable js module for non emscripten build
* Bind the preload file path to root
Usage:
face_cascade.load('haarcascade_frontalface_default.xml');
* add test folder
* fix test files
* Copy js module test to bin
* Support to run tests on Node.js
Fix tests to import cv Module when runtime is node.
Add tests.js to use qunit to auto run tests.
Modify umd wrapper to support Module is not defined.
Usage:
node tests.js
* Support UMD and file system
Wrap the opencv_js.js to opencv.js by UMD wrapper
Use emscripten file system API to load files instead of generating data file or
embedding them. It supports both browser and node.js usages.
* Fix incorrect module name in tests
* Add package.json to add dependence of qunit
* Add js_tutorials folder and a intro page of opencv.js
Enable BUILD_DOCS in CMakeLists.txt.
Add new folder of js_tutorials in folder opencv/doc.
Imitate the tutorials of OpenCV-Python to create a intro page of opencv.js and a setup guide
* Import and use binding gen from opencvjs project
* Modify the embindgen.py to pass the build and test
* Add classes and functions white list
* Consolidate hdr_parser.py (#31 )
Use hdr_parser.py of python module
Add js flag to support js binding generator.
* Use emscripten::vecFromJSArray for input vector param
Fix part of #23
* Fix test cases after #34
Fix #39
* Expose groupRectangles and CascadeClassifier.empty
* Add js highgui tutorials
add tutorials of imread&imshow and createTrackbar in doc/js_tutorials/js_gui folder
add interactive tutorial webpage for imread&imshow and createTrackbar in doc/js_tutorials/js_interactive_tutorials folder, and some images needed.
change doc/CMakeLists.txt to copy the interactive tutorial webpage and opencv.js to the tutorials' destination folder
* rm useless annotation in doc/CMakeLists.txt
* fix some nonstandard indentation and space
* add check if canvas is valid
* Expose BackgroundSubtractorMOG2
Fix #43
* Fix build of js doc
Limit copy_js_interactive_tutorials for doxygen build
Add dep to opencv.js
Fix #53
* Implement cv.imread & cv.imshow and insert interactive pages in tutorials (#55 )
* add helper.js
* delete ALL in add target copy_js_interactive_tutorials to avoid dependence error
* Insert interactive pages in tutorials
insert the old interactive pages in markdown by using \htmlonly and \endhtmlonly command.
delete the useless interactive page
rename js_interactive_tutorials to js_assets to put some images needed in
* fix the depends of the target doxygen
add opencv.js to depends and delete the useless target of copy_js_assets
* change filename helper.js to helpers.js
* disable button or trankbar before opencv.js is ready
* Expose CV_64F
Fix #65
* improve cv.imshow to display different types as native imshow
* add utils.js to reuse functions and update tutorials
* Make doxygen depend on bin/opencv.js
* Fix memory issue of matFromArray
Fix #37
* Merge pull request from ganwenyao/tutorial_18
* Add notes for ganwenyao/tutorial_18
* Modifying for ganwenyao/tutorial_18
* Change Mat constructor with data to 5 parameters
* Mat supports constructor with Scalar
Fix #60
* update cv.imread cause the memory issue of matFromArray has been fixed
* fix canvas name and default input image
* Expose cv::Moments
Fix #85
* Add -Wno-missing-prototypes for emscripten build
* fix canvas name
* add tutorial of video input and output
* Expose enums as emscripten consts
Fix #72
* update the tutorial to use Mat constructor with Scalar and change lena.jpg
* Exclude cv::Mat for vecFromJSArray
Fix #82
* Add unit tests for cv.moments
* Fix the unit tests.
* add checkbox and stop button
* add adapter.js to make sure compatibility fo video tutorials
* Support default parameters with function overloading
* modify enums to constants
* Use https URL for MathJax.js
Fix #109
* Comment out the debug print in embindgen.py
* Expose RotatedRect
Fix #96
* replace enum with constants and improve onload function
* delete some useless paras cause #105 fixed this
* Modify const name
* Modify Contour Properties
* tutorials for imgprc2 and objdec
* Expose more functions for img proc tutorials
Fix #76
* Expose polylines for video analysis tutorial
Fix #121
* Expose constants for default parameters of img proc tutorials
Fix #122
* Fix wrong parameter types of Mat.copyTo
Fix #87
* Support default parameters of mat.convertTo
Fix #123
* Support default parameters for external constructors
Fix #131
* Revert "Expose polylines for video analysis tutorial"
This reverts commit 3ce7615652e510d30e3c0014706ac38c98883189.
Fix #121
* Support cv.minMaxLoc
Fix #127
* Expose cv.minEnclosingCircle
Fix #126
* Add video analysis tutorials
add three video tutorials, Meanshift and Camshift, Optical Flow Background Subtraction
add cup.mp4 and box.mp4 for demo in tutorials
* improve image processing tutorials
* repalce console.warn with throw to throw exception
* add try-catch to throw exception in code demo
* Change mat.size() return value to JS Array object
Fix #140
* add a note about different channels order between canvas and native opencv
* add a note about how to capture video from video files
* Binding cv.Scalar to JS array
Fix #147
* Add JS cv.Scalar object into helpers.js
* Update Install OpenCV-JavaScript tutorial page
Fix #44
* Update the OpenCV-JavaScript introduction page
Fix #44
* add cv.VideoCapture and read() function
* set the size of the hidden canvas same as the video
* Add Using OpenCV-JavaScript tutorial page
Fix #44
* fix some bad code style
* Update tutorials after 8/2 sync meeting
Changes include:
- Use OpenCV.js name instead of OpenCV-JavaScript
- Put using OpenCV.js ahead of build OpenCV.js
- Refine usage and introduction page
- Muted the video in tutorials
* Fix a typo in introduction page
* use cv.VideoCapture and its read() function to read video
* replace OpenCV-JavaScript with OpenCV.js
* Use onload of async script in js_usage tutorial
* add more info about mat.data
* Change Size to value_object
* Integrate Moh and Sajjad's editing into introduction page
* Change Point to value_object
* Change Rect to value_object with helper object
* Add helper objects for Point and Size
* Change RotatedRect to value_object with helpers
* Change MinMaxLoc and Circle to value_object
* Change TermCriteria to value_object
* Fix core_bindings.cpp for MinMaxLoc and Circle
* Remove unused types
* Change meanShift and CamShift to return Rect
* Change methods of RotatedRect to static
* Change mat.data from methods to property
Fix #75 and #77
* support img id and element in cv.imread
* Change mat.size to property and add mat.step
Fix #163
* Add matFromArray and matFromImageData as JS helpers
Fix #79 , #78
* Lower camel case for Mat element getters
Fix #81
* Mat.getRoiRect and tests
Fix #86
* Support type for Mat.ptr
Fix #83
* Name changing of Mat element getters
'getUcharAt` -> 'ucharAt'
* fix code style and args names
* Fix helpers.js due to cv.Mat API update
* Fix opencv.js usage tutorial
* Fix a typo of js_setup
* Change Moments to value_object
* Add Range as value_object
Fix #171
* Support Mat.diag and Mat.isContinous
Fix #84 and #89
* Support Mat.setTo
Fix #88
* Apply edits to js_intro
* Apply edits to js_usage
* Apply edits to js_setup
* update tutorials to apply data type change
* Modify tutorials
* add core tutorials
* delete MatVector elements and delete useless set operation
* add tutorials_objdec_camera
* Add instructions for WebAssembly
* apply tech writer's feedbacks into tutorials
* Organize white list by modules
* Change size to method and bind to MatExpr.size()
Fix #177
* improve tutorials
* Modify core tutorials
* add params list and explanations for OpenCV.js functions
* remove face_profile from Face Detection in Video Capture
* Add demos link
* Change Gui to GUI
* Update js_intro based on Moh and Sajjad's edits
* Fixup for 3.3.0 rebase
* Update js_intro per Moh's suggestion
* Update contributors list per Moh's idea
* add adapter.js in video_display tutorial
* Change Mat.getRoiRect to Mat.roi
Fix #194
* Remove unnecessary files for test
Fix #192
* Licenses updated to UC BSD 3-Clause
* Apply OpenCV coding style for C++ files
* Add OpenCV license for python and js files
* Fix coding style issue in helpers.js
* Remove unused test_commons.js
* Fix coding style of test_imgproc.js
* Fix coding style of test_mat.js
* Fix space before semicolon
* Fix coding style of test_objdetect.js
* Fix coding style of tests.js
* Fix coding style of test_utils.js
* Fix coding style of test_video.js
* Fix failures of node.js tests
* Add eslint rule config and fix eslint errors
* Add eslint config for js/src and fix eslint errors
* Clean up the opencv.js dependencies
Fix #186
* Fix build issue for python generator
* Fix doxygen buildbot failure
* delete trailing whitespace, blank line at EOF and replace tab with space
* Fix tutorial_js_root reference issue for non opencv.js build
* replace the file with small size
* Initial commit of build_js.py
* Move the js build configurations to build script
* Add wasm build support
* Update OpenCV.js build tutorial by using script
* Fix global var issue in tests
* Add a README.md for build_js.py
* Copy the haar cascade files from data dir for tutorials
* Not use memory init file
* Disable debug print for modules/js/CMakeLists.txt
* Check files when build done
* Fix image name in js_gradients tutorial
* Fix image load issue in js_trackbar tutorial
* Find the opencv source directory via relative path by default
* Make the cmake args based on build_doc option
* Fix a typo in js_setup.markdown
* Fix make failure issue on config generated by build_js.py
* Eliminate js branch of hdr_parser.py
* Extract examples from js_basic_ops tutorial
* Fix coding style of utils.js
* Improve examples error handling
Handle:
1. opencv.js loading errors
2. script errors (Error)
3. cv::Exception
Fix #217
* Add enable_exception option into build_js.py
* Support print exception for exception catching disabled build
* Extract example from js_usage tutorial
* Avoid copying .eslintrc.json when building doc
Fix #223
* Revert to use onload as opencv.js ready event
* Use 4 spaces indention for js examples
* embed html in tutorials with iframe tag
* Revert to use onload as opencv.js ready event
* Extract examples from js_video_display tutorial
* Implement Utils object
* modify core imgprc and face_detection tutorials
* Fix examples of js_gui tutorials
* Fix coding style of utils.js
* Modify tutorials
* Extract example from js_face_detection_camera tutorial
* Disable new-cap check in eslint
* Extract examples from js_meanshift tutorial
* Extract examples from video tutorials
* Remove new-cap declaration and update grammer in comments
* Change textarea width to 100 to align with eslint config
* Fix printError issue when opencv.js loading fails
* Remove BUILD_opencv_js dependency for doc build
Fix #213
* Expose cv::getBuildInformation
* Dump opencv build info when opencv.js loaded for live examples
* Make the button to stand out in js live examples
Fix #235
* Style for disabled button
* Add js_imgproc_camera.html example
* Fix coding style of imgproc_camera example
* Add js_imgproc_camera tutorial
* Remove link to opencv.js demos
* doc: copy opencv.js on build, use absolute paths for assets
* doc: reuse existed file box.mp4
2017-09-25 16:52:07 +03:00
Rostislav Vasilikhin
62c4cf3ac6
fixed build of OpenVX Harris
2017-09-25 15:58:09 +03:00
Rostislav Vasilikhin
945706a8e8
softfloat f64_sqrt bug fix
2017-09-25 15:52:56 +03:00
Alexander Alekhin
78788e1efb
dnn(perf): update perf tests
2017-09-25 15:32:37 +03:00
Alexander Alekhin
08b5dc64af
imgcodecs(tiff): drop legacy code
...
Drop code under *undefined* HAVE_TIFF
(violates several policies, like a way to turn off tiff support)
2017-09-24 22:36:17 +00:00
Tomoaki Teshima
e932160a8d
replace raw SSE2/NEON implementation with universal intrinsic
2017-09-22 23:43:05 +09:00
vipinanand4
39e742765a
Merge pull request #9618 from vipinanand4:goodFeaturesToTrack_added_gradiantSize
...
Added gradiantSize param into goodFeaturesToTrack API (#9618 )
* Added gradiantSize param into goodFeaturesToTrack API
Removed hardcode value 3 in goodFeaturesToTrack API, and
added new param 'gradinatSize' in this API so that user can
pass any gradiant size as 3, 5 or 7.
Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
Signed-off-by: Nilaykumar Patel<nilay.nilpat@gmail.com>
Signed-off-by: Prashanth Voora <prashanthx85@gmail.com>
* fixed compilation error for java test
Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
* Modifying code for previous binary compatibility and fixing other warnings
fixed ABI break issue
resolved merged conflict
compilation error fix
Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
Signed-off-by: Patel, Nilaykumar K <nilay.nilpat@gmail.com>
2017-09-22 14:04:43 +00:00
jrobble
c67ad49378
Set swapRB to false in Caffe tests and examples.
2017-09-22 09:58:48 -04:00
Alexander Alekhin
b8af7c5f86
ts: update perf test
...
- use GTest tuple definitions instead of std::tr1
- use "const static" for cv::Size contants to reduce generated binary code
- PERF_TEST_P() violates TEST_P() original semantic. Added PERF_TEST_P_() macro
2017-09-22 14:43:27 +03:00
Vadim Pisarevsky
3f794cd951
Merge pull request #9147 from sovrasov:phase_corr_fix
2017-09-22 10:32:16 +00:00
Dmitry Kurtaev
222149b9c6
Refactored Padding layer
2017-09-22 12:39:00 +03:00
Vitaly Tuzov
22fcbaed64
Added performance test for nearest neighbor resize
2017-09-22 12:34:58 +03:00
Vadim Pisarevsky
a0d3d11470
Merge pull request #9649 from dkurt:dnn_reshape_transpose
2017-09-21 19:25:58 +00:00
Vadim Pisarevsky
f1695bdc38
Merge pull request #9678 from tomoaki0705:universalFastScore
2017-09-21 19:12:30 +00:00
Vitaly Tuzov
9a70fd0123
Disabling reset of 'weights' array for reject level mode of groupRectangles function.
2017-09-21 18:21:50 +03:00
Dmitry Kurtaev
17a85b16fc
Remove reorder_dims attribute of Reshape layer
2017-09-21 16:42:03 +03:00
Rostislav Vasilikhin
cc547e8260
Bit-exact version of Luv2RGB_b ( #9470 )
...
* lab_tetra squashed
* initial version is almost written
* unfinished work
* compilation fixed, to be debugged
* Lab test removed
* more fixes
* Luv2RGBinteger: channels order fixed
* Lab structs removed
* good trilinear interpolation added
* several fixes
* removed Luv2RGB interpolations, XYZ tables; 8-cell LUT added
* no_interpolate made 8-cell
* interpolations rewritten to 8-cell, minor fixes
* packed interpolation added for RGB2Luv
* tetra implemented
* removing unnecessary code
* LUT building merged
* changes ported to color.cpp
* minor fixes; try to suppress warnings
* fixed v range of Luv
* fixed incorrect src channel number
* minor fixes
* preliminary version of Luv2RGBinteger is done
* Luv2RGB_b is in progress
* XYZ color constants converted to softfloat
* Luv test: precision fixed
* Luv bit-exactness test added
* warnings fixed
* compilation fixed, error message fixed
* Luv check is limited to [0-2,0-2,0-2] by XYZ
* L->Y generation moved to LUT
* LUTs added for up and vp of Luv2RGB_b
* still works
* fixed-point is done, works at maxerr 2
* vectorized code is done, 2x slower than original
* perf improved by 10%
* extra comments removed
* code moved to color.cpp
* test_lab.cpp updated
* minor refactoring
* test added for Luv2RGB
* OCL Luv2RGB_b: XYZ are limited to [0, 2]; docs updated
* Luv2RGB_b rewritten to universal intrinsics
* test_lab.cpp moved to luv_tetra branch
2017-09-21 14:20:45 +03:00
Vadim Pisarevsky
bb679f978d
Merge pull request #9653 from dkurt:thresh_16u
2017-09-21 10:57:46 +00:00
Vadim Pisarevsky
2ad27f5757
Merge pull request #9673 from dkurt:feature_dnn_tensorflow_defun
2017-09-21 10:55:25 +00:00
Tomoaki Teshima
bf718b0865
use universal intrinsic in FAST
2017-09-21 18:28:15 +09:00
Vadim Pisarevsky
e70b75b51a
Merge pull request #8820 from woodychow:multithread_sift_findScaleSpaceExtrema
2017-09-20 12:03:25 +00:00
Dmitry Kurtaev
bdd8cc697a
Import wrapped Dropout subgraphs from TensorFlow
2017-09-20 13:30:25 +03:00
Alexander Alekhin
e5890fc92a
ocl: fix build
2017-09-19 15:34:36 +03:00
Alexander Alekhin
1283d62e49
ocl: Kernel::runProfiling()
2017-09-19 15:34:35 +03:00
Alexander Alekhin
d9ab31490c
ocl: profiling queue
2017-09-19 15:32:15 +03:00
Alexander Alekhin
6a5298a532
Merge pull request #9664 from tomoaki0705:fixBuildVS2013
2017-09-19 12:25:18 +00:00
Adam Rankin
fb8143d55d
Using environment variable to store capture options ( #9292 )
...
* Using environment variable to store options parsed by av_dict_parse_string(ENV{OPENCV_FFMPEG_CAPTURE_OPTIONS}, ";", "|")
* Adding missing mandatory flags parameter
* Guarding against missing function via LIBAVUTIL version
* Code review fixes
Copy/paste error due to coder mistake reverted
Proper version checking for LIBAVUTIL_BUILD
2017-09-19 13:29:43 +03:00
Vadim Pisarevsky
fd20529686
Merge pull request #9657 from alalek:ocl_global_size_adjustment
2017-09-19 10:19:45 +00:00
Vadim Pisarevsky
92deccbf41
Merge pull request #9654 from savuor:seamlessclone
2017-09-19 10:16:37 +00:00
Tomoaki Teshima
48c4bea57c
fix build on Visual Studio 2013 and earlier
2017-09-19 19:08:23 +09:00
Alexander Alekhin
2e68f89225
ocl: update kernel global size adjustment
...
Prevents 10000x1 => 10000x8 transformation after getContinuousSize() call
2017-09-18 19:04:46 +03:00
Dmitry Kurtaev
fa109b94d9
Update 16UC thresholding
2017-09-18 18:34:45 +03:00
Arvid Piehl Lauritsen Böttiger
ca245e995a
Added support for thresholding CV_16U images.
2017-09-18 15:34:37 +03:00
Vadim Pisarevsky
0624411875
Merge pull request #9624 from nilaykumarpatel:Feature2d_getDefaultName
2017-09-18 10:34:35 +00:00
Vadim Pisarevsky
f7df5dd32c
Merge pull request #9305 from dkurt:public_dnn_importer_is_deprecated
2017-09-18 09:35:35 +00:00
Vadim Pisarevsky
70c5d69640
Merge pull request #9310 from r2d3:svm_parallel
2017-09-18 09:32:41 +00:00
Vadim Pisarevsky
e012ccda4a
Merge pull request #9517 from dkurt:tf_mobilenet
2017-09-18 09:31:19 +00:00
Vadim Pisarevsky
f4136679ea
Merge pull request #9551 from ChristofKaufmann:MultiChannelMask
2017-09-18 09:28:34 +00:00
Vadim Pisarevsky
3358b8910b
Merge pull request #9591 from dkurt:feature_dnn_caffe_importer_fp16
2017-09-18 09:26:23 +00:00
Vadim Pisarevsky
73298ea875
Merge pull request #9642 from saskatchewancatch:psnr-checks
2017-09-18 09:24:03 +00:00
Dmitry Kurtaev
bd8e6b7e14
Make external cv::dnn::Importer usage is deprecated
2017-09-18 08:52:36 +03:00
Nishant Arora
37ba1d6f2d
Merge pull request #9599 from whizzzkid:master
...
Incorrect Naming (#9599 )
* Resolved #9544
* This is a better fix
* This should be good.
2017-09-17 19:24:43 +00:00
Christof Kaufmann
7ec59fc097
Revert changes of mean and meanStdDev
2017-09-17 21:00:28 +02:00
RAJ NATARAJAN
0e44ad5543
Removed unnecessary assertion
2017-09-16 19:55:45 -07:00
Vadim Pisarevsky
4196543cd5
Merge pull request #9313 from dkurt:dnn_perf_test
2017-09-16 19:39:23 +00:00
RAJ NATARAJAN
6da62f56fa
Add some useful input assertions to PSNR function
...
Input arrays must be depth CV_8U and of identical size.
2017-09-15 23:36:58 -06:00
Alexander Alekhin
99fae8146f
Merge pull request #9626 from T0ny0:fisheye_fix_
2017-09-15 20:29:39 +00:00
Tony0
2f0036c918
remove assignments in expressions
2017-09-15 22:45:17 +03:00
Alexander Alekhin
9dea296241
Merge pull request #9458 from csukuangfj:fix-doc
2017-09-15 19:35:01 +00:00
Alexander Alekhin
2566ef3515
Merge pull request #9526 from sturkmen72:update_documentation
2017-09-15 18:47:06 +00:00
Dmitry Kurtaev
d891e9b1d8
Layers for MobileNet from TensorFlow
2017-09-15 20:17:30 +03:00
Dmitry Kurtaev
8646d5fb84
FP16 Caffe models import and export
2017-09-15 18:06:34 +03:00
stalin18
d343a58580
removed unnecessary line
2017-09-15 17:09:21 +03:00
stalin18
ed3d2cd122
fixed unnecessary reconstruction in seamlessclone
...
fixed unnecessary reconstruction in seamlessclone by using only the
required rectangular area in input images
2017-09-15 17:09:21 +03:00
Vadim Pisarevsky
6bf8fe815d
Merge pull request #9384 from dkurt:torch_split
2017-09-15 13:05:05 +00:00
Vadim Pisarevsky
a391871cce
Merge pull request #9301 from dkurt:dnn_npy
2017-09-15 12:42:02 +00:00
Vadim Pisarevsky
41b23fde9f
Merge pull request #9524 from dkurt:dnn_torch_openface
2017-09-15 12:38:12 +00:00
Vadim Pisarevsky
48cc1b351d
Merge pull request #9560 from sovrasov:undistort_stop_criteria
2017-09-15 12:34:16 +00:00
Vadim Pisarevsky
5707304777
Merge pull request #9633 from saskatchewancatch:psnr-doc
2017-09-15 12:26:34 +00:00
Vadim Pisarevsky
cb0d695984
Merge pull request #9616 from dkurt:feature_dnn_tf_importer_atrous_conv
2017-09-15 10:24:05 +00:00
Vadim Pisarevsky
d60de63fa0
Merge pull request #9623 from dkurt:hotfix_disable_ssd_cpu_halide_test
2017-09-15 10:21:44 +00:00
saskatchewancatch
a90a93b454
i9629 - Added actual documentation for cv::PSNR function
2017-09-14 18:20:00 -06:00
Patel, Nilaykumar K
6857870412
Overloading getDefaultName method for Feature2D and its child classes
...
Signed-off-by: Vipin Anand <anand.vipin@gmail.com>
Signed-off-by: Prashanth Voora <prashanthx85@gmail.com>
Signed-off-by: Patel, Nilaykumar K <nilay.nilpat@gmail.com>
2017-09-14 23:22:18 +05:30
dtmoodie
3c229aa2eb
async bugfix
...
upload winsize and iters as members to prevent async out of scope issues
2017-09-14 14:48:49 +00:00
Tony0
62df5e8c8b
fisheye: fix initUndistortRectifyMap()
2017-09-14 14:57:21 +03:00
Rostislav Vasilikhin
4435ec5f26
Bit-exact version of RGB2Luv_b ( #9226 )
...
* Imgproc_ColorLab_Full.accuracy test fixed
* Lab and Luv tests: rewritten, constants explained
* CV_ColorCvtBaseTest: added methods for 8u implementations
* Lab2RGB_b: bit-exactness enabled for all modes; non-vectorized code fixed to comply with vectorized
* srgb support added
* XYZ constants made softdouble
* bit-exact tests written for Lab
* ColorLab_full test fixed
* reverted: no 8u convertors for CV_ColorCvtBaseTest
* added checksum-based test for Lab bit-exactness
* extra declarations removed
* Lab test fix: stop at first mismatch
* test info output improved
* error message fixed
* lab_tetra squashed
* initial version is almost written
* unfinished work
* compilation fixed, to be debugged
* Lab test removed
* more fixes
* Luv2RGBinteger: channels order fixed
* Lab structs removed
* good trilinear interpolation added
* several fixes
* removed Luv2RGB interpolations, XYZ tables; 8-cell LUT added
* no_interpolate made 8-cell
* interpolations rewritten to 8-cell, minor fixes
* packed interpolation added for RGB2Luv
* tetra implemented
* removing unnecessary code
* LUT building merged
* changes ported to color.cpp
* minor fixes; try to suppress warnings
* fixed v range of Luv
* fixed incorrect src channel number
* minor fixes
* preliminary version of Luv2RGBinteger is done
* Luv2RGB_b is in progress
* XYZ color constants converted to softfloat
* Luv test: precision fixed
* Luv bit-exactness test added
* warnings fixed
* compilation fixed, error message fixed
* test_lab.cpp removed
2017-09-14 14:51:27 +03:00
Vladislav Sovrasov
b421ebef86
imgproc: slightly change the signature of undistortPoints overload
2017-09-14 12:19:40 +03:00
Vladislav Sovrasov
701c7e5685
imgproc: add stop criteria tuning in undistortPoints
2017-09-14 11:43:54 +03:00
Dmitry Kurtaev
0ce7c33bc8
Torch's Concat and ConcatTable doesn't use Split layer
2017-09-14 09:26:57 +03:00
Dmitry Kurtaev
7dc6b1d7d4
Layers for OpenFace face recognition network
2017-09-14 09:11:31 +03:00
Dmitry Kurtaev
58b890b9f7
Dilated convolution import from TensorFlow
2017-09-13 18:44:14 +03:00
Dmitry Kurtaev
6639348c5e
Disable SSD on CPU Halide test
2017-09-13 18:19:54 +03:00
Vadim Pisarevsky
9640bbe76d
Merge pull request #9592 from alalek:issue_9589
2017-09-13 14:57:49 +00:00
Vadim Pisarevsky
32bb71d686
Merge pull request #9603 from alalek:ocl_device_extensions
2017-09-13 14:43:36 +00:00
Vadim Pisarevsky
822d33d64b
Merge pull request #9374 from savuor:test_lab_bit_exact
2017-09-13 14:39:04 +00:00
Suleyman TURKMEN
d547c6b1a2
documentation improvement
2017-09-13 17:24:59 +03:00
Vadim Pisarevsky
f1aa180a40
Merge pull request #9574 from saskatchewancatch:i9482
2017-09-13 13:59:43 +00:00
Vadim Pisarevsky
8c7f19850f
Merge pull request #9576 from dkurt:feature_dnn_tf_importer_fp16
2017-09-13 13:57:38 +00:00
Vadim Pisarevsky
622318aeae
Merge pull request #9561 from dkurt:fix_8693
2017-09-13 13:34:49 +00:00
Vadim Pisarevsky
b8b5d83ad0
Merge pull request #9566 from alalek:python_signatures
2017-09-13 13:32:05 +00:00
Vadim Pisarevsky
93c3f20deb
Merge pull request #9569 from dkurt:test_dnn_ssd_halide
2017-09-13 13:29:50 +00:00
Vadim Pisarevsky
258b13f2e0
Merge pull request #9600 from StevenPuttemans:fix_9583
2017-09-13 13:27:04 +00:00
Vadim Pisarevsky
42cd061af0
Merge pull request #9581 from sovrasov:rtree_disable_cv
2017-09-13 13:20:52 +00:00
Rostislav Vasilikhin
18ca3d1e62
error message fixed
2017-09-12 20:05:58 +03:00
Rostislav Vasilikhin
2457bfc1e3
test info output improved
2017-09-12 17:16:30 +03:00
Rostislav Vasilikhin
f6a165d10f
Lab test fix: stop at first mismatch
2017-09-12 17:16:30 +03:00
Rostislav Vasilikhin
92093a6e6c
extra declarations removed
2017-09-12 17:16:30 +03:00
Rostislav Vasilikhin
f1e8aa70a0
added checksum-based test for Lab bit-exactness
2017-09-12 17:16:30 +03:00
Rostislav Vasilikhin
d25344c257
reverted: no 8u convertors for CV_ColorCvtBaseTest
2017-09-12 17:16:30 +03:00
