platform/upstream/opencv.git
6 years agoMerge pull request #12319 from dkurt:dnn_enable_ie_tests
Alexander Alekhin [Tue, 28 Aug 2018 12:50:31 +0000 (12:50 +0000)]
Merge pull request #12319 from dkurt:dnn_enable_ie_tests

6 years agoMerge pull request #12323 from alalek:android_ndk17_support
Alexander Alekhin [Tue, 28 Aug 2018 12:09:13 +0000 (12:09 +0000)]
Merge pull request #12323 from alalek:android_ndk17_support

6 years agoandroid: NDK17 support
Alexander Alekhin [Mon, 27 Aug 2018 21:06:42 +0000 (21:06 +0000)]
android: NDK17 support

tested with NDK 17b (17.1.4828580)

6 years agoMerge pull request #12193 from alalek:fix_vaapi_sample
Alexander Alekhin [Mon, 27 Aug 2018 20:56:19 +0000 (20:56 +0000)]
Merge pull request #12193 from alalek:fix_vaapi_sample

6 years agoMerge pull request #12286 from logic1988:master
Alexander Alekhin [Mon, 27 Aug 2018 19:05:23 +0000 (19:05 +0000)]
Merge pull request #12286 from logic1988:master

6 years agoEnable more deep learning tests using Intel's Inference Engine backend
Dmitry Kurtaev [Mon, 27 Aug 2018 12:45:44 +0000 (15:45 +0300)]
Enable more deep learning tests using Intel's Inference Engine backend

6 years agoMerge pull request #12306 from berak:python_nmsboxes
Alexander Alekhin [Sat, 25 Aug 2018 16:35:00 +0000 (16:35 +0000)]
Merge pull request #12306 from berak:python_nmsboxes

6 years agoMerge pull request #12308 from StrangeTcy:patch-1
Alexander Alekhin [Sat, 25 Aug 2018 16:32:32 +0000 (16:32 +0000)]
Merge pull request #12308 from StrangeTcy:patch-1

6 years ago`CV_Assert`s changed
Maxim Smirnov [Sat, 25 Aug 2018 11:52:27 +0000 (14:52 +0300)]
`CV_Assert`s changed

Some `CV_Assert`s changed to `CV_Assert_N`s according to https://github.com/opencv/opencv/issues/12304

6 years agopython: add support for NMSBoxes
berak [Fri, 24 Aug 2018 06:22:07 +0000 (08:22 +0200)]
python: add support for NMSBoxes

6 years agoMerge pull request #12298 from berak:java_matofrotatedrect
Alexander Alekhin [Fri, 24 Aug 2018 15:54:27 +0000 (15:54 +0000)]
Merge pull request #12298 from berak:java_matofrotatedrect

6 years agojava: change MatOfRotatedRect to CV_32FC5
berak [Fri, 24 Aug 2018 11:46:38 +0000 (13:46 +0200)]
java: change MatOfRotatedRect to CV_32FC5

6 years agoMerge pull request #12243 from dkurt:dnn_tf_mask_rcnn
Dmitry Kurtaev [Fri, 24 Aug 2018 11:47:32 +0000 (14:47 +0300)]
Merge pull request #12243 from dkurt:dnn_tf_mask_rcnn

* Support Mask-RCNN from TensorFlow

* Fix a sample

6 years agoMerge pull request #12295 from alalek:cmake_gphoto_off_by_default
Alexander Alekhin [Fri, 24 Aug 2018 09:10:44 +0000 (09:10 +0000)]
Merge pull request #12295 from alalek:cmake_gphoto_off_by_default

6 years agoMerge pull request #12274 from alalek:fix_10945
Alexander Alekhin [Fri, 24 Aug 2018 08:30:52 +0000 (08:30 +0000)]
Merge pull request #12274 from alalek:fix_10945

6 years agoMerge pull request #12126 from alalek:reproducer_12121
Alexander Alekhin [Fri, 24 Aug 2018 08:08:17 +0000 (08:08 +0000)]
Merge pull request #12126 from alalek:reproducer_12121

6 years agoMerge pull request #12287 from berak:java_matofrotatedrect
Alexander Alekhin [Fri, 24 Aug 2018 07:03:13 +0000 (07:03 +0000)]
Merge pull request #12287 from berak:java_matofrotatedrect

