Dmitry Kurtaev [Fri, 2 Mar 2018 09:04:39 +0000 (12:04 +0300)]
Unite deep learning object detection samples
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
Alexander Alekhin [Fri, 2 Mar 2018 11:41:00 +0000 (11:41 +0000)]
Merge pull request #10971 from alalek:ocl_error_code_string
Alexander Alekhin [Fri, 2 Mar 2018 11:39:54 +0000 (11:39 +0000)]
Merge pull request #10968 from sergiomb2:master
Alexander Alekhin [Fri, 2 Mar 2018 11:39:14 +0000 (11:39 +0000)]
Merge pull request #10966 from alalek:verbose_features2d_test
Alexander Alekhin [Fri, 2 Mar 2018 11:38:52 +0000 (11:38 +0000)]
Merge pull request #10964 from alalek:fix_10956
Alexander Alekhin [Fri, 2 Mar 2018 11:38:16 +0000 (11:38 +0000)]
Merge pull request #10962 from alalek:dnn_precomp_hpp
Alexander Alekhin [Fri, 2 Mar 2018 11:36:56 +0000 (11:36 +0000)]
Merge pull request #10961 from alalek:fix_clang_avx512
Alexander Alekhin [Fri, 2 Mar 2018 11:36:39 +0000 (11:36 +0000)]
Merge pull request #10960 from alalek:fix_protobuf_readme
Alexander Alekhin [Fri, 2 Mar 2018 11:35:59 +0000 (11:35 +0000)]
Merge pull request #10955 from pengli:dnn
Alexander Alekhin [Fri, 2 Mar 2018 11:35:41 +0000 (11:35 +0000)]
Merge pull request #10954 from whizzzkid:master
Alexander Alekhin [Fri, 2 Mar 2018 11:34:52 +0000 (11:34 +0000)]
Merge pull request #10938 from mshabunin:fix-static-issues-9
Alexander Alekhin [Fri, 2 Mar 2018 11:34:00 +0000 (11:34 +0000)]
Merge pull request #10936 from mshabunin:fix-mingw-avx512
Alexander Alekhin [Fri, 2 Mar 2018 11:32:51 +0000 (11:32 +0000)]
Merge pull request #10926 from tomoaki0705:fixTinkerBoardOpenCL
Alexander Alekhin [Thu, 1 Mar 2018 10:52:43 +0000 (13:52 +0300)]
ocl: update getOpenCLErrorString() code
whizzzkid [Wed, 28 Feb 2018 20:22:58 +0000 (13:22 -0700)]
cuda: fixes gpu samples build (issue 10953)
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.
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})
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)
Alexander Alekhin [Wed, 28 Feb 2018 13:44:41 +0000 (16:44 +0300)]
dnn: fix precomp.hpp usage
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>
Alexander Alekhin [Tue, 27 Feb 2018 12:48:19 +0000 (15:48 +0300)]
3rdparty: fix protobuf version in README file
Alexander Alekhin [Tue, 27 Feb 2018 10:21:19 +0000 (13:21 +0300)]
cmake: AVX512 with clang
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
Maksim Shabunin [Sun, 25 Feb 2018 21:16:02 +0000 (00:16 +0300)]
Fixed two issues found by static analysis
Alexander Alekhin [Sun, 25 Feb 2018 16:56:57 +0000 (16:56 +0000)]
Merge tag '3.4.1'
Maksim Shabunin [Sun, 25 Feb 2018 10:32:27 +0000 (13:32 +0300)]
CPU dispatching: additional AVX-512 check for mingw-w64
Alexander Alekhin [Mon, 19 Feb 2018 14:30:06 +0000 (17:30 +0300)]
OpenCV version++
OpenCV 3.4.1
Alexander Alekhin [Mon, 19 Feb 2018 14:24:32 +0000 (17:24 +0300)]
experimental version++
Alexander Alekhin [Fri, 23 Feb 2018 08:38:03 +0000 (08:38 +0000)]
Merge pull request #10925 from pengli:dnn
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>
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
Maksim Shabunin [Thu, 22 Feb 2018 15:05:25 +0000 (15:05 +0000)]
Merge pull request #10919 from mshabunin:fix-static-9
Maksim Shabunin [Thu, 22 Feb 2018 10:20:35 +0000 (13:20 +0300)]
Fixed several issues detected by static analysis
Maksim Shabunin [Thu, 22 Feb 2018 10:20:11 +0000 (13:20 +0300)]
Use fixed size types in AVIContainer structs
Maksim Shabunin [Thu, 22 Feb 2018 10:19:44 +0000 (13:19 +0300)]
Fixed mingw compilation on Windows
Alexander Alekhin [Thu, 22 Feb 2018 14:05:37 +0000 (14:05 +0000)]
Merge pull request #10909 from alalek:ffmpeg_update
Vadim Pisarevsky [Thu, 22 Feb 2018 12:04:26 +0000 (12:04 +0000)]
Merge pull request #9708 from dkurt:tf_face_detector
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
Vadim Pisarevsky [Thu, 22 Feb 2018 12:03:39 +0000 (12:03 +0000)]
Merge pull request #10916 from alalek:videoio_sample_aspect_ratio
Alexander Alekhin [Thu, 22 Feb 2018 10:30:00 +0000 (10:30 +0000)]
Merge pull request #10918 from pengli:dnn
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>
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>
Alexander Alekhin [Wed, 21 Feb 2018 18:26:15 +0000 (18:26 +0000)]
Merge pull request #10914 from alalek:issue_10815
Dmitry Kurtaev [Tue, 20 Feb 2018 15:04:03 +0000 (18:04 +0300)]
OpenCV face detection network in TensorFlow
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
Alexander Alekhin [Wed, 21 Feb 2018 15:55:03 +0000 (15:55 +0000)]
Merge pull request #10915 from alalek:issue_10910
Alexander Alekhin [Wed, 21 Feb 2018 13:39:35 +0000 (13:39 +0000)]
Merge pull request #10912 from alalek:fix_imgcodecs_hang
Alexander Alekhin [Wed, 21 Feb 2018 11:40:35 +0000 (14:40 +0300)]
createsamples: fix ROI in icvGetBackgroundImage()
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
Alexander Alekhin [Wed, 21 Feb 2018 10:15:10 +0000 (13:15 +0300)]
imgcodecs: fix RBaseStream hang on truncated inputs
Vadim Pisarevsky [Tue, 20 Feb 2018 23:13:55 +0000 (23:13 +0000)]
Merge pull request #10367 from savuor:multiwrite_tiff_renew
Alexander Alekhin [Tue, 20 Feb 2018 18:54:43 +0000 (18:54 +0000)]
Merge pull request #10907 from alalek:cmake_ninja_fix
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
Rostislav Vasilikhin [Wed, 20 Dec 2017 20:14:10 +0000 (23:14 +0300)]
imwrite for multipage images implemented
Vadim Pisarevsky [Tue, 20 Feb 2018 14:59:32 +0000 (14:59 +0000)]
Merge pull request #10892 from alalek:android_sdk_build_gradle
Vadim Pisarevsky [Tue, 20 Feb 2018 14:50:16 +0000 (14:50 +0000)]
Merge pull request #10406 from seiko2plus:coreUnvintrinCopy
Vadim Pisarevsky [Tue, 20 Feb 2018 14:47:13 +0000 (14:47 +0000)]
Merge pull request #10745 from terfendail:tiff_fix
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
Vadim Pisarevsky [Tue, 20 Feb 2018 13:26:59 +0000 (13:26 +0000)]
Merge pull request #10902 from alalek:port_10695
Vadim Pisarevsky [Tue, 20 Feb 2018 13:25:58 +0000 (13:25 +0000)]
Merge pull request #10903 from alalek:ml_ann_test
Vadim Pisarevsky [Tue, 20 Feb 2018 12:22:09 +0000 (12:22 +0000)]
Merge pull request #10908 from alalek:fix_ffmpeg_uchar
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
Alexander Alekhin [Tue, 20 Feb 2018 10:13:31 +0000 (13:13 +0300)]
cmake: fix Ninja warning
about BYPRODUCTS bin/opencv-340.jar
Alexander Alekhin [Tue, 20 Feb 2018 08:59:07 +0000 (08:59 +0000)]
Merge pull request #10891 from pengli:dnn
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>
Alexander Alekhin [Mon, 19 Feb 2018 16:45:04 +0000 (19:45 +0300)]
ml: refactor ML_ANN test
Vitaly Tuzov [Wed, 31 Jan 2018 13:24:24 +0000 (16:24 +0300)]
Fix for vertically flipped tiff files reading
mworchel [Thu, 25 Jan 2018 12:34:12 +0000 (13:34 +0100)]
Add mask support to SimpleBlobDetector
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
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.
Vadim Pisarevsky [Mon, 19 Feb 2018 14:16:06 +0000 (14:16 +0000)]
Merge pull request #10876 from alalek:android_static_libs
Vadim Pisarevsky [Mon, 19 Feb 2018 14:13:43 +0000 (14:13 +0000)]
Merge pull request #10880 from StevenPuttemans:fix_10594
Vadim Pisarevsky [Mon, 19 Feb 2018 14:11:11 +0000 (14:11 +0000)]
Merge pull request #10893 from alalek:fix_cpu_disable_flags
Vadim Pisarevsky [Mon, 19 Feb 2018 14:08:58 +0000 (14:08 +0000)]
Merge pull request #10896 from dkurt:tensorflow_tests_generator
Alexander Alekhin [Mon, 19 Feb 2018 13:59:20 +0000 (13:59 +0000)]
Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer
Tomoaki Teshima [Mon, 19 Feb 2018 09:33:05 +0000 (18:33 +0900)]
read in gray scale mode when writing a gray scale video
Dmitry Kurtaev [Sun, 18 Feb 2018 09:45:43 +0000 (12:45 +0300)]
Fix DNN flatten test
Alexander Alekhin [Sun, 18 Feb 2018 07:45:01 +0000 (07:45 +0000)]
Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf
Tomoaki Teshima [Sun, 18 Feb 2018 00:29:38 +0000 (09:29 +0900)]
fix test error on VS2013
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
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
Alexander Alekhin [Sat, 17 Feb 2018 12:02:48 +0000 (12:02 +0000)]
Merge pull request #10890 from Reputeless:patch-1
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
Alexander Alekhin [Sat, 17 Feb 2018 11:58:51 +0000 (11:58 +0000)]
Merge pull request #10885 from alalek:issue_10881
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
Ryo Suzuki [Sat, 17 Feb 2018 10:35:25 +0000 (19:35 +0900)]
Fix typo in core/base.hpp
Alexander Alekhin [Fri, 16 Feb 2018 11:08:51 +0000 (14:08 +0300)]
core: fix parallel_for data race
Alexander Alekhin [Fri, 16 Feb 2018 11:17:32 +0000 (11:17 +0000)]
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
Alexander Alekhin [Fri, 16 Feb 2018 10:29:39 +0000 (10:29 +0000)]
Merge pull request #10883 from alalek:portable_stdint
Alexander Alekhin [Thu, 15 Feb 2018 20:19:02 +0000 (23:19 +0300)]
build: portable integer types
Alexander Alekhin [Thu, 15 Feb 2018 15:52:52 +0000 (15:52 +0000)]
Merge pull request #10793 from denmatfoton:master
Alexander Alekhin [Thu, 15 Feb 2018 15:48:12 +0000 (15:48 +0000)]
Merge pull request #10879 from StevenPuttemans:fix_10650
Alexander Alekhin [Thu, 15 Feb 2018 15:46:12 +0000 (15:46 +0000)]
Merge pull request #10727 from alalek:cmake_hook_system
Alexander Alekhin [Thu, 15 Feb 2018 15:14:03 +0000 (15:14 +0000)]
Merge pull request #10145 from allnes:vedeoio_avi_container
Steven [Thu, 15 Feb 2018 14:59:14 +0000 (15:59 +0100)]
add missing DNN header to opencv2/opencv.hpp
Steven [Thu, 15 Feb 2018 14:44:51 +0000 (15:44 +0100)]
fix tutorial on real time pose estimation
Alexander Nesterov [Wed, 14 Feb 2018 15:04:54 +0000 (18:04 +0300)]
Added avi-container with tests
Alexander Alekhin [Thu, 15 Feb 2018 12:49:31 +0000 (15:49 +0300)]
android: move .a files into 'staticlibs' directory
to reduce overhead of gradle builds
Alexander Alekhin [Thu, 15 Feb 2018 12:17:42 +0000 (15:17 +0300)]
calib3d: add regression test for stereoCalibrate