Maksim Shabunin [Wed, 13 Jul 2016 12:46:48 +0000 (15:46 +0300)]
Ported PR #4187 to master
Maksim Shabunin [Wed, 13 Jul 2016 12:45:48 +0000 (15:45 +0300)]
Cleanup
Maksim Shabunin [Wed, 13 Jul 2016 09:11:44 +0000 (12:11 +0300)]
fixup! Fixed several merge issues
Maksim Shabunin [Wed, 13 Jul 2016 08:45:32 +0000 (11:45 +0300)]
Fixed several merge issues
Oliver Schreer [Fri, 22 May 2015 08:39:01 +0000 (10:39 +0200)]
Modified and improved the method for chessboard detection. It is now faster and detects chessboards under difficult lighting condition as well as when the chessboard has strong out of plane rotations
Alexander Alekhin [Tue, 12 Jul 2016 10:49:17 +0000 (10:49 +0000)]
Merge pull request #6882 from ilya-lavrenov:flann
Maksim Shabunin [Tue, 12 Jul 2016 09:35:22 +0000 (09:35 +0000)]
Merge pull request #6818 from Dikay900:template_patch
Ilya Lavrenov [Tue, 12 Jul 2016 08:53:51 +0000 (11:53 +0300)]
fixed memory leak in flann tests
Alexander Alekhin [Mon, 11 Jul 2016 16:34:36 +0000 (16:34 +0000)]
Merge pull request #6829 from paroj:fixpp_fe
Alexander Alekhin [Mon, 11 Jul 2016 16:32:23 +0000 (16:32 +0000)]
Merge pull request #6866 from alalek:gnu_toolchain
Pavel Rojtberg [Tue, 26 Apr 2016 10:15:53 +0000 (12:15 +0200)]
fisheye: add CALIB_FIX_PRINCIPAL_POINT
Alexander Alekhin [Mon, 11 Jul 2016 14:01:51 +0000 (14:01 +0000)]
Merge pull request #6846 from mbarnach:6086-cuda-initialization
Alexander Alekhin [Mon, 11 Jul 2016 14:01:06 +0000 (14:01 +0000)]
Merge pull request #6850 from alalek:bigdata_test
Alexander Alekhin [Mon, 11 Jul 2016 14:00:22 +0000 (14:00 +0000)]
Merge pull request #6867 from alalek:fix_lapack
Alexander Alekhin [Mon, 11 Jul 2016 13:06:00 +0000 (13:06 +0000)]
Merge pull request #6876 from janstarzy:jni-as-template-redone
Alexander Alekhin [Mon, 11 Jul 2016 10:51:26 +0000 (10:51 +0000)]
Merge pull request #6874 from berak:fix_py_tutorials
Alexander Alekhin [Mon, 11 Jul 2016 10:02:43 +0000 (10:02 +0000)]
Merge pull request #6786 from terfendail:median_fix
Alexander Alekhin [Mon, 11 Jul 2016 10:02:06 +0000 (10:02 +0000)]
Merge pull request #6790 from terfendail:linearresize_accuracy
Alexander Alekhin [Mon, 11 Jul 2016 09:57:49 +0000 (09:57 +0000)]
Merge pull request #6791 from terfendail:carotene4android_buildfix
Alexander Alekhin [Mon, 11 Jul 2016 09:57:19 +0000 (09:57 +0000)]
Merge pull request #6792 from paroj:jaccard_distance
Jan Starzynski [Mon, 11 Jul 2016 07:27:59 +0000 (09:27 +0200)]
get/put: more type-safety and code unification using templates
berak [Sun, 10 Jul 2016 09:17:00 +0000 (11:17 +0200)]
py_tutorials: fix cv2.findContours return val
Andrey Pavlenko [Fri, 8 Jul 2016 15:20:42 +0000 (15:20 +0000)]
Merge pull request #6771 from sovrasov:log_doc_fix
Andrey Pavlenko [Fri, 8 Jul 2016 15:18:22 +0000 (15:18 +0000)]
Merge pull request #6782 from LaurentBerger:I6780
Andrey Pavlenko [Fri, 8 Jul 2016 15:15:17 +0000 (15:15 +0000)]
Merge pull request #6775 from janstarzy:histo-ipp-fix
Alexander Alekhin [Fri, 8 Jul 2016 14:46:08 +0000 (17:46 +0300)]
bigdata: add test, resolve split/merge issue
Vitaly Tuzov [Fri, 8 Jul 2016 10:21:35 +0000 (13:21 +0300)]
Improved Carotene library linear resize evaluation precision and enabled it as HAL implementation.
Vitaly Tuzov [Fri, 8 Jul 2016 10:31:26 +0000 (13:31 +0300)]
Removed unnecessary check for Android API level and unused flags.
Alexander Alekhin [Fri, 8 Jul 2016 09:49:08 +0000 (09:49 +0000)]
Merge pull request #6770 from ealbuz:master
Vitaly Tuzov [Thu, 7 Jul 2016 12:58:05 +0000 (15:58 +0300)]
Fix for median blur of 2-channel images
Alexander Alekhin [Thu, 7 Jul 2016 15:48:01 +0000 (15:48 +0000)]
Merge pull request #6785 from alalek:android_native_level
Alexander Alekhin [Thu, 7 Jul 2016 10:37:18 +0000 (13:37 +0300)]
android: increase default native API level 8=>9
LaurentBerger [Thu, 7 Jul 2016 07:29:41 +0000 (09:29 +0200)]
Issue 6780
Jan Starzynski [Wed, 6 Jul 2016 07:54:28 +0000 (09:54 +0200)]
fix for buffer-overflow in IPPCalcHistInvoker::operator()
Vladislav Sovrasov [Tue, 5 Jul 2016 14:28:53 +0000 (17:28 +0300)]
Update cv::log documentation
Elif Albuz [Tue, 5 Jul 2016 06:56:15 +0000 (23:56 -0700)]
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
Elif Albuz [Tue, 5 Jul 2016 06:45:07 +0000 (23:45 -0700)]
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
Alexander Alekhin [Mon, 4 Jul 2016 14:03:05 +0000 (14:03 +0000)]
Merge pull request #6760 from alalek:issue_6653
Alexander Alekhin [Mon, 4 Jul 2016 12:17:16 +0000 (12:17 +0000)]
Merge pull request #6768 from tomoaki0705:fixEstimateAffine3DThreshold
Tomoaki Teshima [Mon, 4 Jul 2016 10:34:47 +0000 (19:34 +0900)]
calib3d: compare error and threshold both in square
* resolve #5183
Alexander Alekhin [Mon, 4 Jul 2016 09:52:03 +0000 (09:52 +0000)]
Merge pull request #6761 from alalek:fix_warnings
Dikay900 [Tue, 31 May 2016 17:27:59 +0000 (19:27 +0200)]
Rephrase parts of the templates and use comments
Alexander Alekhin [Fri, 1 Jul 2016 17:17:16 +0000 (20:17 +0300)]
build: fix compiler warnings (GCC 5.3.1)
Alexander Alekhin [Fri, 1 Jul 2016 15:27:01 +0000 (15:27 +0000)]
Merge pull request #6745 from alalek:viz_samples
Alexander Alekhin [Fri, 1 Jul 2016 14:07:16 +0000 (17:07 +0300)]
cvtColor: fix inplace processing
Andrey Pavlenko [Fri, 1 Jul 2016 13:24:05 +0000 (13:24 +0000)]
Merge pull request #6734 from PkLab:doc_videoio_enums
Alexander Alekhin [Thu, 30 Jun 2016 14:10:27 +0000 (17:10 +0300)]
cmake: lapack optimized code requires cblas.h
Alexander Alekhin [Thu, 30 Jun 2016 14:07:38 +0000 (17:07 +0300)]
core: fix arguments types for cblas calls
Vadim Pisarevsky [Thu, 30 Jun 2016 17:17:03 +0000 (17:17 +0000)]
Merge pull request #6697 from wiryls:FileStorageBase64
Andrey Pavlenko [Thu, 30 Jun 2016 15:47:45 +0000 (15:47 +0000)]
Merge pull request #6740 from tomoaki0705:fixNeonCheckSmooth
Alexander Alekhin [Wed, 29 Jun 2016 13:35:48 +0000 (16:35 +0300)]
samples: repair viz tutorial
Alexander Alekhin [Thu, 30 Jun 2016 13:44:16 +0000 (13:44 +0000)]
Merge pull request #6558 from lletourn:master
Alexander Alekhin [Thu, 30 Jun 2016 13:20:51 +0000 (13:20 +0000)]
Merge pull request #5870 from IshankGulati:VideoCapture-fix
Alexander Alekhin [Thu, 30 Jun 2016 12:41:52 +0000 (12:41 +0000)]
Merge pull request #6731 from jokereactive:viz_sample
Maksim Shabunin [Thu, 30 Jun 2016 11:35:22 +0000 (11:35 +0000)]
Merge pull request #6603 from debjan:patch-1
Alexander Alekhin [Thu, 30 Jun 2016 08:02:19 +0000 (08:02 +0000)]
Merge pull request #6747 from ludv1x:master
Vitaliy Lyudvichenko [Wed, 29 Jun 2016 16:50:51 +0000 (19:50 +0300)]
Fixing of AutoBuffer::allocate(nsz) method
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
Alexander Alekhin [Wed, 29 Jun 2016 11:55:08 +0000 (11:55 +0000)]
Merge pull request #6029 from sturkmen72:patch-7
Alexander Alekhin [Wed, 29 Jun 2016 11:03:47 +0000 (11:03 +0000)]
Merge pull request #6711 from Dubrzr:vs_compile_cuda_fix
Alexander Alekhin [Wed, 29 Jun 2016 11:00:49 +0000 (11:00 +0000)]
Merge pull request #6707 from tech2077:master
Tomoaki Teshima [Wed, 29 Jun 2016 02:17:14 +0000 (11:17 +0900)]
make NEON more similart to SSE2
Alexander Alekhin [Tue, 28 Jun 2016 14:21:54 +0000 (17:21 +0300)]
cmake: update arm toolchain
Alexander Alekhin [Tue, 28 Jun 2016 16:53:45 +0000 (16:53 +0000)]
Merge pull request #6736 from alalek:cmake_fix_install_path
PkLab.net [Tue, 28 Jun 2016 14:40:30 +0000 (16:40 +0200)]
Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums
# Resolved Conflicts:
# modules/videoio/include/opencv2/videoio.hpp
Alexander Alekhin [Tue, 28 Jun 2016 10:27:25 +0000 (13:27 +0300)]
cmake: fix install path
CMake doesn't work with empty paths ("") or paths which contains "./"
Alexander Alekhin [Tue, 28 Jun 2016 05:36:15 +0000 (05:36 +0000)]
Merge pull request #6730 from sturkmen72:patch-16
Alexander Alekhin [Tue, 28 Jun 2016 05:21:25 +0000 (05:21 +0000)]
Merge pull request #6619 from Slonegg:openni2_ir_stream
PkLab.net [Mon, 27 Jun 2016 17:17:51 +0000 (19:17 +0200)]
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs
PkLab.net [Mon, 27 Jun 2016 17:09:23 +0000 (19:09 +0200)]
Doxygen documentation for CAP_* enums (using current comments in code)
Dmitry Trifonov [Mon, 27 Jun 2016 17:04:59 +0000 (10:04 -0700)]
added support for OpenNI2 IR stream #4366
Alexander Alekhin [Mon, 27 Jun 2016 16:44:24 +0000 (16:44 +0000)]
Merge pull request #6733 from simonhaenisch:simonhaenisch-improve-watershed.py-example
Simon Hänisch [Mon, 27 Jun 2016 15:03:37 +0000 (17:03 +0200)]
update watershed.py: check if windows are still open
change the `while` loop to check if the two windows created by this example still exist, stop the program otherwise
Suleyman TURKMEN [Mon, 27 Jun 2016 13:38:47 +0000 (16:38 +0300)]
Update imgcodecs.hpp
sarthak [Mon, 27 Jun 2016 08:01:06 +0000 (13:31 +0530)]
opencv viz bug
removed binary
update
Suleyman TURKMEN [Mon, 15 Feb 2016 13:37:29 +0000 (15:37 +0200)]
update cpp samples and tutorials
Suleyman TURKMEN [Sun, 26 Jun 2016 13:39:19 +0000 (16:39 +0300)]
Update grfmt_png.cpp
MYLS [Fri, 24 Jun 2016 18:24:33 +0000 (02:24 +0800)]
build again for OpenCL.
I could not find the cause of the error:
```
C:\builds_ocv\precommit_opencl\opencv\modules\ts\src\ts_perf.cpp(361):
error: The difference between expect_max and actual_max is
8445966.
0000002384, which exceeds eps, where
expect_max evaluates to 0.
9999997615814209,
actual_max evaluates to 8445967, and
eps evaluates to 1.
0000000000000001e-005.
Argument "dst0" has unexpected maximal value
```
Hope this is a false alarm.
MYLS [Fri, 24 Jun 2016 16:37:13 +0000 (00:37 +0800)]
fixed an error in the test...
MYLS [Fri, 24 Jun 2016 15:41:40 +0000 (23:41 +0800)]
solve warnings and errors in test.
MYLS [Fri, 24 Jun 2016 14:27:42 +0000 (22:27 +0800)]
Split `cvWriteRawData_Base64` into three functions
The three new functions:
```cpp
void cvStartWriteRawData_Base64(::CvFileStorage * fs, const char* name,
int len, const char* dt);
void cvWriteRawData_Base64(::CvFileStorage *
fs, const void* _data, int len);
void
cvEndWriteRawData_Base64(::CvFileStorage * fs);
```
Test is also updated. (And it's remarkable that there is a bug in
`cvWriteReadData`.)
Alexander Alekhin [Fri, 24 Jun 2016 12:54:55 +0000 (12:54 +0000)]
Merge pull request #6721 from alalek:tbb_update
Vitaly Tuzov [Wed, 22 Jun 2016 16:20:24 +0000 (19:20 +0300)]
Update TBB
Alexander Alekhin [Wed, 22 Jun 2016 20:35:14 +0000 (20:35 +0000)]
Merge pull request #6713 from alalek:cmake_install_fix
Alexander Alekhin [Wed, 22 Jun 2016 20:34:46 +0000 (20:34 +0000)]
Merge pull request #6712 from alalek:cmake_export_fix
Alexander Alekhin [Wed, 22 Jun 2016 13:12:52 +0000 (16:12 +0300)]
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
CPack can't work with absolute paths.
Alexander Alekhin [Tue, 21 Jun 2016 19:32:30 +0000 (22:32 +0300)]
cmake: fix export issue
opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)
Matthew Skolaut [Tue, 21 Jun 2016 22:16:16 +0000 (17:16 -0500)]
merge #ifs in highgui bindings
Alexander Alekhin [Tue, 21 Jun 2016 19:27:02 +0000 (19:27 +0000)]
Merge pull request #6709 from alalek:cmake_hal_fix
Julien Dubiel [Tue, 21 Jun 2016 18:00:50 +0000 (20:00 +0200)]
Use CMAKE_LIBRARY_PATH_FLAG variable instead of -L.
Alexander Alekhin [Tue, 21 Jun 2016 16:50:32 +0000 (19:50 +0300)]
cmake: fix HAL dependencies for core module
Linker dependencies are transitive for non-private
Alexander Alekhin [Tue, 21 Jun 2016 16:24:29 +0000 (16:24 +0000)]
Merge pull request #6705 from alalek:fix_hal_imgproc
Alexander Alekhin [Tue, 21 Jun 2016 15:38:41 +0000 (15:38 +0000)]
Merge pull request #6708 from alalek:pr6477
Alexander Alekhin [Tue, 21 Jun 2016 13:16:17 +0000 (13:16 +0000)]
Merge pull request #6581 from mshabunin:hal_mag
Alexander Alekhin [Tue, 21 Jun 2016 10:46:08 +0000 (10:46 +0000)]
Merge pull request #6704 from alalek:cmake_cmp0042
Matthew Skolaut [Tue, 21 Jun 2016 02:07:24 +0000 (21:07 -0500)]
fix casting warning in python createButton binding
Matthew Skolaut [Mon, 20 Jun 2016 21:24:23 +0000 (16:24 -0500)]
Merge branch 'master' of https://github.com/Itseez/opencv
Added python binding for createButton
Matthew Skolaut [Mon, 20 Jun 2016 21:24:15 +0000 (16:24 -0500)]
added python binding for createButton
Alexander Alekhin [Mon, 20 Jun 2016 16:25:49 +0000 (19:25 +0300)]
hal: fix missing include "opencv2/imgproc/hal/interface.h"
Alexander Alekhin [Mon, 20 Jun 2016 14:19:13 +0000 (17:19 +0300)]
cmake: change CMP0042 policy value
Alexander Alekhin [Mon, 20 Jun 2016 15:27:43 +0000 (15:27 +0000)]
Merge pull request #5980 from alalek:cmake_opencv_config