platform/upstream/opencv.git
6 years agoMerge pull request #10946 from mshabunin:add-license-install
Maksim Shabunin [Wed, 7 Mar 2018 07:15:50 +0000 (07:15 +0000)]
Merge pull request #10946 from mshabunin:add-license-install

6 years agoMerge pull request #10989 from tomoaki0705:fixOldGstreamerTest
Alexander Alekhin [Tue, 6 Mar 2018 16:26:08 +0000 (16:26 +0000)]
Merge pull request #10989 from tomoaki0705:fixOldGstreamerTest

6 years agoMerge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012
Alexander Alekhin [Tue, 6 Mar 2018 15:49:08 +0000 (15:49 +0000)]
Merge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012

6 years agoAdd install component for 3rdparty libraries licenses
Maksim Shabunin [Mon, 26 Feb 2018 18:10:21 +0000 (21:10 +0300)]
Add install component for 3rdparty libraries licenses

6 years agoMerge pull request #10999 from mshabunin:do-more-samples
Maksim Shabunin [Tue, 6 Mar 2018 13:31:34 +0000 (13:31 +0000)]
Merge pull request #10999 from mshabunin:do-more-samples

6 years agoMinor refactoring in several C++ samples:
Maksim Shabunin [Mon, 19 Feb 2018 15:53:17 +0000 (18:53 +0300)]
Minor refactoring in several C++ samples:

- bgfg_segm
- peopledetect
- opencv_version
- dnn/colorization
- tapi/opencl_custom_kernel
- tapi/dense_optical_flow (renamed tvl1_optical_flow)

6 years agolet the test OCL_Filter/Bilateral pass
Tomoaki Teshima [Tue, 6 Mar 2018 10:48:04 +0000 (19:48 +0900)]
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)

