Namgoo Lee [Fri, 19 Jan 2018 11:06:05 +0000 (20:06 +0900)]
cv::cuda::cvtColor bug fix (#10640)
* cuda::cvtColor bug fix
Fixed bug in conversion formula between RGB space and LUV space.
Testing with opencv_test_cudaimgproc.exe, this commit reduces the number
of failed tests from 191 to 95. (96 more tests pass)
* Rename variables
Vadim Pisarevsky [Fri, 19 Jan 2018 11:02:14 +0000 (11:02 +0000)]
Merge pull request #10637 from catree:fix_perf_build_cuda_9
Alexander Alekhin [Fri, 19 Jan 2018 10:11:56 +0000 (10:11 +0000)]
Merge pull request #10633 from csukuangfj:doc-estimateAffine
Alexander Alekhin [Fri, 19 Jan 2018 10:01:41 +0000 (10:01 +0000)]
Merge pull request #10639 from pengli:dnn
Li Peng [Fri, 19 Jan 2018 10:23:02 +0000 (18:23 +0800)]
more update on MVN layer ocl implementation
cut one ocl kernel if normVariance is disabled,
also use native_powr for performance reason.
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Fri, 19 Jan 2018 09:44:21 +0000 (09:44 +0000)]
Merge pull request #10591 from drkoller:master
catree [Thu, 18 Jan 2018 23:23:02 +0000 (00:23 +0100)]
Fix perf build with CUDA 9.
Fangjun Kuang [Thu, 18 Jan 2018 11:40:59 +0000 (12:40 +0100)]
Improve the documentation for affine transform estimation.
Alexander Alekhin [Thu, 18 Jan 2018 18:26:30 +0000 (18:26 +0000)]
Merge pull request #10625 from pengli:dnn
Li Peng [Tue, 16 Jan 2018 13:54:32 +0000 (21:54 +0800)]
ocl support for Deconvolution layer
Signed-off-by: Li Peng <peng.li@intel.com>
Vadim Pisarevsky [Thu, 18 Jan 2018 13:46:27 +0000 (13:46 +0000)]
Merge pull request #10634 from sturkmen72:update_samples
Alexander Alekhin [Thu, 18 Jan 2018 13:39:36 +0000 (13:39 +0000)]
Merge pull request #10605 from alalek:ocl_fix_deadlock
Maksim Shabunin [Thu, 18 Jan 2018 13:37:19 +0000 (16:37 +0300)]
Merge pull request #10621 from mshabunin:disable-docs
Documentation generation refactoring (#10621)
* Documentation build updates:
- disable documentation by default, do not add to ALL target
- combine Doxygen and Javadoc
- optimize Doxygen html
* javadoc: fix path in build directory
* cmake: fix "Documentation" status line
Gregory Morse [Thu, 18 Jan 2018 04:49:47 +0000 (05:49 +0100)]
Merge pull request #10412 from GregoryMorse:patch-2
Update to add window position and size retrieval to HighGUI (#10412)
* Update highgui.hpp
Add read only property retrieval for enhanced rendering capabilities and more sophisticated research tools
* Update window.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_QT.h
* Update window_gtk.cpp
* Update precomp.hpp
* Update highgui_c.h
* Update highgui_c.h
* Update window_w32.cpp
* Update precomp.hpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_gtk.cpp
* Update window_gtk.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_carbon.cpp
* Update window_cocoa.mm
* Update precomp.hpp
* Update window_cocoa.mm
* Update window_w32.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_cocoa.mm
* Update window_carbon.cpp
* Update window_w32.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_cocoa.mm
* Update window.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update highgui_c.h
* Update highgui.hpp
* Update window.cpp
* Update highgui_c.h
* Update test_gui.cpp
* Update highgui.hpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
Alexander Alekhin [Thu, 18 Jan 2018 04:44:59 +0000 (04:44 +0000)]
Merge pull request #10512 from sturkmen72:update_documentation
Suleyman TURKMEN [Sun, 14 Jan 2018 11:05:25 +0000 (14:05 +0300)]
Update samples
Alexander Alekhin [Wed, 17 Jan 2018 20:52:26 +0000 (23:52 +0300)]
Merge pull request #10622 from alalek:fix_build_js
Re-apply protobuf fix for JavaScript builds
Dmitry Kurtaev [Sat, 2 Dec 2017 20:52:35 +0000 (23:52 +0300)]
Re-apply protobuf fix for JavaScript builds
original commit:
f5035150824c49d3a2d7cb7ce69ac1ffbdf8c63d
JavaScript bindings for dnn module
David Koller [Sun, 14 Jan 2018 05:39:11 +0000 (00:39 -0500)]
Make DNN Crop layer match Caffe default offset behavior
and add parametric unit test for crop layer.
Alexander Alekhin [Wed, 17 Jan 2018 11:34:03 +0000 (11:34 +0000)]
Merge pull request #10593 from alalek:android_build_sdk_configuration
Alexander Alekhin [Wed, 17 Jan 2018 09:58:34 +0000 (09:58 +0000)]
Merge pull request #10613 from csukuangfj:fix-10612
Alexander Alekhin [Wed, 17 Jan 2018 09:40:42 +0000 (09:40 +0000)]
Merge pull request #10604 from aimotive:master
Alexander Alekhin [Wed, 17 Jan 2018 09:02:50 +0000 (09:02 +0000)]
Merge pull request #10609 from csukuangfj:patch-1
razerhell [Wed, 17 Jan 2018 09:05:13 +0000 (17:05 +0800)]
Merge pull request #10574 from razerhell:patch-1
* Newton's method can be more efficient
when we get the result of function distortPoint with a point (0, 0) and then undistortPoint with the result, we get the point not (0, 0). and then we discovered that the old method is not convergence sometimes. finally we have gotten the right values by Newton's method.
* modify by advice Newton's method...#10574
* calib3d(fisheye): fix codestyle, update theta before exit EPS check
Alexander Alekhin [Wed, 17 Jan 2018 08:58:25 +0000 (08:58 +0000)]
Merge pull request #10602 from pengli:dnn
Li Peng [Wed, 10 Jan 2018 13:56:42 +0000 (21:56 +0800)]
MVN layer ocl implementation
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 23 Nov 2017 14:39:10 +0000 (22:39 +0800)]
Power, Tanh and Channels ReLU layer ocl support
Signed-off-by: Li Peng <peng.li@intel.com>
csukuangfj [Tue, 16 Jan 2018 19:46:26 +0000 (20:46 +0100)]
Improve the documentation for cv::completeSymm and cv::RANSACUpdateNumIters.
Fangjun Kuang [Tue, 16 Jan 2018 22:47:15 +0000 (23:47 +0100)]
fix issue #10612.
Csaba Keszegh [Tue, 16 Jan 2018 14:22:26 +0000 (15:22 +0100)]
fix: use CXX_STANDARD when extracting compiler flags for PCH with GNUCXX
When compiling with cmake using -DCMAKE_CXX_STANDARD=11 use `-std=gnu++11`
for PCH compiler flags, otherwise it triggers an error:
opencv_core_Release.gch: not used because `__cplusplus' defined as ` 201103L' not ` 199711L' [-Winvalid-pch]
Use CXX_EXTENSIONS property to select `gnu++11` or `c++11`.
Trying to mimic cmake logic here: https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmLocalGenerator.cxx#L1527-1557
Alexander Alekhin [Tue, 16 Jan 2018 17:47:30 +0000 (17:47 +0000)]
Merge pull request #10606 from alalek:update_copyright_2018
Alexander Alekhin [Tue, 16 Jan 2018 14:33:06 +0000 (17:33 +0300)]
core(ocl): fix deadlock in UMatDataAutoLock
UMatData locks are not mapped on real locks (they are mapped to some "pre-initialized" pool).
Concurrent execution of these statements may lead to deadlock:
- a.copyTo(b) from thread 1
- c.copyTo(d) from thread 2
where:
- 'a' and 'd' are mapped to single lock "A".
- 'b' and 'c' are mapped to single lock "B".
Workaround is to process locks with strict order.
Woody Chow [Tue, 16 Jan 2018 14:15:23 +0000 (23:15 +0900)]
Propagate calculated Gaussian kernel size(ref). Otherwise, ipp_GaussianBlur will fail if user doesn't specify a kernel size. (#10579)
Alexander Alekhin [Tue, 16 Jan 2018 13:19:32 +0000 (13:19 +0000)]
Merge pull request #10581 from mshabunin:minor-issues-fixes
Maksim Shabunin [Thu, 11 Jan 2018 10:50:35 +0000 (13:50 +0300)]
Add ThinLTO support for clang
Maksim Shabunin [Mon, 25 Dec 2017 13:57:40 +0000 (16:57 +0300)]
Fixed several warnings produced by clang 6 and static analyzers
Alexander Alekhin [Tue, 16 Jan 2018 12:18:18 +0000 (12:18 +0000)]
Merge pull request #10595 from oqtvs:updateProtobuf
Li Peng [Fri, 12 Jan 2018 13:30:19 +0000 (21:30 +0800)]
batch_norm layer ocl update
use a batch_norm ocl kernel to do the work
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 16 Jan 2018 10:55:42 +0000 (13:55 +0300)]
copyright: 2018
Vadim Pisarevsky [Tue, 16 Jan 2018 10:51:04 +0000 (10:51 +0000)]
Merge pull request #10575 from ioxp:getFontScale
Alexander Alekhin [Mon, 15 Jan 2018 20:28:57 +0000 (20:28 +0000)]
protobuf: drop unused files
Alexander Alekhin [Mon, 15 Jan 2018 19:49:36 +0000 (19:49 +0000)]
dnn: protobuf build warnings
oqtvs [Mon, 15 Jan 2018 15:51:38 +0000 (15:51 +0000)]
dnn: Updated protobuf files (3.5.1)
oqtvs [Mon, 15 Jan 2018 15:51:37 +0000 (13:51 -0200)]
Updated protobuf version to 3.5.1
Alexander Alekhin [Mon, 15 Jan 2018 15:05:32 +0000 (15:05 +0000)]
Merge pull request #10580 from woodychow:parallel_initUndistortRectifyMap
Alexander Alekhin [Mon, 15 Jan 2018 06:07:50 +0000 (06:07 +0000)]
Merge pull request #10585 from dkurt:dnn_weightless_scale
woody.chow [Mon, 15 Jan 2018 00:20:35 +0000 (09:20 +0900)]
Parallelize initUndistortRectifyMap
Alexander Alekhin [Fri, 5 Jan 2018 02:40:37 +0000 (02:40 +0000)]
android: update build_sdk.py
- configuration files for ABIs configuration
- use builtin Android NDK's toolchain by default (force flag to use OpenCV's toolchain)
- default values for 'work_dir' and 'opencv_dir'
Alexander Alekhin [Sun, 14 Jan 2018 08:12:28 +0000 (08:12 +0000)]
Merge pull request #10588 from dkurt:dnn_blobFromImage_ext
Dmitry Kurtaev [Sat, 13 Jan 2018 15:17:56 +0000 (18:17 +0300)]
dnn::blobFromImage with OutputArray
Dmitry Kurtaev [Fri, 12 Jan 2018 08:59:05 +0000 (11:59 +0300)]
Untrainable version of Scale layer from Caffe
Alexander Alekhin [Sat, 13 Jan 2018 04:31:10 +0000 (04:31 +0000)]
Merge pull request #10495 from alalek:cmake_java
Alexander Alekhin [Thu, 4 Jan 2018 04:39:22 +0000 (04:39 +0000)]
cmake: ocv_target_include_directories() handle SYSTEM directories
Alexander Alekhin [Wed, 3 Jan 2018 19:07:55 +0000 (19:07 +0000)]
android: fix SDK build
- fix Javadoc:
- generate Javadoc after gather step to process all Java files (including Android 21)
- generate into 'OpenCV-android-sdk' directly without additional copy step
- use smart copy/move utility functions ('shutil' doesn't well with existed destination)
- by default move files to reduce pressure on storage I/O (> 800Mb)
Alexander Alekhin [Wed, 3 Jan 2018 18:53:32 +0000 (18:53 +0000)]
java: fix MacOS Java problem
Alexander Alekhin [Wed, 3 Jan 2018 17:18:39 +0000 (17:18 +0000)]
java: fix bindings generator
- fix imports override.
Problem is observed with BoostDesc.
- add Ptr<> handling (constructor is protected from other packages).
Observed in ximgproc:
Ptr<StereoMatcher> createRightMatcher(Ptr<StereoMatcher> matcher_left)"
where, "StereoMather" is from another package (calib3d)
Alexander Alekhin [Wed, 3 Jan 2018 15:16:35 +0000 (15:16 +0000)]
java: disable highgui wrapped code
Alexander Alekhin [Wed, 3 Jan 2018 04:33:40 +0000 (04:33 +0000)]
fixes for old CMake (2.8.12.2)
Alexander Alekhin [Fri, 29 Dec 2017 04:15:30 +0000 (04:15 +0000)]
cmake: Java/Android SDK refactoring
Suleyman TURKMEN [Sun, 31 Dec 2017 11:13:13 +0000 (14:13 +0300)]
Update documentation
Alexander Alekhin [Fri, 29 Dec 2017 04:15:00 +0000 (04:15 +0000)]
java: files rename
intermediate commit (to simplify code review)
Alexander Alekhin [Fri, 29 Dec 2017 04:14:30 +0000 (04:14 +0000)]
java(test): fix test names
Alexander Alekhin [Fri, 12 Jan 2018 18:43:08 +0000 (18:43 +0000)]
Merge pull request #10582 from mshabunin:fix-ocl-concurrent-cache-name
Maksim Shabunin [Fri, 12 Jan 2018 16:03:16 +0000 (19:03 +0300)]
Fixed concurrent OpenCL cache folder name generation
SarenT [Fri, 12 Jan 2018 15:00:58 +0000 (16:00 +0100)]
Merge pull request #10489 from SarenT:offset-mat_put
Adding capability to parse subsections of a byte array in Java bindings (#10489)
* Adding capability to parse subsections of a byte array in Java bindings. (Because Java lacks pointers. Therefore, reading images within a subsection of a byte array is impossible by Java's nature and limitations. Because of this, many IO functions in Java require additional parameters offset and length to define, which section of an array to be read.)
* Corrected according to the review. Previous interfaces were restored, instead internal interfaces were modified to provide subsampling of java byte arrays.
* Adding tests and test related files.
* Adding missing files for the test.
* Simplified the test
* Check was corrected according to discussion. An OutOfRangeException will be thrown instead of returning.
* java: update MatOfByte implementation checks / tests
Alexander Alekhin [Fri, 12 Jan 2018 12:23:37 +0000 (12:23 +0000)]
Merge pull request #10490 from alalek:cmake_android_refactor_copy_project_files
Alexander Alekhin [Fri, 12 Jan 2018 12:22:40 +0000 (12:22 +0000)]
Merge pull request #10515 from alalek:android_ndk16
Alexander Alekhin [Thu, 11 Jan 2018 18:47:27 +0000 (18:47 +0000)]
Merge pull request #10504 from opentrack:fork
Stanislaw Halik [Thu, 4 Jan 2018 06:12:18 +0000 (07:12 +0100)]
modules/videoio: fix PS3Eye camera property window
v2: fix stray trailing whitespace
v3: only allow for up to one property window at the time
Opening multiple windows in the same process will just confuse
the camera filter or outright crash.
Suggested-by: @alalek
Also return whether a dialog was opened at the time.
Alexander Alekhin [Thu, 11 Jan 2018 14:15:40 +0000 (14:15 +0000)]
Merge pull request #10391 from ElenaGvozdeva:HAL_minMaxIdx
Philipp Hasper [Thu, 11 Jan 2018 12:27:16 +0000 (13:27 +0100)]
Added getFontScaleFromHeight()
Dmitry Kurtaev [Wed, 10 Jan 2018 18:50:54 +0000 (21:50 +0300)]
Merge pull request #10466 from dkurt:reduce_umat_try_2
* UMat blobs are wrapped
* Replace getUMat and getMat at OpenCLBackendWrapper
Alexander Alekhin [Wed, 10 Jan 2018 11:39:47 +0000 (11:39 +0000)]
Merge pull request #10549 from Sahloul:bug_fix/FLANN
Alexander Alekhin [Wed, 10 Jan 2018 11:35:25 +0000 (11:35 +0000)]
Merge pull request #10568 from alalek:fix_10565
Alexander Alekhin [Wed, 10 Jan 2018 10:22:19 +0000 (10:22 +0000)]
Merge pull request #10567 from terfendail:createsample_fix
Alexander Alekhin [Wed, 10 Jan 2018 10:15:41 +0000 (10:15 +0000)]
Merge pull request #10566 from alalek:jasper_checks
Alexander Alekhin [Wed, 10 Jan 2018 10:15:09 +0000 (10:15 +0000)]
Merge pull request #10563 from alalek:issue_10540
Aaron Bray [Wed, 10 Jan 2018 09:32:34 +0000 (04:32 -0500)]
Merge pull request #10497 from aaron-bray:msvc2017-findcuda
* Update to properly find the compiler tools for MSVC 2017
* FindCUDA: Fix the MSVC 2017 compiler tool locations
Alexander Alekhin [Tue, 9 Jan 2018 18:32:01 +0000 (18:32 +0000)]
core: fix unresolved symbols from utils::fs
Alexander Alekhin [Tue, 9 Jan 2018 19:24:28 +0000 (19:24 +0000)]
Merge pull request #10513 from pengli:dnn
Vitaly Tuzov [Tue, 9 Jan 2018 17:30:39 +0000 (20:30 +0300)]
Fixed exception when ROI for generated sample is evaluated out of image borders
Alexander Alekhin [Tue, 9 Jan 2018 14:36:57 +0000 (17:36 +0300)]
imgcodecs: add more Jasper checks for supported and tested cases
Alexander Alekhin [Tue, 9 Jan 2018 15:32:42 +0000 (15:32 +0000)]
Merge pull request #10544 from alalek:issue_10535
Alexander Alekhin [Tue, 9 Jan 2018 14:56:52 +0000 (17:56 +0300)]
imgcodecs: add overflow checks
Alexander Alekhin [Tue, 9 Jan 2018 14:48:55 +0000 (17:48 +0300)]
imgcodecs: remove assert() usage
Li Peng [Thu, 4 Jan 2018 15:14:28 +0000 (23:14 +0800)]
batch_norm and blank layer ocl implementation
Signed-off-by: Li Peng <peng.li@intel.com>
tobycollins [Tue, 9 Jan 2018 12:54:36 +0000 (13:54 +0100)]
Merge pull request #10522 from tobycollins:issue10519
Alessandro de Oliveira Faria (A.K.A.CABELO) [Mon, 8 Jan 2018 19:30:28 +0000 (17:30 -0200)]
Merge pull request #10502 from cabelo/save-dnn-yolo
Save video file (#10502)
Alexander Alekhin [Sun, 7 Jan 2018 18:16:38 +0000 (18:16 +0000)]
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
Alexander Alekhin [Mon, 8 Jan 2018 19:18:59 +0000 (19:18 +0000)]
Merge pull request #10550 from dkurt:replace_psroi_pooling_tag
Alexander Alekhin [Mon, 8 Jan 2018 13:22:44 +0000 (13:22 +0000)]
Merge pull request #10545 from alalek:dnn_blob_manager_runtime_option
Dmitry Kurtaev [Mon, 8 Jan 2018 10:27:57 +0000 (13:27 +0300)]
Replace Caffe's psroi_pooling_param tag from 10001 to 10002
Hamdi Sahloul [Mon, 8 Jan 2018 09:26:10 +0000 (18:26 +0900)]
resolves #10548 - `FLANN::knnSearch` garbage bug (when kNN is larger than the dataset size)
Alexander Alekhin [Sun, 7 Jan 2018 18:38:14 +0000 (18:38 +0000)]
dnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option
replaces REUSE_DNN_MEMORY compile-time option
Alexander Alekhin [Sun, 7 Jan 2018 12:53:22 +0000 (12:53 +0000)]
Merge pull request #10537 from pnemonic78:master_false
Moshe [Sun, 7 Jan 2018 08:12:53 +0000 (10:12 +0200)]
Bitwise "and false"
Bitwise "and false" is always false.
Alexander Alekhin [Sun, 7 Jan 2018 06:50:49 +0000 (06:50 +0000)]
Merge pull request #10536 from Sahloul:bug_fix/BLOB
Alexander Alekhin [Sun, 7 Jan 2018 06:48:05 +0000 (06:48 +0000)]
Merge pull request #10534 from ericrwx:videoio-psnr-typo-fix
Alexander Alekhin [Sun, 7 Jan 2018 06:46:45 +0000 (06:46 +0000)]
Merge pull request #10527 from csukuangfj:local
Hamdi Sahloul [Sun, 7 Jan 2018 05:30:40 +0000 (14:30 +0900)]
BLOB - Support RGBA