Alexander Alekhin
1b53a4fccc
Merge pull request #11669 from csukuangfj:fix-11668
2018-06-02 20:48:46 +00:00
Fangjun Kuang
4bb220bb90
fix #11668 .
2018-06-02 16:17:32 +08:00
Alexander Alekhin
0f298a4203
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-28 11:22:55 +00:00
Alexander Alekhin
06c1890639
Merge pull request #11607 from dkurt:dnn_scale_shift_layer
2018-05-28 18:19:22 +00:00
Alexander Alekhin
89230fa45b
Merge pull request #11605 from alalek:fix_build_10963
2018-05-28 18:18:40 +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
3c24e76018
Merge pull request #11592 from catree:remove_java_toBufferedImage
2018-05-26 17:29:48 +00:00
Alexander Alekhin
4384036108
Merge pull request #11576 from alalek:avoid_copyTo_with_getMat
2018-05-25 16:52:58 +00:00
catree
adef31097d
Use directly HighGui.toBufferedImage().
2018-05-25 16:23:42 +02: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
Alexander Alekhin
8a17ae29b9
Merge pull request #11580 from dkurt:dnn_fix_tf_ssd
2018-05-24 18:28:41 +00:00
Alexander Alekhin
6e4f82d9da
Merge pull request #11583 from catree:add_tutorial_imgproc_java_python2
2018-05-24 18:28:14 +00:00
catree
4c1c3147d9
Add Java and Python code for the following imgproc tutorials: Affine Transformations, Histogram Equalization, Histogram Calculation, Histogram Comparison, Back Projection.
2018-05-24 01:11:28 +02:00
Alexander Alekhin
2db12e8986
Merge pull request #11582 from alalek:use_mat_empty_instead_of_size
2018-05-23 20:43:36 +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
Alexander Alekhin
cf4f6d412e
interactive-calibration: use empty() method instead of checking dimension size
2018-05-23 18:26:21 +03: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
Dmitry Kurtaev
3346a7ac0a
Fix batch normalization fusion from TensorFlow's SSDs
2018-05-23 16:49:31 +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
Alexander Alekhin
6c06fcee61
Merge pull request #11572 from nglee:dev_fixNppStreamHandlerDtor
2018-05-23 09:40:05 +00: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
5e68f35500
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-22 19:02:01 +03: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
573e790107
Merge pull request #11558 from alalek:issue_11552
2018-05-22 14:19:13 +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
Alexander Alekhin
e1b96b6d82
Merge pull request #11563 from alalek:dnn_text_test_threshold
2018-05-22 13:05:23 +00:00
Alexander Alekhin
af5f40a80e
Merge pull request #11543 from catree:add_tutorial_imgproc_java_python
2018-05-22 12:26:34 +00: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