6 years agoInclude error code description into the message (#10982)
native-api [Tue, 6 Mar 2018 06:58:19 +0000 (09:58 +0300)]
Include error code description into the message (#10982)

6 years agoSSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S (#10987)
Namgoo Lee [Tue, 6 Mar 2018 06:50:53 +0000 (15:50 +0900)]
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

6 years agoMerge pull request #10980 from sturkmen72:update_doc
Alexander Alekhin [Mon, 5 Mar 2018 15:41:05 +0000 (15:41 +0000)]
Merge pull request #10980 from sturkmen72:update_doc

6 years agoadd workaround of old gstreamer
Tomoaki Teshima [Mon, 5 Mar 2018 10:27:49 +0000 (19:27 +0900)]
add workaround of old gstreamer

6 years agoUpdate core.hpp
Suleyman TURKMEN [Sun, 4 Mar 2018 14:16:42 +0000 (17:16 +0300)]
Update core.hpp

6 years agoMerge pull request #10933 from cdcseacave:clean_npr
cDc [Fri, 2 Mar 2018 11:42:28 +0000 (03:42 -0800)]
Merge pull request #10933 from cdcseacave:clean_npr

* clean npr functions of useless initializations (speed-up)

* photo: remove unnecessary code

6 years agoMerge pull request #10971 from alalek:ocl_error_code_string
Alexander Alekhin [Fri, 2 Mar 2018 11:41:00 +0000 (11:41 +0000)]
Merge pull request #10971 from alalek:ocl_error_code_string

6 years agoMerge pull request #10968 from sergiomb2:master
Alexander Alekhin [Fri, 2 Mar 2018 11:39:54 +0000 (11:39 +0000)]
Merge pull request #10968 from sergiomb2:master

6 years agoMerge pull request #10966 from alalek:verbose_features2d_test
Alexander Alekhin [Fri, 2 Mar 2018 11:39:14 +0000 (11:39 +0000)]
Merge pull request #10966 from alalek:verbose_features2d_test

6 years agoMerge pull request #10964 from alalek:fix_10956
Alexander Alekhin [Fri, 2 Mar 2018 11:38:52 +0000 (11:38 +0000)]
Merge pull request #10964 from alalek:fix_10956

6 years agoMerge pull request #10962 from alalek:dnn_precomp_hpp
Alexander Alekhin [Fri, 2 Mar 2018 11:38:16 +0000 (11:38 +0000)]
Merge pull request #10962 from alalek:dnn_precomp_hpp

6 years agoMerge pull request #10961 from alalek:fix_clang_avx512
Alexander Alekhin [Fri, 2 Mar 2018 11:36:56 +0000 (11:36 +0000)]
Merge pull request #10961 from alalek:fix_clang_avx512

6 years agoMerge pull request #10960 from alalek:fix_protobuf_readme
Alexander Alekhin [Fri, 2 Mar 2018 11:36:39 +0000 (11:36 +0000)]
Merge pull request #10960 from alalek:fix_protobuf_readme

6 years agoMerge pull request #10955 from pengli:dnn
Alexander Alekhin [Fri, 2 Mar 2018 11:35:59 +0000 (11:35 +0000)]
Merge pull request #10955 from pengli:dnn

6 years agoMerge pull request #10954 from whizzzkid:master
Alexander Alekhin [Fri, 2 Mar 2018 11:35:41 +0000 (11:35 +0000)]
Merge pull request #10954 from whizzzkid:master

6 years agoMerge pull request #10938 from mshabunin:fix-static-issues-9
Alexander Alekhin [Fri, 2 Mar 2018 11:34:52 +0000 (11:34 +0000)]
Merge pull request #10938 from mshabunin:fix-static-issues-9

6 years agoMerge pull request #10936 from mshabunin:fix-mingw-avx512
Alexander Alekhin [Fri, 2 Mar 2018 11:34:00 +0000 (11:34 +0000)]
Merge pull request #10936 from mshabunin:fix-mingw-avx512

6 years agoMerge pull request #10926 from tomoaki0705:fixTinkerBoardOpenCL
Alexander Alekhin [Fri, 2 Mar 2018 11:32:51 +0000 (11:32 +0000)]
Merge pull request #10926 from tomoaki0705:fixTinkerBoardOpenCL

6 years agoocl: update getOpenCLErrorString() code
Alexander Alekhin [Thu, 1 Mar 2018 10:52:43 +0000 (13:52 +0300)]
ocl: update getOpenCLErrorString() code

6 years agocuda: fixes gpu samples build (issue 10953)
whizzzkid [Wed, 28 Feb 2018 20:22:58 +0000 (13:22 -0700)]
cuda: fixes gpu samples build (issue 10953)

6 years agofeatures2d: add verbose messages into tests
Alexander Alekhin [Wed, 28 Feb 2018 15:43:43 +0000 (18:43 +0300)]
features2d: add verbose messages into tests

To investigate sporadic failures of Features2d_FLANN_Auto.regression test.

6 years agoFix build with VA
Sérgio M. Basto [Wed, 28 Feb 2018 19:21:31 +0000 (19:21 +0000)]
Fix build with VA

This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}
that was missed in commit 2200e13c7193e0fe9db4b9f7c4bee3a7ef043909

    diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
    -    ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
    +  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})

6 years agojava: fix copy_java_files() in gen_java.py
Alexander Alekhin [Wed, 28 Feb 2018 13:23:42 +0000 (16:23 +0300)]
java: fix copy_java_files() in gen_java.py

- missing 'module'
- fixed '\r\n' EOL handling (blocked by '$' regex)

6 years agodnn: fix precomp.hpp usage
Alexander Alekhin [Wed, 28 Feb 2018 13:44:41 +0000 (16:44 +0300)]
dnn: fix precomp.hpp usage

6 years agoocl4dnn: Fix SAME padding mode for convolve
Wu Zhiwen [Mon, 26 Feb 2018 06:57:04 +0000 (14:57 +0800)]
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>
6 years ago3rdparty: fix protobuf version in README file
Alexander Alekhin [Tue, 27 Feb 2018 12:48:19 +0000 (15:48 +0300)]
3rdparty: fix protobuf version in README file

