platform/upstream/opencv.git
6 years agocore: write log messages via __android_log_print (logcat) too
Alexander Alekhin [Wed, 14 Mar 2018 12:33:02 +0000 (15:33 +0300)]
core: write log messages via __android_log_print (logcat) too

6 years agoMerge pull request #11057 from tomoaki0705:fixClangComplexCalib3d
Alexander Alekhin [Tue, 13 Mar 2018 13:43:21 +0000 (13:43 +0000)]
Merge pull request #11057 from tomoaki0705:fixClangComplexCalib3d

6 years agoMerge pull request #10923 from Preventis:patch-ios
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

6 years agoavoid clang weird behavior in calib3d
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

6 years agoMerge pull request #11049 from take1014:#10948
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

6 years agoMerge pull request #11035 from shimat:refactoring_decolor
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

6 years agoMerge pull request #11052 from adamrankin:patch-1
Alexander Alekhin [Mon, 12 Mar 2018 14:06:35 +0000 (14:06 +0000)]
Merge pull request #11052 from adamrankin:patch-1

6 years agoUpdate precomp.hpp
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)

6 years agoMerge pull request #10992 from dkurt:dnn_opencl_tests
Alexander Alekhin [Fri, 9 Mar 2018 10:06:39 +0000 (10:06 +0000)]
Merge pull request #10992 from dkurt:dnn_opencl_tests

6 years agoMerge pull request #11030 from jchazalon:patch-1
Alexander Alekhin [Thu, 8 Mar 2018 17:54:14 +0000 (17:54 +0000)]
Merge pull request #11030 from jchazalon:patch-1

6 years agoMerge pull request #11033 from adamrankin:patch-1
Alexander Alekhin [Thu, 8 Mar 2018 17:49:10 +0000 (17:49 +0000)]
Merge pull request #11033 from adamrankin:patch-1

6 years agoMerge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013
Alexander Alekhin [Thu, 8 Mar 2018 14:28:13 +0000 (14:28 +0000)]
Merge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013

6 years agoEnabling build of stitching when CUDA is available
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`

6 years agoUpdate OpenCVDownload.cmake to fix log crash
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

6 years agoReset OpenCL kernels if batch size changes
Dmitry Kurtaev [Wed, 7 Mar 2018 13:56:41 +0000 (16:56 +0300)]
Reset OpenCL kernels if batch size changes

6 years agoMerge pull request #10928 from Mehanik:fix_timeout
Alexander Alekhin [Wed, 7 Mar 2018 12:34:09 +0000 (12:34 +0000)]
Merge pull request #10928 from Mehanik:fix_timeout

6 years agoOptimize decolor in photo (#10997)
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

6 years agoFix return code in case of timeout
Eugene Mikhantiev [Wed, 7 Mar 2018 10:26:34 +0000 (17:26 +0700)]
Fix return code in case of timeout

6 years agoMerge pull request #10959 from alalek:cmake_ocl4dnn
Alexander Alekhin [Wed, 7 Mar 2018 10:26:14 +0000 (10:26 +0000)]
Merge pull request #10959 from alalek:cmake_ocl4dnn

6 years agoReplace DNNTarget and DNNBackend in tests
Dmitry Kurtaev [Wed, 7 Mar 2018 09:59:38 +0000 (12:59 +0300)]
Replace DNNTarget and DNNBackend in tests

6 years agolet the performance tests of WarpPerspective pass
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

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 agoParametric OpenCL deep learning tests
Dmitry Kurtaev [Mon, 5 Mar 2018 15:21:19 +0000 (18:21 +0300)]
Parametric OpenCL deep learning tests

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 agodnn(workaround): switch to CPU target if compiled without OpenCL
Alexander Alekhin [Wed, 28 Feb 2018 12:22:20 +0000 (15:22 +0300)]
dnn(workaround): switch to CPU target if compiled without OpenCL

6 years agodnn: make OpenCL DNN code optional
Alexander Alekhin [Wed, 28 Feb 2018 10:58:55 +0000 (13:58 +0300)]
dnn: make OpenCL DNN code optional

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