6 years agoMerge pull request #12291 from cv3d:fix/cuda_pow
Alexander Alekhin [Thu, 23 Aug 2018 20:58:48 +0000 (23:58 +0300)]
Merge pull request #12291 from cv3d:fix/cuda_pow

6 years agoCloses #12281 - a bug in cuda::pow with negative base values
Hamdi Sahloul [Thu, 23 Aug 2018 13:50:36 +0000 (22:50 +0900)]
Closes #12281 - a bug in cuda::pow with negative base values

6 years agocmake: WITH_GPHOTO2=OFF by default
Alexander Alekhin [Thu, 23 Aug 2018 19:48:23 +0000 (19:48 +0000)]
cmake: WITH_GPHOTO2=OFF by default

6 years agoUpdate aff_trans.cpp
logic1988 [Thu, 23 Aug 2018 04:48:13 +0000 (12:48 +0800)]
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.

6 years agojava: add a MatOfRotatedRect class
berak [Thu, 23 Aug 2018 09:32:26 +0000 (11:32 +0200)]
java: add a MatOfRotatedRect class

6 years agoMerge pull request #12275 from alalek:fix_build_dnn_inf_engine
Alexander Alekhin [Wed, 22 Aug 2018 14:38:05 +0000 (14:38 +0000)]
Merge pull request #12275 from alalek:fix_build_dnn_inf_engine

6 years agodnn(build): fix CV_Assert() usage
Alexander Alekhin [Wed, 22 Aug 2018 13:04:40 +0000 (16:04 +0300)]
dnn(build): fix CV_Assert() usage

6 years agoviz: call "mapper->Update()" before and after SetInputData()
Alexander Alekhin [Wed, 22 Aug 2018 12:39:14 +0000 (15:39 +0300)]
viz: call "mapper->Update()" before and after SetInputData()

6 years agoMerge pull request #12272 from alalek:fix_build_static_analysis
Alexander Alekhin [Wed, 22 Aug 2018 12:18:53 +0000 (12:18 +0000)]
Merge pull request #12272 from alalek:fix_build_static_analysis

6 years agobuild: fix build with defined CV_STATIC_ANALYSIS
Alexander Alekhin [Wed, 22 Aug 2018 11:03:12 +0000 (14:03 +0300)]
build: fix build with defined CV_STATIC_ANALYSIS

6 years agoMerge pull request #12267 from alalek:dnn_unstable_tests
Alexander Alekhin [Tue, 21 Aug 2018 15:26:06 +0000 (15:26 +0000)]
Merge pull request #12267 from alalek:dnn_unstable_tests

6 years agodnn(test): mark unstable OpenCL tests
Alexander Alekhin [Tue, 21 Aug 2018 13:11:24 +0000 (16:11 +0300)]
dnn(test): mark unstable OpenCL tests

6 years agoMerge pull request #12266 from mshabunin:fix-windows-ie-build
Alexander Alekhin [Tue, 21 Aug 2018 13:07:44 +0000 (13:07 +0000)]
Merge pull request #12266 from mshabunin:fix-windows-ie-build

6 years agoMerge pull request #12262 from sivaraam:v4l2_mainloop
Alexander Alekhin [Tue, 21 Aug 2018 12:47:29 +0000 (12:47 +0000)]
Merge pull request #12262 from sivaraam:v4l2_mainloop

6 years agoMerge pull request #12256 from alalek:core_intrin_fp16_fix
Alexander Alekhin [Tue, 21 Aug 2018 12:47:08 +0000 (12:47 +0000)]
Merge pull request #12256 from alalek:core_intrin_fp16_fix

6 years agoMerge pull request #12219 from alalek:fix_assert_messages
Alexander Alekhin [Tue, 21 Aug 2018 12:46:35 +0000 (12:46 +0000)]
Merge pull request #12219 from alalek:fix_assert_messages

6 years agoFixed windows build with InferenceEngine
Maksim Shabunin [Tue, 14 Aug 2018 12:39:32 +0000 (15:39 +0300)]
Fixed windows build with InferenceEngine

6 years agocap-v4l: remove unwanted loop in V4L2 mainloop
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.

6 years agoMerge pull request #12263 from doctorcolinsmith:3.4
Alexander Alekhin [Tue, 21 Aug 2018 10:12:14 +0000 (10:12 +0000)]
Merge pull request #12263 from doctorcolinsmith:3.4

