Alexander Alekhin [Thu, 15 Mar 2018 11:17:02 +0000 (14:17 +0300)]
cmake: fix android examples dependencies
add_dependencies(${target}) doesn't control regeneration of .apk file,
because "${target}" is dummy target.
Rostislav Vasilikhin [Thu, 15 Mar 2018 11:10:40 +0000 (14:10 +0300)]
Merge pull request #10869 from savuor:color_cpp_split
color.cpp split (#10869)
* initial split is done
* files renamed (these names are excluded during compilation)
* IPP code moved to corresponding files
* splineBuild, splineInterpolate -> color_lab.cpp
* Lab, Luv: little refactored
* it compiles (didn't check work); Lab OCL code moved to color_lab.cpp
* cvtcolor.cl: Lab/Luv part moved to color_lab.cl
* cvtcolor.cl: color_rgb.cl extracted
* cvtcolor.cl: color_yuv.cl separated
* cvtcolor.cl: color_hsv.cl extracted
* cvtcolor.cl: extracted to color_lab.cl and color_rgb.cl
* helper functions moved to hpp file
* Lab, Luv: moved to color_lab.cpp
* CPU XYZ: to color_lab.cpp
* OCL XYZ: to color_lab.cpp
* warning fixed
* CvtHelper added
* CPU YUV: to color_yuv.cpp, helpers to color.hpp
* CPU HLS/HSV: to color_hsv.cpp
* CPU BGR2BGR: to color_rgb.cpp
* CPU RGB: to color_rgb.cpp
* extra arg removed
* CPU YUV: to color_yuv.cpp
* color code decoded
* OclHelper added, some funcs rewritten
* color_lab.cpp: refactored to use OclHelper
* OCL RGB: to color_rgb.cpp
* OCL HLS/HSV: to color_hsv.cpp
* OCL YUV: to color_yuv.cpp
* OCL YUV planes: to color_yuv.cpp
* OCL: color code reduced
* licence to demosaicing.cpp
* IPP func tables to color_rgb.cpp
* code cleanup
* HAVE_OPENCL ifdefs added
* helpers made more common
* fixed two plane YUV with separate mats
* fixed warning in gcc7.2.0
* precomp header fixed
* color space classification functions fixed
* helpers fixed
* rename: isSRGB -> is_sRGB
Alexander Alekhin [Thu, 15 Mar 2018 09:58:04 +0000 (09:58 +0000)]
Merge pull request #11075 from iluxave:master
Ilya A. Volynets-Evenbakh [Wed, 14 Mar 2018 16:40:45 +0000 (09:40 -0700)]
Fix crash on exit in opencv_annotation
destroyWindow was called twice during completion of the
annotation procedure, resulting in a crash, and failure to write
an output file
Alexander Alekhin [Wed, 14 Mar 2018 14:36:25 +0000 (14:36 +0000)]
Merge pull request #10940 from dkurt:dnn_tf_graph_optim
Alexander Alekhin [Wed, 14 Mar 2018 14:33:49 +0000 (14:33 +0000)]
Merge pull request #10979 from dkurt:unite_dnn_samples
Alexander Alekhin [Wed, 14 Mar 2018 14:15:47 +0000 (14:15 +0000)]
Merge pull request #11065 from vasiliev-vb:BUGFIX_KAZE_orientation
miqlas [Wed, 14 Mar 2018 14:09:10 +0000 (15:09 +0100)]
Merge pull request #10984 from extrowerk:advanced_haiku_patches
* Haiku supporting patches
* Revert uneeded changes
* Whitespace cleanup
vasiliev-vb [Tue, 13 Mar 2018 15:09:36 +0000 (15:09 +0000)]
Fixed bug in KAZE features orientation.
Bug was added in f6ceeaa commit, different angle computation functions have different parameter order.
Alexander Alekhin [Tue, 13 Mar 2018 13:43:21 +0000 (13:43 +0000)]
Merge pull request #11057 from tomoaki0705:fixClangComplexCalib3d
Ben John [Tue, 13 Mar 2018 13:09:26 +0000 (14:09 +0100)]
Merge pull request #10923 from Preventis:patch-ios
Fixed dynamic build script for iOS (#10923)
* Readded UIDeviceFamily (was removed in beec247)
* Added correct bitcode flag to python build script for iOS
* Missed the bitcodedisabled check
* Corrected the syntax in my proposed changes
Tomoaki Teshima [Tue, 13 Mar 2018 12:51:20 +0000 (21:51 +0900)]
avoid clang weird behavior in calib3d
* add ifdef to apply on specific situation
Dmitry Kurtaev [Mon, 12 Mar 2018 15:42:53 +0000 (18:42 +0300)]
Add test for Scalar arguments at CommandLineParser
yuki takehara [Mon, 12 Mar 2018 18:49:10 +0000 (03:49 +0900)]
Merge pull request #11049 from take1014:#10948
* Fix #10948
* Add test code
* Fixed build error
* Add value zero
* eigen: test cleanup
shimat [Mon, 12 Mar 2018 14:22:06 +0000 (23:22 +0900)]
Merge pull request #11035 from shimat:refactoring_decolor
Refactor decolor (#11035)
* decolor: modernize deprecated headers (math.h -> cmath)
* refactor contrast_preserve.cpp
* refactor contrast_preserve.hpp (add static/const)
* refactor contrast_preserve.hpp (join assignment and declaration)
* refactor contrast_preserve.hpp (format)
* refactor test_decolor.cpp (indent)
* refactor contrast_preserve.hpp (const)
* contrast_preserve.hpp : optimize by minMaxLoc
* fix trailing-whitespace
* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)
* use cvRound instead of round_num
* decrease indentation of test_decolor.cpp
* remove pow() to optimize
* remove redundant Mat initialization
Alexander Alekhin [Mon, 12 Mar 2018 14:06:35 +0000 (14:06 +0000)]
Merge pull request #11052 from adamrankin:patch-1
Dmitry Kurtaev [Wed, 7 Mar 2018 12:57:15 +0000 (15:57 +0300)]
Update assertions in batch norm layer
Dmitry Kurtaev [Thu, 1 Mar 2018 16:47:50 +0000 (19:47 +0300)]
Fuse subgraphs from Keras
Dmitry Kurtaev [Wed, 21 Feb 2018 16:52:48 +0000 (19:52 +0300)]
Fuse batch normalization and flatten TensorFlow subgraphs in runtime
Adam Rankin [Mon, 12 Mar 2018 02:28:18 +0000 (22:28 -0400)]
Update precomp.hpp
Enabling build of visualization module when using VTK 9 (current HEAD of
d5bbb9e99bbc6d11d2196c48bfd8f33508554551)
Alexander Alekhin [Fri, 9 Mar 2018 10:06:39 +0000 (10:06 +0000)]
Merge pull request #10992 from dkurt:dnn_opencl_tests
Alexander Alekhin [Thu, 8 Mar 2018 17:54:14 +0000 (17:54 +0000)]
Merge pull request #11030 from jchazalon:patch-1
Alexander Alekhin [Thu, 8 Mar 2018 17:49:10 +0000 (17:49 +0000)]
Merge pull request #11033 from adamrankin:patch-1
Alexander Alekhin [Thu, 8 Mar 2018 14:28:13 +0000 (14:28 +0000)]
Merge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013
Dmitry Kurtaev [Tue, 6 Mar 2018 16:29:23 +0000 (19:29 +0300)]
Semantic segmentation sample.
Adam Rankin [Thu, 8 Mar 2018 01:07:48 +0000 (20:07 -0500)]
Enabling build of stitching when CUDA is available
Without proposed change, module throws build error regarding missing `opencv2/cudaimgproc.hpp`
jchazalon [Wed, 7 Mar 2018 14:35:37 +0000 (15:35 +0100)]
Update OpenCVDownload.cmake to fix log crash
This suppresses the interpretation of string literals by switching the ocv_download_log from a macro to a function.
This avoid crashes when the string to log contains escape characters.
More details about the problem this PR fixes are available at: https://github.com/opencv/opencv_contrib/issues/1131
Dmitry Kurtaev [Wed, 7 Mar 2018 13:56:41 +0000 (16:56 +0300)]
Reset OpenCL kernels if batch size changes
Alexander Alekhin [Wed, 7 Mar 2018 12:34:09 +0000 (12:34 +0000)]
Merge pull request #10928 from Mehanik:fix_timeout
shimat [Wed, 7 Mar 2018 11:20:45 +0000 (20:20 +0900)]
Optimize decolor in photo (#10997)
* optimized cv::decolor by removing vector.push_back
* restored CV_INSTRUMENT_REGION() and original indent
* fix build warnings in contrast_preserve.hpp
* undo refactoring contrast_preserve.cpp/hpp
Eugene Mikhantiev [Wed, 7 Mar 2018 10:26:34 +0000 (17:26 +0700)]
Fix return code in case of timeout
Alexander Alekhin [Wed, 7 Mar 2018 10:26:14 +0000 (10:26 +0000)]
Merge pull request #10959 from alalek:cmake_ocl4dnn
Dmitry Kurtaev [Wed, 7 Mar 2018 09:59:38 +0000 (12:59 +0300)]
Replace DNNTarget and DNNBackend in tests
Tomoaki Teshima [Wed, 7 Mar 2018 09:55:27 +0000 (18:55 +0900)]
let the performance tests of WarpPerspective pass
* avoid misuse of vzeroupper on Visual Studio 2013 Update 5
* add ifdef to avoid unattended optimization
Maksim Shabunin [Wed, 7 Mar 2018 07:15:50 +0000 (07:15 +0000)]
Merge pull request #10946 from mshabunin:add-license-install
Alexander Alekhin [Tue, 6 Mar 2018 16:26:08 +0000 (16:26 +0000)]
Merge pull request #10989 from tomoaki0705:fixOldGstreamerTest
Alexander Alekhin [Tue, 6 Mar 2018 15:49:08 +0000 (15:49 +0000)]
Merge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012
Maksim Shabunin [Mon, 26 Feb 2018 18:10:21 +0000 (21:10 +0300)]
Add install component for 3rdparty libraries licenses
Maksim Shabunin [Tue, 6 Mar 2018 13:31:34 +0000 (13:31 +0000)]
Merge pull request #10999 from mshabunin:do-more-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)
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)
native-api [Tue, 6 Mar 2018 06:58:19 +0000 (09:58 +0300)]
Include error code description into the message (#10982)
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
Dmitry Kurtaev [Mon, 5 Mar 2018 15:21:19 +0000 (18:21 +0300)]
Parametric OpenCL deep learning tests
Alexander Alekhin [Mon, 5 Mar 2018 15:41:05 +0000 (15:41 +0000)]
Merge pull request #10980 from sturkmen72:update_doc
Tomoaki Teshima [Mon, 5 Mar 2018 10:27:49 +0000 (19:27 +0900)]
add workaround of old gstreamer
Suleyman TURKMEN [Sun, 4 Mar 2018 14:16:42 +0000 (17:16 +0300)]
Update core.hpp
Dmitry Kurtaev [Sat, 3 Mar 2018 16:29:37 +0000 (19:29 +0300)]
Update tutorials. A new cv::dnn::readNet function
Dmitry Kurtaev [Sat, 3 Mar 2018 13:43:21 +0000 (16:43 +0300)]
Unite deep learning image classification samples
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
Alexander Alekhin [Wed, 28 Feb 2018 12:22:20 +0000 (15:22 +0300)]
dnn(workaround): switch to CPU target if compiled without OpenCL
Alexander Alekhin [Wed, 28 Feb 2018 10:58:55 +0000 (13:58 +0300)]
dnn: make OpenCL DNN code optional
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()