6 years agocmake: AVX512 with clang
Alexander Alekhin [Tue, 27 Feb 2018 10:21:19 +0000 (13:21 +0300)]
cmake: AVX512 with clang

6 years agofix test error on Tinker Board (OpenCL on Arm platform)
Tomoaki Teshima [Mon, 26 Feb 2018 13:55:06 +0000 (22:55 +0900)]
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

6 years agoFixed two issues found by static analysis
Maksim Shabunin [Sun, 25 Feb 2018 21:16:02 +0000 (00:16 +0300)]
Fixed two issues found by static analysis

6 years agoMerge tag '3.4.1'
Alexander Alekhin [Sun, 25 Feb 2018 16:56:57 +0000 (16:56 +0000)]
Merge tag '3.4.1'

6 years agoCPU dispatching: additional AVX-512 check for mingw-w64
Maksim Shabunin [Sun, 25 Feb 2018 10:32:27 +0000 (13:32 +0300)]
CPU dispatching: additional AVX-512 check for mingw-w64

6 years agoOpenCV version++
Alexander Alekhin [Mon, 19 Feb 2018 14:30:06 +0000 (17:30 +0300)]
OpenCV version++

OpenCV 3.4.1

6 years agoexperimental version++
Alexander Alekhin [Mon, 19 Feb 2018 14:24:32 +0000 (17:24 +0300)]
experimental version++

6 years agoMerge pull request #10925 from pengli:dnn
Alexander Alekhin [Fri, 23 Feb 2018 08:38:03 +0000 (08:38 +0000)]
Merge pull request #10925 from pengli:dnn

6 years agoDeconvolution ocl fix
Li Peng [Fri, 23 Feb 2018 10:25:12 +0000 (18:25 +0800)]
Deconvolution ocl fix

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10922 from pengli:dnn
Li, Peng [Thu, 22 Feb 2018 18:01:12 +0000 (02:01 +0800)]
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

6 years agoMerge pull request #10919 from mshabunin:fix-static-9
Maksim Shabunin [Thu, 22 Feb 2018 15:05:25 +0000 (15:05 +0000)]
Merge pull request #10919 from mshabunin:fix-static-9

6 years agoFixed several issues detected by static analysis
Maksim Shabunin [Thu, 22 Feb 2018 10:20:35 +0000 (13:20 +0300)]
Fixed several issues detected by static analysis

6 years agoUse fixed size types in AVIContainer structs
Maksim Shabunin [Thu, 22 Feb 2018 10:20:11 +0000 (13:20 +0300)]
Use fixed size types in AVIContainer structs

6 years agoFixed mingw compilation on Windows
Maksim Shabunin [Thu, 22 Feb 2018 10:19:44 +0000 (13:19 +0300)]
Fixed mingw compilation on Windows

6 years agoMerge pull request #10909 from alalek:ffmpeg_update
Alexander Alekhin [Thu, 22 Feb 2018 14:05:37 +0000 (14:05 +0000)]
Merge pull request #10909 from alalek:ffmpeg_update

6 years agoMerge pull request #9708 from dkurt:tf_face_detector
Vadim Pisarevsky [Thu, 22 Feb 2018 12:04:26 +0000 (12:04 +0000)]
Merge pull request #9708 from dkurt:tf_face_detector

6 years agoffmpeg: update wrapper
Alexander Alekhin [Tue, 20 Feb 2018 12:58:37 +0000 (15:58 +0300)]
ffmpeg: update wrapper

FFmpeg: 3.3.4 -> 3.4.2
LibVPX: 1.6.1 -> 1.7.0
OpenH264: 1.6.0 -> 1.7.0