6 years agoAdd export macro for ios conversion functions
Colin Smith [Mon, 20 Aug 2018 21:10:54 +0000 (14:10 -0700)]
Add export macro for ios conversion functions

6 years agocore(intrin): restrict FP16 operations
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

6 years agoMerge pull request #12258 from savuor:fix/trace_fname_slash
Alexander Alekhin [Mon, 20 Aug 2018 16:22:06 +0000 (16:22 +0000)]
Merge pull request #12258 from savuor:fix/trace_fname_slash

6 years agofixed filename slash processing
Rostislav Vasilikhin [Mon, 20 Aug 2018 14:16:54 +0000 (17:16 +0300)]
fixed filename slash processing

6 years agoMerge pull request #12242 from alalek:fix_12236
Alexander Alekhin [Mon, 20 Aug 2018 13:53:27 +0000 (13:53 +0000)]
Merge pull request #12242 from alalek:fix_12236

6 years agoMerge pull request #12255 from csukuangfj:patch_5
Alexander Alekhin [Mon, 20 Aug 2018 13:47:41 +0000 (13:47 +0000)]
Merge pull request #12255 from csukuangfj:patch_5

6 years agoMerge pull request #12254 from csukuangfj:patch_4
Alexander Alekhin [Mon, 20 Aug 2018 08:46:57 +0000 (08:46 +0000)]
Merge pull request #12254 from csukuangfj:patch_4

6 years agofix a typo.
Kuang Fangjun [Mon, 20 Aug 2018 07:52:18 +0000 (15:52 +0800)]
fix a typo.

6 years agofix an error in the formula for cv::cornerSubPix
Kuang Fangjun [Mon, 20 Aug 2018 07:49:35 +0000 (15:49 +0800)]
fix an error in the formula for cv::cornerSubPix

6 years agoml: don't use "getSubVector()" with 2D matrix
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

6 years agoMerge pull request #12235 from alalek:core_perf_scalar_tests
Alexander Alekhin [Sat, 18 Aug 2018 20:45:47 +0000 (20:45 +0000)]
Merge pull request #12235 from alalek:core_perf_scalar_tests

6 years agoMerge pull request #12172 from alalek:core_move_const_table
Alexander Alekhin [Fri, 17 Aug 2018 14:03:01 +0000 (14:03 +0000)]
Merge pull request #12172 from alalek:core_move_const_table

6 years agoMerge pull request #12136 from sturkmen72:update_documentation
Alexander Alekhin [Fri, 17 Aug 2018 14:02:20 +0000 (14:02 +0000)]
Merge pull request #12136 from sturkmen72:update_documentation

6 years agoml(test): test different samples layout of TrainData
Alexander Alekhin [Fri, 17 Aug 2018 13:42:11 +0000 (16:42 +0300)]
ml(test): test different samples layout of TrainData

6 years agoUpdate documentation and samples
Suleyman TURKMEN [Thu, 2 Aug 2018 18:22:58 +0000 (21:22 +0300)]
Update documentation and samples

6 years agocore(perf): fix addScalar test
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

6 years agoMerge pull request #12220 from sturkmen72:update_seamless_cloning
Alexander Alekhin [Thu, 16 Aug 2018 16:26:27 +0000 (16:26 +0000)]
Merge pull request #12220 from sturkmen72:update_seamless_cloning

6 years agoMerge pull request #12233 from mshabunin:fix-world-install-headers
Alexander Alekhin [Thu, 16 Aug 2018 16:03:10 +0000 (16:03 +0000)]
Merge pull request #12233 from mshabunin:fix-world-install-headers

6 years agoMerge pull request #12222 from NCBee:master
Alexander Alekhin [Thu, 16 Aug 2018 16:02:39 +0000 (16:02 +0000)]
Merge pull request #12222 from NCBee:master

6 years agoFixed core headers installation in world builds
Maksim Shabunin [Thu, 16 Aug 2018 14:16:02 +0000 (17:16 +0300)]
Fixed core headers installation in world builds

6 years agoMerge pull request #12228 from tomoaki0705:fixTypoCalib3d
Alexander Alekhin [Thu, 16 Aug 2018 12:29:10 +0000 (12:29 +0000)]
Merge pull request #12228 from tomoaki0705:fixTypoCalib3d

