platform/upstream/opencv.git
5 years agoInclude preprocessing nodes to object detection TensorFlow networks (#12211)
Dmitry Kurtaev [Fri, 31 Aug 2018 12:41:56 +0000 (15:41 +0300)]
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

5 years agoMerge pull request #12360 from alalek:issue_12356
Alexander Alekhin [Fri, 31 Aug 2018 12:16:50 +0000 (12:16 +0000)]
Merge pull request #12360 from alalek:issue_12356

5 years agoimgcodecs: add null pointer check
Alexander Alekhin [Fri, 31 Aug 2018 09:56:02 +0000 (12:56 +0300)]
imgcodecs: add null pointer check

5 years agoMerge pull request #12189 from alalek:ippa_cleanup_3.4
Alexander Alekhin [Thu, 30 Aug 2018 20:29:42 +0000 (20:29 +0000)]
Merge pull request #12189 from alalek:ippa_cleanup_3.4

5 years agoMerge pull request #12351 from NobuoTsukamoto:3.4
Alexander Alekhin [Thu, 30 Aug 2018 18:10:01 +0000 (21:10 +0300)]
Merge pull request #12351 from NobuoTsukamoto:3.4

5 years agocleanup: IPP Async (IPP_A)
Alexander Alekhin [Thu, 30 Aug 2018 15:53:07 +0000 (18:53 +0300)]
cleanup: IPP Async (IPP_A)

except header file with conversion routines (will be removed in OpenCV 4.0)

5 years agoMerge pull request #12346 from mshabunin:test-data-check
Alexander Alekhin [Thu, 30 Aug 2018 15:36:58 +0000 (15:36 +0000)]
Merge pull request #12346 from mshabunin:test-data-check

5 years agoFixed that object_detection.py does not work in python3.
Nobuo Tsukamoto [Thu, 30 Aug 2018 15:21:54 +0000 (00:21 +0900)]
Fixed that object_detection.py does not work in python3.

5 years agoMerge pull request #12327 from take1014:distanceTransform_type
Vadim Pisarevsky [Thu, 30 Aug 2018 13:12:07 +0000 (13:12 +0000)]
Merge pull request #12327 from take1014:distanceTransform_type

5 years agoMerge pull request #12345 from berak:fix_java_list_string
Alexander Alekhin [Thu, 30 Aug 2018 13:04:18 +0000 (13:04 +0000)]
Merge pull request #12345 from berak:fix_java_list_string

5 years agoMerge pull request #12314 from sturkmen72:patch-2
Vadim Pisarevsky [Thu, 30 Aug 2018 12:44:23 +0000 (12:44 +0000)]
Merge pull request #12314 from sturkmen72:patch-2

5 years agoAdds a small note describing BUILD_opencv_world (#12332)
HarshDolhare [Thu, 30 Aug 2018 12:17:27 +0000 (17:47 +0530)]
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

5 years agoAdded option to fail on missing testdata
Maksim Shabunin [Thu, 30 Aug 2018 10:06:26 +0000 (13:06 +0300)]
Added option to fail on missing testdata

5 years agoMerge pull request #12336 from dkurt:dnn_ie_fix_net_lifetime
Alexander Alekhin [Thu, 30 Aug 2018 11:09:18 +0000 (11:09 +0000)]
Merge pull request #12336 from dkurt:dnn_ie_fix_net_lifetime

5 years agoMerge pull request #12333 from wzw-intel:prior_box
Alexander Alekhin [Thu, 30 Aug 2018 11:08:44 +0000 (11:08 +0000)]
Merge pull request #12333 from wzw-intel:prior_box

5 years agojava: fix LIST_GET macro
berak [Thu, 30 Aug 2018 08:50:25 +0000 (10:50 +0200)]
java: fix LIST_GET macro

5 years agodnn: fix variance setting bug for PriorBoxLayer
Wu Zhiwen [Wed, 29 Aug 2018 03:47:13 +0000 (11:47 +0800)]
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>
5 years agoFix lifetime of networks which are loaded from Model Optimizer IRs
Dmitry Kurtaev [Wed, 29 Aug 2018 10:26:43 +0000 (13:26 +0300)]
Fix lifetime of networks which are loaded from Model Optimizer IRs

5 years agofix typo
take1014 [Tue, 28 Aug 2018 13:14:47 +0000 (22:14 +0900)]
fix typo

5 years agoMerge tag '3.4.3-openvino'
Alexander Alekhin [Tue, 28 Aug 2018 13:03:30 +0000 (16:03 +0300)]
Merge tag '3.4.3-openvino'

5 years agoMerge tag '3.4.3'
Alexander Alekhin [Tue, 28 Aug 2018 13:02:39 +0000 (16:02 +0300)]
Merge tag '3.4.3'

5 years agoOpenCV 3.4.3
Alexander Alekhin [Tue, 28 Aug 2018 12:58:21 +0000 (15:58 +0300)]
OpenCV 3.4.3

5 years agoopenvino: use 2018R3 defines
Alexander Alekhin [Tue, 7 Aug 2018 12:01:36 +0000 (15:01 +0300)]
openvino: use 2018R3 defines

5 years agoMerge pull request #12326 from alalek:issue_12325
Alexander Alekhin [Tue, 28 Aug 2018 12:51:33 +0000 (12:51 +0000)]
Merge pull request #12326 from alalek:issue_12325

5 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

5 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

5 years agots: don't pass NULL for std::string() constructor
Alexander Alekhin [Tue, 28 Aug 2018 11:19:56 +0000 (14:19 +0300)]
ts: don't pass NULL for std::string() constructor

5 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)

5 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

5 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

5 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

5 years agoUpdate opengl_interop.cpp
Suleyman TURKMEN [Sun, 26 Aug 2018 22:04:46 +0000 (01:04 +0300)]
Update opengl_interop.cpp

resolves #12307

5 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

5 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

5 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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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.

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

5 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

5 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

5 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()

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

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

5 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.

5 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

5 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

5 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

5 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

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

5 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

5 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

5 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

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

5 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

5 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

5 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

5 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

5 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

5 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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

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

5 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

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

5 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

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

5 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

5 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).

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

5 years agoOpenCV version++
Alexander Alekhin [Thu, 26 Jul 2018 10:16:22 +0000 (13:16 +0300)]
OpenCV version++

OpenCV 3.4.3

5 years agoopenvino: use 2018R3 defines
Alexander Alekhin [Tue, 7 Aug 2018 12:01:36 +0000 (15:01 +0300)]
openvino: use 2018R3 defines

5 years agoexperimental version++
Alexander Alekhin [Thu, 26 Jul 2018 10:08:08 +0000 (13:08 +0300)]
experimental version++

5 years agoOpenCV version '-openvino'
Alexander Alekhin [Thu, 26 Jul 2018 10:17:09 +0000 (13:17 +0300)]
OpenCV version '-openvino'

5 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

5 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

5 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

5 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