Tae-Young Chung [Thu, 5 Jul 2018 05:46:11 +0000 (14:46 +0900)]
Exclude unnecessary model files and disable not used modules
Change-Id: If3213edb8bf773f1a5ca929f25f06311ae6c455a
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
Tae-Young Chung [Mon, 18 Jun 2018 10:29:04 +0000 (19:29 +0900)]
Remove unnecessary packages for UI and modify cmake configuration
Change-Id: I7767df20ff5bcc6145e89b16adc9f390f40c9782
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
Tae-Young Chung [Tue, 6 Mar 2018 10:35:23 +0000 (19:35 +0900)]
Add opencv-contrib.tar.gz
From 3.x some of modules in OpenCV are moved to opencv-contrib as
external repository. To support them, archive the repository as tar.gz
and then added to OpenCV.
Related changes are also applied to opencv.spec file.
Change-Id: I521d7ba3e40db59a07cc186ff80ebd40367cd012
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
(cherry picked from commit
2f90508a69dfa562645af1972d6c77461cb91563)
Tae-Young Chung [Tue, 6 Mar 2018 05:19:42 +0000 (14:19 +0900)]
Packaging: Fix spec file and update release version
- Release version: 3.4.1
- Rename license files
Change-Id: I2e7bffa99a034e120bcdb0b0cd368e8e159e8dce
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
Tae-Young Chung [Mon, 18 Jun 2018 07:28:31 +0000 (16:28 +0900)]
Bump to 3.4.1
Change-Id: Id2ab7b6d3f6be3022ecbfb82a89b7d8bf4dce239
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
Tae-Young Chung [Tue, 27 Mar 2018 05:11:35 +0000 (14:11 +0900)]
Disable GPU and remove BuildRequires mesa package
Change-Id: I101ef780e964bc67553e7de8e04e8175b5579775
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
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
Alexander Alekhin [Mon, 29 Jan 2018 15:02:00 +0000 (18:02 +0300)]
cmake: customize OpenCV build via CMake script hooks
Dmitry Kurtaev [Wed, 14 Feb 2018 13:56:31 +0000 (16:56 +0300)]
Add a flag to manage average pooling with padding
Alexander Alekhin [Wed, 14 Feb 2018 12:49:53 +0000 (12:49 +0000)]
Merge pull request #10854 from pengli:dnn
Alexander Alekhin [Wed, 14 Feb 2018 12:47:43 +0000 (12:47 +0000)]
Merge pull request #10864 from alalek:cmake_update_debug_info
Vadim Pisarevsky [Wed, 14 Feb 2018 12:25:18 +0000 (12:25 +0000)]
Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo
Vadim Pisarevsky [Wed, 14 Feb 2018 11:36:50 +0000 (11:36 +0000)]
Merge pull request #10678 from terfendail:OutputArray_recreate
Vadim Pisarevsky [Wed, 14 Feb 2018 11:33:15 +0000 (11:33 +0000)]
Merge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt
Dmitry Kurtaev [Wed, 14 Feb 2018 11:17:44 +0000 (14:17 +0300)]
Add const getInputsInfo
Vadim Pisarevsky [Wed, 14 Feb 2018 10:50:05 +0000 (10:50 +0000)]
Merge pull request #10861 from nglee:dev_cudaDftAlgorithmTest
Vadim Pisarevsky [Wed, 14 Feb 2018 10:49:05 +0000 (10:49 +0000)]
Merge pull request #10863 from mshabunin:fix-viz-samples-build
Alexander Alekhin [Tue, 13 Feb 2018 14:34:40 +0000 (17:34 +0300)]
cmake: debug info
Vadim Pisarevsky [Wed, 14 Feb 2018 10:35:14 +0000 (10:35 +0000)]
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests
Alexander Alekhin [Wed, 14 Feb 2018 09:56:11 +0000 (09:56 +0000)]
Merge pull request #10859 from luzpaz:misc-modules-typos-cont-2
Maksim Shabunin [Wed, 14 Feb 2018 09:45:10 +0000 (12:45 +0300)]
Samples: fixed samples build in case the viz module is disabled
Namgoo Lee [Wed, 14 Feb 2018 00:54:13 +0000 (09:54 +0900)]
Fix for CUDA_Arithm/Dft.Algorithm/0 test
Li Peng [Mon, 12 Feb 2018 11:14:41 +0000 (19:14 +0800)]
re-enable tensor flow mobilenet ssd ocl test
Signed-off-by: Li Peng <peng.li@intel.com>
luz.paz [Tue, 13 Feb 2018 16:28:11 +0000 (11:28 -0500)]
Misc. modules/ cont. pt2
Found via `codespell`
Alexander Alekhin [Tue, 13 Feb 2018 16:12:28 +0000 (16:12 +0000)]
Merge pull request #10846 from luzpaz:misc-modules-typos-cont
Alexander Alekhin [Tue, 13 Feb 2018 16:08:48 +0000 (16:08 +0000)]
Merge pull request #10821 from dkurt:dnn_layers_fusion
Li Peng [Mon, 12 Feb 2018 14:52:37 +0000 (22:52 +0800)]
add fallback case for ocl convolution
The ocl convolution doesn't support tensorflow padMode well.
Add fallback check if we meet this situation, it could fix the
tensorflow MobileNet SSD failure.
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Sun, 11 Feb 2018 10:12:25 +0000 (18:12 +0800)]
ocl fix for detection_output and prior_box layer
Signed-off-by: Li Peng <peng.li@intel.com>