6 years agoMerge pull request #10916 from alalek:videoio_sample_aspect_ratio
Vadim Pisarevsky [Thu, 22 Feb 2018 12:03:39 +0000 (12:03 +0000)]
Merge pull request #10916 from alalek:videoio_sample_aspect_ratio

6 years agoMerge pull request #10918 from pengli:dnn
Alexander Alekhin [Thu, 22 Feb 2018 10:30:00 +0000 (10:30 +0000)]
Merge pull request #10918 from pengli:dnn

6 years agoFix for opencv face detector ocl test
Li Peng [Thu, 22 Feb 2018 13:50:43 +0000 (21:50 +0800)]
Fix for opencv face detector ocl test

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoFallback for "SAME" padMode in ocl convolution and pooling
Li Peng [Mon, 19 Feb 2018 12:56:40 +0000 (20:56 +0800)]
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>
6 years agoMerge pull request #10914 from alalek:issue_10815
Alexander Alekhin [Wed, 21 Feb 2018 18:26:15 +0000 (18:26 +0000)]
Merge pull request #10914 from alalek:issue_10815

6 years agoOpenCV face detection network in TensorFlow
Dmitry Kurtaev [Tue, 20 Feb 2018 15:04:03 +0000 (18:04 +0300)]
OpenCV face detection network in TensorFlow

6 years agovideoio: add missing CAP_PROP_SAR_NUM/DEN propepties into .hpp file
Alexander Alekhin [Wed, 21 Feb 2018 15:42:40 +0000 (18:42 +0300)]
videoio: add missing CAP_PROP_SAR_NUM/DEN propepties into .hpp file

reuse av_guess_sample_aspect_ratio() if available in ffmpeg

6 years agoMerge pull request #10915 from alalek:issue_10910
Alexander Alekhin [Wed, 21 Feb 2018 15:55:03 +0000 (15:55 +0000)]
Merge pull request #10915 from alalek:issue_10910

6 years agoMerge pull request #10912 from alalek:fix_imgcodecs_hang
Alexander Alekhin [Wed, 21 Feb 2018 13:39:35 +0000 (13:39 +0000)]
Merge pull request #10912 from alalek:fix_imgcodecs_hang

6 years agocreatesamples: fix ROI in icvGetBackgroundImage()
Alexander Alekhin [Wed, 21 Feb 2018 11:40:35 +0000 (14:40 +0300)]
createsamples: fix ROI in icvGetBackgroundImage()

6 years agocore: eliminate redundant cv::format() declarations
Alexander Alekhin [Wed, 21 Feb 2018 11:22:16 +0000 (14:22 +0300)]
core: eliminate redundant cv::format() declarations

Existed includes sequence:
- utility.hpp -> core.hpp -> operations.hpp

6 years agoimgcodecs: fix RBaseStream hang on truncated inputs
Alexander Alekhin [Wed, 21 Feb 2018 10:15:10 +0000 (13:15 +0300)]
imgcodecs: fix RBaseStream hang on truncated inputs

6 years agoMerge pull request #10367 from savuor:multiwrite_tiff_renew
Vadim Pisarevsky [Tue, 20 Feb 2018 23:13:55 +0000 (23:13 +0000)]
Merge pull request #10367 from savuor:multiwrite_tiff_renew

6 years agoMerge pull request #10907 from alalek:cmake_ninja_fix
Alexander Alekhin [Tue, 20 Feb 2018 18:54:43 +0000 (18:54 +0000)]
Merge pull request #10907 from alalek:cmake_ninja_fix

6 years agoMerge pull request #10906 from nglee:dev_cudaFastMultiStreamSafety
Namgoo Lee [Tue, 20 Feb 2018 17:55:57 +0000 (02:55 +0900)]
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

6 years agoimwrite for multipage images implemented
Rostislav Vasilikhin [Wed, 20 Dec 2017 20:14:10 +0000 (23:14 +0300)]
imwrite for multipage images implemented

