Alexander Alekhin [Wed, 22 Aug 2018 14:38:51 +0000 (17:38 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 22 Aug 2018 14:38:05 +0000 (14:38 +0000)]
Merge pull request #12275 from alalek:fix_build_dnn_inf_engine
Alexander Alekhin [Wed, 22 Aug 2018 13:04:40 +0000 (16:04 +0300)]
dnn(build): fix CV_Assert() usage
Alexander Alekhin [Wed, 22 Aug 2018 12:18:53 +0000 (12:18 +0000)]
Merge pull request #12272 from alalek:fix_build_static_analysis
Alexander Alekhin [Wed, 22 Aug 2018 11:03:12 +0000 (14:03 +0300)]
build: fix build with defined CV_STATIC_ANALYSIS
Alexander Alekhin [Wed, 22 Aug 2018 09:49:35 +0000 (09:49 +0000)]
Merge pull request #12268 from cv3d:fix/cuda/meanShiftSegmentation
Hamdi Sahloul [Tue, 21 Aug 2018 05:46:00 +0000 (14:46 +0900)]
Closes #6349 - a bug in cuda::meanShiftSegmentation
Alexander Alekhin [Tue, 21 Aug 2018 15:26:06 +0000 (15:26 +0000)]
Merge pull request #12267 from alalek:dnn_unstable_tests
Jiri Horner [Tue, 21 Aug 2018 14:08:27 +0000 (16:08 +0200)]
Merge pull request #12248 from hrnr:video_remove_ransac
* video: remove duplicate RANSAC code
* remove RANSAC code video module. The module now uses RANSAC estimators from calib3d.
* deprecate estimateRigidTransform
* replace internal usage of deprecated estimateRigidTransform
* remove from wrappers
* replace usage in shape module. shape module now links to calib3d instead of video module.
* reprecate also C API version
* remove cvEstimateRigidTransform
* supress deprecated warnings in estimateRigidTransform test
* the function is now deprecated
Alexander Alekhin [Tue, 21 Aug 2018 13:11:24 +0000 (16:11 +0300)]
dnn(test): mark unstable OpenCL tests
Alexander Alekhin [Tue, 21 Aug 2018 13:07:44 +0000 (13:07 +0000)]
Merge pull request #12266 from mshabunin:fix-windows-ie-build
Alexander Alekhin [Tue, 21 Aug 2018 12:47:29 +0000 (12:47 +0000)]
Merge pull request #12262 from sivaraam:v4l2_mainloop
Alexander Alekhin [Tue, 21 Aug 2018 12:47:08 +0000 (12:47 +0000)]
Merge pull request #12256 from alalek:core_intrin_fp16_fix
Alexander Alekhin [Tue, 21 Aug 2018 12:46:35 +0000 (12:46 +0000)]
Merge pull request #12219 from alalek:fix_assert_messages
Maksim Shabunin [Tue, 14 Aug 2018 12:39:32 +0000 (15:39 +0300)]
Fixed windows build with InferenceEngine
Kaartic Sivaraam [Mon, 20 Aug 2018 16:41:41 +0000 (22:11 +0530)]
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.
Alexander Alekhin [Tue, 21 Aug 2018 10:12:14 +0000 (10:12 +0000)]
Merge pull request #12263 from doctorcolinsmith:3.4
Colin Smith [Mon, 20 Aug 2018 21:10:54 +0000 (14:10 -0700)]
Add export macro for ios conversion functions
Alexander Alekhin [Mon, 20 Aug 2018 16:29:39 +0000 (19:29 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 20 Aug 2018 10:54:03 +0000 (13:54 +0300)]
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
Alexander Alekhin [Mon, 20 Aug 2018 16:22:06 +0000 (16:22 +0000)]
Merge pull request #12258 from savuor:fix/trace_fname_slash
Rostislav Vasilikhin [Mon, 20 Aug 2018 14:16:54 +0000 (17:16 +0300)]
fixed filename slash processing
Alexander Alekhin [Mon, 20 Aug 2018 13:53:27 +0000 (13:53 +0000)]
Merge pull request #12242 from alalek:fix_12236
Alexander Alekhin [Mon, 20 Aug 2018 13:47:41 +0000 (13:47 +0000)]
Merge pull request #12255 from csukuangfj:patch_5
Alexander Alekhin [Mon, 20 Aug 2018 08:46:57 +0000 (08:46 +0000)]
Merge pull request #12254 from csukuangfj:patch_4
Kuang Fangjun [Mon, 20 Aug 2018 07:52:18 +0000 (15:52 +0800)]
fix a typo.
Kuang Fangjun [Mon, 20 Aug 2018 07:49:35 +0000 (15:49 +0800)]
fix an error in the formula for cv::cornerSubPix
Alexander Alekhin [Fri, 17 Aug 2018 13:45:31 +0000 (16:45 +0300)]
ml: don't use "getSubVector()" with 2D matrix
It is designed for 1D vectors only
Alexander Alekhin [Sat, 18 Aug 2018 20:45:47 +0000 (20:45 +0000)]
Merge pull request #12235 from alalek:core_perf_scalar_tests
pasbi [Fri, 17 Aug 2018 15:53:09 +0000 (17:53 +0200)]
Merge pull request #12240 from pasbi:pfm_fix
* fixed 64-float pfm auto conversion
* removed trailing whitespace
Alexander Alekhin [Fri, 17 Aug 2018 15:26:09 +0000 (15:26 +0000)]
Merge pull request #12232 from cv3d:bugfix/cudafeatures2d/python_wrapper
Alexander Alekhin [Fri, 17 Aug 2018 14:03:01 +0000 (14:03 +0000)]
Merge pull request #12172 from alalek:core_move_const_table
Alexander Alekhin [Fri, 17 Aug 2018 14:02:20 +0000 (14:02 +0000)]
Merge pull request #12136 from sturkmen72:update_documentation
Alexander Alekhin [Fri, 17 Aug 2018 13:42:11 +0000 (16:42 +0300)]
ml(test): test different samples layout of TrainData
Suleyman TURKMEN [Thu, 2 Aug 2018 18:22:58 +0000 (21:22 +0300)]
Update documentation and samples
Hamdi Sahloul [Thu, 16 Aug 2018 13:57:55 +0000 (22:57 +0900)]
Avoid multi-inheritance in the cuda::features2d classes
Alexander Alekhin [Wed, 15 Aug 2018 16:32:58 +0000 (19:32 +0300)]
core(perf): fix addScalar test
keep the same type for passed Scalar values
Alexander Alekhin [Thu, 16 Aug 2018 16:26:27 +0000 (16:26 +0000)]
Merge pull request #12220 from sturkmen72:update_seamless_cloning
Alexander Alekhin [Thu, 16 Aug 2018 16:03:10 +0000 (16:03 +0000)]
Merge pull request #12233 from mshabunin:fix-world-install-headers
Alexander Alekhin [Thu, 16 Aug 2018 16:02:39 +0000 (16:02 +0000)]
Merge pull request #12222 from NCBee:master
Maksim Shabunin [Thu, 16 Aug 2018 14:16:02 +0000 (17:16 +0300)]
Fixed core headers installation in world builds
Alexander Alekhin [Thu, 16 Aug 2018 12:29:10 +0000 (12:29 +0000)]
Merge pull request #12228 from tomoaki0705:fixTypoCalib3d
Alexander Alekhin [Thu, 16 Aug 2018 12:06:29 +0000 (15:06 +0300)]
imgproc(test): refactor test_intersection.cpp
don't use legacy test API
Alexander Alekhin [Thu, 16 Aug 2018 11:31:29 +0000 (14:31 +0300)]
imgproc: fix rotatedRectangleIntersection()
Bahram Dahi [Wed, 15 Aug 2018 17:47:54 +0000 (10:47 -0700)]
imgproc(tests): intersetion calculation of RotatedRect
Tomoaki Teshima [Thu, 16 Aug 2018 10:11:40 +0000 (19:11 +0900)]
fix typo
Alexander Alekhin [Thu, 16 Aug 2018 09:51:13 +0000 (09:51 +0000)]
Merge pull request #12224 from cv3d:improvments/CUDA_detection
Hamdi Sahloul [Thu, 16 Aug 2018 07:38:47 +0000 (16:38 +0900)]
Avoid detecting dublicate CUDA archs
Hamdi Sahloul [Thu, 16 Aug 2018 06:43:52 +0000 (15:43 +0900)]
Bugfix: Detect CUDA archs for Windows
Alexander Alekhin [Thu, 16 Aug 2018 05:16:58 +0000 (05:16 +0000)]
Merge pull request #12216 from hirocob:fix-typo
Suleyman TURKMEN [Mon, 6 Aug 2018 16:45:01 +0000 (19:45 +0300)]
Update seamless_cloning
Hiro Kobayashi [Wed, 15 Aug 2018 07:57:36 +0000 (16:57 +0900)]
Fix a typo in the tutorial
Alexander Alekhin [Wed, 15 Aug 2018 11:55:47 +0000 (14:55 +0300)]
core: repair CV_Assert() messages
Multi-argument CV_Assert() is accessible via CV_Assert_N() (with malformed messages).
Alexander Alekhin [Tue, 14 Aug 2018 14:29:17 +0000 (14:29 +0000)]
Merge pull request #12156 from cv3d:master
Alexander Alekhin [Tue, 14 Aug 2018 10:53:12 +0000 (10:53 +0000)]
Merge pull request #12205 from dkurt:dnn_update_tf_face_detection
Dmitry Kurtaev [Tue, 14 Aug 2018 10:16:23 +0000 (13:16 +0300)]
Update face detection network in samples
Alexander Alekhin [Mon, 13 Aug 2018 15:57:57 +0000 (18:57 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 13 Aug 2018 15:40:42 +0000 (15:40 +0000)]
Merge pull request #12203 from berak:fix_interactive_calibration
Dmitry Kurtaev [Mon, 13 Aug 2018 13:46:04 +0000 (16:46 +0300)]
UINT8 face detection network using Intel's Inference Engine backend
pasbi [Mon, 13 Aug 2018 10:14:12 +0000 (12:14 +0200)]
Merge pull request #12192 from pasbi:pfm
* created new decoder and encoder for PFM
pfm file format stores binary RGB or grayscale float images.
* added test for pfm codec
* replaced large with short licence header
* little/big-endian-check is now compile time
* fixed width/height confusion, improved big/little endian recognition, fixed scaling issue and Improved signature check
* adapted tests to handle float images well
* removed data-dependency: lena.pfm
the lena image is now loaded is pam and converted to pfm.
* fixed bug in endianess detection macro
* Added endianess detection for android and win
* removed fancy endianess detection
endianess detection will be implemented in cmake scripts soonish.
* fixed minor warnings
* fixed stupid elif defined bug
* silenced some implicit cast warnings
* replaced std::to_string with std::stringstream solution
std::to_string variant did not build on android.
* replaced new endianess macros with existing ones
* improved readability
berak [Mon, 13 Aug 2018 09:17:32 +0000 (11:17 +0200)]
apps: fix interactive calibration
Alexander Alekhin [Fri, 10 Aug 2018 14:15:39 +0000 (14:15 +0000)]
Merge pull request #12191 from weblucas:patch-2
Alexander Alekhin [Fri, 10 Aug 2018 14:14:16 +0000 (14:14 +0000)]
Merge pull request #12128 from dkurt:dnn_fix_12066
Lucas Teixeira [Thu, 9 Aug 2018 21:43:39 +0000 (23:43 +0200)]
Fix a Typo in the comment of asift.py
Alexander Alekhin [Wed, 8 Aug 2018 20:51:25 +0000 (20:51 +0000)]
Merge pull request #12174 from alalek:dnn_move_range_ostream_operator
Alexander Alekhin [Wed, 8 Aug 2018 20:50:54 +0000 (20:50 +0000)]
Merge pull request #12184 from alalek:issue_12163
Alexander Alekhin [Tue, 7 Aug 2018 15:49:05 +0000 (18:49 +0300)]
core: move const tables outside of dispatched code
To avoid duplicates in binaries
Alexander Alekhin [Wed, 8 Aug 2018 14:09:12 +0000 (17:09 +0300)]
imgproc(cvtColor): slightly improve error messages
Do not try to process empty inputs.
Alexander Alekhin [Wed, 8 Aug 2018 13:30:32 +0000 (13:30 +0000)]
Merge pull request #12178 from alalek:ipp_cvtColor_12176
Alexander Alekhin [Wed, 8 Aug 2018 10:49:16 +0000 (13:49 +0300)]
imgproc(cvtColor): temporary disable IPP for 8U GRAY2BGR mode
Details 12176
Alexander Alekhin [Tue, 7 Aug 2018 17:09:27 +0000 (20:09 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 7 Aug 2018 17:07:19 +0000 (17:07 +0000)]
Merge pull request #12173 from gdemarcq:Decolor_corrections
Alexander Alekhin [Tue, 7 Aug 2018 16:33:13 +0000 (19:33 +0300)]
core: cv::Range() ostream write operator
remove from DNN module headers
yom [Tue, 7 Aug 2018 15:52:05 +0000 (17:52 +0200)]
photo: Decolor corrections
* Keep image aspect ratio in resize called in grad_system and
weak_order
* Bug correction in loop inside Decolor::gradvector
Alexander Alekhin [Tue, 7 Aug 2018 16:01:42 +0000 (16:01 +0000)]
Merge pull request #12169 from berak:photo_decolor
Alexander Alekhin [Tue, 7 Aug 2018 15:11:05 +0000 (18:11 +0300)]
core(test): extra tests/fixes for merge/split (#12171)
* core(test): merge hang test
* core(merge/split): fix intrin optimization
Maksim Shabunin [Tue, 7 Aug 2018 13:15:19 +0000 (13:15 +0000)]
Merge pull request #12159 from zarelaky:master
berak [Tue, 7 Aug 2018 13:14:22 +0000 (15:14 +0200)]
photo: avoid resizing a const Mat in decolor()
zarelaky [Mon, 6 Aug 2018 14:11:23 +0000 (22:11 +0800)]
Update cap_gstreamer.cpp
fixed call open(int id) failed
Maksim Shabunin [Tue, 7 Aug 2018 12:09:38 +0000 (12:09 +0000)]
Merge pull request #12161 from alalek:cache_dump_neighbor_directories_for_cleanup
Maksim Shabunin [Tue, 7 Aug 2018 12:09:13 +0000 (12:09 +0000)]
Merge pull request #12166 from berak:fix_mjpeg_decoder
berak [Tue, 7 Aug 2018 09:43:37 +0000 (11:43 +0200)]
videoio: check iterator in mjpeg_encoder.cpp
Hamdi Sahloul [Mon, 6 Aug 2018 11:46:46 +0000 (20:46 +0900)]
Support Python binding for CUDA functionalities
Alexander Alekhin [Mon, 6 Aug 2018 20:39:23 +0000 (20:39 +0000)]
Merge pull request #12162 from alalek:fix_intrin_12146
Alexander Alekhin [Mon, 6 Aug 2018 19:25:18 +0000 (19:25 +0000)]
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 ...
}
```
Alexander Alekhin [Mon, 6 Aug 2018 15:48:25 +0000 (18:48 +0300)]
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
Vadim Pisarevsky [Mon, 6 Aug 2018 14:50:28 +0000 (14:50 +0000)]
Merge pull request #12157 from allnes:detect_qr_code
Alexander Nesterov [Sun, 5 Aug 2018 17:55:15 +0000 (14:55 -0300)]
Update binarization
Vadim Pisarevsky [Mon, 6 Aug 2018 14:40:50 +0000 (14:40 +0000)]
Merge pull request #12125 from dkurt:dnn_mobilenet_ppn
Vadim Pisarevsky [Mon, 6 Aug 2018 14:37:46 +0000 (14:37 +0000)]
Merge pull request #12130 from dkurt:dnn_ie_mvn
Dmitry Kurtaev [Thu, 2 Aug 2018 08:12:22 +0000 (11:12 +0300)]
Enable reshape-as-shape layer from TensorFlow
Vadim Pisarevsky [Mon, 6 Aug 2018 14:28:58 +0000 (14:28 +0000)]
Merge pull request #12082 from dkurt:dnn_ie_faster_rcnn
Vadim Pisarevsky [Mon, 6 Aug 2018 14:26:37 +0000 (14:26 +0000)]
Merge pull request #12121 from maver1:amatyuko/sse2_convert_with_saturation_fix
Alexander Alekhin [Sun, 5 Aug 2018 14:47:01 +0000 (14:47 +0000)]
Merge pull request #12050 from alalek:dnn_ocl_avoid_memory_access_violation
Alexander Alekhin [Sat, 4 Aug 2018 13:48:34 +0000 (13:48 +0000)]
Merge pull request #12134 from mshabunin:add-yuv420-v4l
Alexander Alekhin [Sat, 4 Aug 2018 13:14:22 +0000 (13:14 +0000)]
Merge pull request #12097 from xsacha:master
Alexander Alekhin [Sat, 4 Aug 2018 13:02:21 +0000 (16:02 +0300)]
Merge pull request #12135 from tompollok:3.4
imgproc: update cornerSubPix documentation
CYTing1998 [Fri, 3 Aug 2018 17:08:30 +0000 (01:08 +0800)]
Merge pull request #12093 from CYTing1998:update_issue
* I have updated the requirements of reporting issues inside ISSUE_TEMPLATE.md
Alexander Alekhin [Fri, 3 Aug 2018 17:07:17 +0000 (17:07 +0000)]
Merge pull request #12120 from alalek:core_test_intrin_dispatched
Alexander Alekhin [Fri, 3 Aug 2018 16:52:26 +0000 (16:52 +0000)]
Merge pull request #12123 from allnes:detect_qr_code