6 years agoimgproc(test): refactor test_intersection.cpp
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

6 years agoimgproc: fix rotatedRectangleIntersection()
Alexander Alekhin [Thu, 16 Aug 2018 11:31:29 +0000 (14:31 +0300)]
imgproc: fix rotatedRectangleIntersection()

6 years agoimgproc(tests): intersetion calculation of RotatedRect
Bahram Dahi [Wed, 15 Aug 2018 17:47:54 +0000 (10:47 -0700)]
imgproc(tests): intersetion calculation of RotatedRect

6 years agofix typo
Tomoaki Teshima [Thu, 16 Aug 2018 10:11:40 +0000 (19:11 +0900)]
fix typo

6 years agoMerge pull request #12216 from hirocob:fix-typo
Alexander Alekhin [Thu, 16 Aug 2018 05:16:58 +0000 (05:16 +0000)]
Merge pull request #12216 from hirocob:fix-typo

6 years agoUpdate seamless_cloning
Suleyman TURKMEN [Mon, 6 Aug 2018 16:45:01 +0000 (19:45 +0300)]
Update seamless_cloning

6 years agoFix a typo in the tutorial
Hiro Kobayashi [Wed, 15 Aug 2018 07:57:36 +0000 (16:57 +0900)]
Fix a typo in the tutorial

6 years agocore: repair CV_Assert() messages
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).

6 years agoMerge pull request #12205 from dkurt:dnn_update_tf_face_detection
Alexander Alekhin [Tue, 14 Aug 2018 10:53:12 +0000 (10:53 +0000)]
Merge pull request #12205 from dkurt:dnn_update_tf_face_detection

6 years agoUpdate face detection network in samples
Dmitry Kurtaev [Tue, 14 Aug 2018 10:16:23 +0000 (13:16 +0300)]
Update face detection network in samples

6 years agoMerge pull request #12203 from berak:fix_interactive_calibration
Alexander Alekhin [Mon, 13 Aug 2018 15:40:42 +0000 (15:40 +0000)]
Merge pull request #12203 from berak:fix_interactive_calibration

6 years agoUINT8 face detection network using Intel's Inference Engine backend
Dmitry Kurtaev [Mon, 13 Aug 2018 13:46:04 +0000 (16:46 +0300)]
UINT8 face detection network using Intel's Inference Engine backend

6 years agoapps: fix interactive calibration
berak [Mon, 13 Aug 2018 09:17:32 +0000 (11:17 +0200)]
apps: fix interactive calibration

6 years agoMerge pull request #12191 from weblucas:patch-2
Alexander Alekhin [Fri, 10 Aug 2018 14:15:39 +0000 (14:15 +0000)]
Merge pull request #12191 from weblucas:patch-2

6 years agoMerge pull request #12128 from dkurt:dnn_fix_12066
Alexander Alekhin [Fri, 10 Aug 2018 14:14:16 +0000 (14:14 +0000)]
Merge pull request #12128 from dkurt:dnn_fix_12066