6 years agoMerge pull request #10892 from alalek:android_sdk_build_gradle
Vadim Pisarevsky [Tue, 20 Feb 2018 14:59:32 +0000 (14:59 +0000)]
Merge pull request #10892 from alalek:android_sdk_build_gradle

6 years agoMerge pull request #10406 from seiko2plus:coreUnvintrinCopy
Vadim Pisarevsky [Tue, 20 Feb 2018 14:50:16 +0000 (14:50 +0000)]
Merge pull request #10406 from seiko2plus:coreUnvintrinCopy

6 years agoMerge pull request #10745 from terfendail:tiff_fix
Vadim Pisarevsky [Tue, 20 Feb 2018 14:47:13 +0000 (14:47 +0000)]
Merge pull request #10745 from terfendail:tiff_fix

6 years agomake tmpRow proper size before copyTo to avoid reallocated tmpCol (#10860)
PalkoNazar [Tue, 20 Feb 2018 13:55:25 +0000 (15:55 +0200)]
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

6 years agoMerge pull request #10902 from alalek:port_10695
Vadim Pisarevsky [Tue, 20 Feb 2018 13:26:59 +0000 (13:26 +0000)]
Merge pull request #10902 from alalek:port_10695

6 years agoMerge pull request #10903 from alalek:ml_ann_test
Vadim Pisarevsky [Tue, 20 Feb 2018 13:25:58 +0000 (13:25 +0000)]
Merge pull request #10903 from alalek:ml_ann_test

6 years agoMerge pull request #10908 from alalek:fix_ffmpeg_uchar
Vadim Pisarevsky [Tue, 20 Feb 2018 12:22:09 +0000 (12:22 +0000)]
Merge pull request #10908 from alalek:fix_ffmpeg_uchar

6 years agoffmpeg: fix 'uchar' error
Alexander Alekhin [Tue, 20 Feb 2018 10:15:41 +0000 (13:15 +0300)]
ffmpeg: fix 'uchar' error

> cap_ffmpeg_impl.hpp:1710:11: error: 'uchar' does not name a type

6 years agocmake: fix Ninja warning
Alexander Alekhin [Tue, 20 Feb 2018 10:13:31 +0000 (13:13 +0300)]
cmake: fix Ninja warning

about BYPRODUCTS bin/opencv-340.jar

6 years agoMerge pull request #10891 from pengli:dnn
Alexander Alekhin [Tue, 20 Feb 2018 08:59:07 +0000 (08:59 +0000)]
Merge pull request #10891 from pengli:dnn

6 years agoReLU6 layer ocl support
Li Peng [Fri, 16 Feb 2018 07:37:59 +0000 (15:37 +0800)]
ReLU6 layer ocl support

include relu6 ocl kernel and layer fusion support

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoml: refactor ML_ANN test
Alexander Alekhin [Mon, 19 Feb 2018 16:45:04 +0000 (19:45 +0300)]
ml: refactor ML_ANN test

6 years agoFix for vertically flipped tiff files reading
Vitaly Tuzov [Wed, 31 Jan 2018 13:24:24 +0000 (16:24 +0300)]
Fix for vertically flipped tiff files reading

6 years agoAdd mask support to SimpleBlobDetector
mworchel [Thu, 25 Jan 2018 12:34:12 +0000 (13:34 +0100)]
Add mask support to SimpleBlobDetector

6 years agoUse only absolute prior boxes explicit sizes. Remove scales attributes. (#10874)
Dmitry Kurtaev [Mon, 19 Feb 2018 14:25:18 +0000 (17:25 +0300)]
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

6 years agoandroid: add build.grade into Android SDK
Alexander Alekhin [Sat, 17 Feb 2018 22:36:15 +0000 (22:36 +0000)]
android: add build.grade into Android SDK

For using 'OpenCV for Android SDK' with Android Studio projects.

6 years agoMerge pull request #10876 from alalek:android_static_libs
Vadim Pisarevsky [Mon, 19 Feb 2018 14:16:06 +0000 (14:16 +0000)]
Merge pull request #10876 from alalek:android_static_libs

6 years agoMerge pull request #10880 from StevenPuttemans:fix_10594
Vadim Pisarevsky [Mon, 19 Feb 2018 14:13:43 +0000 (14:13 +0000)]
Merge pull request #10880 from StevenPuttemans:fix_10594

6 years agoMerge pull request #10893 from alalek:fix_cpu_disable_flags
Vadim Pisarevsky [Mon, 19 Feb 2018 14:11:11 +0000 (14:11 +0000)]
Merge pull request #10893 from alalek:fix_cpu_disable_flags

6 years agoMerge pull request #10896 from dkurt:tensorflow_tests_generator
Vadim Pisarevsky [Mon, 19 Feb 2018 14:08:58 +0000 (14:08 +0000)]
Merge pull request #10896 from dkurt:tensorflow_tests_generator

6 years agoMerge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer
Alexander Alekhin [Mon, 19 Feb 2018 13:59:20 +0000 (13:59 +0000)]
Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer

6 years agoread in gray scale mode when writing a gray scale video
Tomoaki Teshima [Mon, 19 Feb 2018 09:33:05 +0000 (18:33 +0900)]
read in gray scale mode when writing a gray scale video

6 years agoFix DNN flatten test
Dmitry Kurtaev [Sun, 18 Feb 2018 09:45:43 +0000 (12:45 +0300)]
Fix DNN flatten test

6 years agoMerge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf
Alexander Alekhin [Sun, 18 Feb 2018 07:45:01 +0000 (07:45 +0000)]
Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf

6 years agofix test error on VS2013
Tomoaki Teshima [Sun, 18 Feb 2018 00:29:38 +0000 (09:29 +0900)]
fix test error on VS2013

6 years agocore: remove '-' from separators list of disabled CPU flags
Alexander Alekhin [Sun, 18 Feb 2018 00:03:04 +0000 (00:03 +0000)]
core: remove '-' from separators list of disabled CPU flags

To allow runtime disabling of AVX512-SKX via 'OPENCV_CPU_DISABLE' parameter

6 years agoMerge pull request #10868 from mshabunin:sample-bgsegm
Maksim Shabunin [Sat, 17 Feb 2018 12:04:14 +0000 (15:04 +0300)]
Merge pull request #10868 from mshabunin:sample-bgsegm

* Samples: reworked bgfg_bgsegm

* fixup! Samples: reworked bgfg_bgsegm

6 years agoMerge pull request #10890 from Reputeless:patch-1
Alexander Alekhin [Sat, 17 Feb 2018 12:02:48 +0000 (12:02 +0000)]
Merge pull request #10890 from Reputeless:patch-1

6 years agoMerge pull request #10081 from floe:java-camera2-view
Florian Echtler [Sat, 17 Feb 2018 12:01:24 +0000 (13:01 +0100)]
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

6 years agoMerge pull request #10885 from alalek:issue_10881
Alexander Alekhin [Sat, 17 Feb 2018 11:58:51 +0000 (11:58 +0000)]
Merge pull request #10885 from alalek:issue_10881

6 years agoMerge pull request #10589 from patrikhuber:patch-1
Patrik Huber [Sat, 17 Feb 2018 11:53:30 +0000 (11:53 +0000)]
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

6 years agoFix typo in core/base.hpp
Ryo Suzuki [Sat, 17 Feb 2018 10:35:25 +0000 (19:35 +0900)]
Fix typo in core/base.hpp

6 years agocore: fix parallel_for data race
Alexander Alekhin [Fri, 16 Feb 2018 11:08:51 +0000 (14:08 +0300)]
core: fix parallel_for data race

6 years agoMerge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
Alexander Alekhin [Fri, 16 Feb 2018 11:17:32 +0000 (11:17 +0000)]
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area