6 years agocmake: allow to specify own libva paths
Alexander Alekhin [Fri, 10 Aug 2018 13:00:53 +0000 (16:00 +0300)]
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`

6 years agocore(libva): support YV12 too
Alexander Alekhin [Thu, 9 Aug 2018 16:49:34 +0000 (19:49 +0300)]
core(libva): support YV12 too

Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)

6 years agoFix a Typo in the comment of asift.py
Lucas Teixeira [Thu, 9 Aug 2018 21:43:39 +0000 (23:43 +0200)]
Fix a Typo in the comment of asift.py

6 years agoMerge pull request #12174 from alalek:dnn_move_range_ostream_operator
Alexander Alekhin [Wed, 8 Aug 2018 20:51:25 +0000 (20:51 +0000)]
Merge pull request #12174 from alalek:dnn_move_range_ostream_operator

6 years agoMerge pull request #12184 from alalek:issue_12163
Alexander Alekhin [Wed, 8 Aug 2018 20:50:54 +0000 (20:50 +0000)]
Merge pull request #12184 from alalek:issue_12163

6 years agocore: move const tables outside of dispatched code
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

6 years agoimgproc(cvtColor): slightly improve error messages
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.

6 years agoMerge pull request #12178 from alalek:ipp_cvtColor_12176
Alexander Alekhin [Wed, 8 Aug 2018 13:30:32 +0000 (13:30 +0000)]
Merge pull request #12178 from alalek:ipp_cvtColor_12176

6 years agoimgproc(cvtColor): temporary disable IPP for 8U GRAY2BGR mode
Alexander Alekhin [Wed, 8 Aug 2018 10:49:16 +0000 (13:49 +0300)]
imgproc(cvtColor): temporary disable IPP for 8U GRAY2BGR mode

Details 12176

6 years agoMerge pull request #12173 from gdemarcq:Decolor_corrections
Alexander Alekhin [Tue, 7 Aug 2018 17:07:19 +0000 (17:07 +0000)]
Merge pull request #12173 from gdemarcq:Decolor_corrections

6 years agocore: cv::Range() ostream write operator
Alexander Alekhin [Tue, 7 Aug 2018 16:33:13 +0000 (19:33 +0300)]
core: cv::Range() ostream write operator

remove from DNN module headers

6 years agophoto: Decolor corrections
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

6 years agoMerge pull request #12169 from berak:photo_decolor
Alexander Alekhin [Tue, 7 Aug 2018 16:01:42 +0000 (16:01 +0000)]
Merge pull request #12169 from berak:photo_decolor

6 years agocore(test): extra tests/fixes for merge/split (#12171)
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

6 years agoMerge pull request #12159 from zarelaky:master
Maksim Shabunin [Tue, 7 Aug 2018 13:15:19 +0000 (13:15 +0000)]
Merge pull request #12159 from zarelaky:master

6 years agophoto: avoid resizing a const Mat in decolor()
berak [Tue, 7 Aug 2018 13:14:22 +0000 (15:14 +0200)]
photo: avoid resizing a const Mat in decolor()

6 years agoUpdate cap_gstreamer.cpp
zarelaky [Mon, 6 Aug 2018 14:11:23 +0000 (22:11 +0800)]
Update cap_gstreamer.cpp

fixed call open(int id) failed

6 years agoMerge pull request #12161 from alalek:cache_dump_neighbor_directories_for_cleanup
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

6 years agoMerge pull request #12166 from berak:fix_mjpeg_decoder
Maksim Shabunin [Tue, 7 Aug 2018 12:09:13 +0000 (12:09 +0000)]
Merge pull request #12166 from berak:fix_mjpeg_decoder

6 years agovideoio: check iterator in mjpeg_encoder.cpp
berak [Tue, 7 Aug 2018 09:43:37 +0000 (11:43 +0200)]
videoio: check iterator in mjpeg_encoder.cpp

6 years agoMerge pull request #12162 from alalek:fix_intrin_12146
Alexander Alekhin [Mon, 6 Aug 2018 20:39:23 +0000 (20:39 +0000)]
Merge pull request #12162 from alalek:fix_intrin_12146

6 years agocore(intrin): avoid symbols duplication from SIMD128/256 cases
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 ...
}
```

6 years agocore: dump neighbour cache directories (from old OpenCV versions)
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

6 years agoMerge pull request #12157 from allnes:detect_qr_code
Vadim Pisarevsky [Mon, 6 Aug 2018 14:50:28 +0000 (14:50 +0000)]
Merge pull request #12157 from allnes:detect_qr_code

6 years agoUpdate binarization
Alexander Nesterov [Sun, 5 Aug 2018 17:55:15 +0000 (14:55 -0300)]
Update binarization

6 years agoMerge pull request #12125 from dkurt:dnn_mobilenet_ppn
Vadim Pisarevsky [Mon, 6 Aug 2018 14:40:50 +0000 (14:40 +0000)]
Merge pull request #12125 from dkurt:dnn_mobilenet_ppn

6 years agoMerge pull request #12130 from dkurt:dnn_ie_mvn
Vadim Pisarevsky [Mon, 6 Aug 2018 14:37:46 +0000 (14:37 +0000)]
Merge pull request #12130 from dkurt:dnn_ie_mvn

6 years agoEnable reshape-as-shape layer from TensorFlow
Dmitry Kurtaev [Thu, 2 Aug 2018 08:12:22 +0000 (11:12 +0300)]
Enable reshape-as-shape layer from TensorFlow