platform/upstream/opencv.git
8 years agoMerge pull request #6448 from alalek:merge-2.4
Alexander Alekhin [Mon, 25 Apr 2016 16:56:51 +0000 (16:56 +0000)]
Merge pull request #6448 from alalek:merge-2.4

8 years agoMerge pull request #6459 from eliao:Fix6457
Vadim Pisarevsky [Mon, 25 Apr 2016 13:07:51 +0000 (13:07 +0000)]
Merge pull request #6459 from eliao:Fix6457

8 years agoMerge pull request #6467 from ohnozzy:Doc-for-ocl-Kernel-Run
Vadim Pisarevsky [Mon, 25 Apr 2016 13:07:34 +0000 (13:07 +0000)]
Merge pull request #6467 from ohnozzy:Doc-for-ocl-Kernel-Run

8 years agoMerge pull request #6422 from iclemens:master
Vadim Pisarevsky [Mon, 25 Apr 2016 13:06:42 +0000 (13:06 +0000)]
Merge pull request #6422 from iclemens:master

8 years agoMerge pull request #6454 from paroj:fisheye_py
Vadim Pisarevsky [Mon, 25 Apr 2016 12:54:44 +0000 (12:54 +0000)]
Merge pull request #6454 from paroj:fisheye_py

8 years agoMerge pull request #6455 from belgraviton:bugfix_5953
Vadim Pisarevsky [Mon, 25 Apr 2016 12:50:45 +0000 (12:50 +0000)]
Merge pull request #6455 from belgraviton:bugfix_5953

8 years agoMerge pull request #6458 from eliao:Fix6456
Vadim Pisarevsky [Mon, 25 Apr 2016 12:49:16 +0000 (12:49 +0000)]
Merge pull request #6458 from eliao:Fix6456

8 years agoMerge pull request #6463 from ohnozzy:ocl-linearpolar-and-logpolar
Vadim Pisarevsky [Mon, 25 Apr 2016 12:42:40 +0000 (12:42 +0000)]
Merge pull request #6463 from ohnozzy:ocl-linearpolar-and-logpolar

8 years agoMerge pull request #6364 from sovrasov:interactive_calibration_app
Vadim Pisarevsky [Mon, 25 Apr 2016 12:39:56 +0000 (12:39 +0000)]
Merge pull request #6364 from sovrasov:interactive_calibration_app

8 years agoMerge pull request #6020 from mshabunin:hal_dxt
Vadim Pisarevsky [Mon, 25 Apr 2016 11:37:18 +0000 (11:37 +0000)]
Merge pull request #6020 from mshabunin:hal_dxt

8 years agofisheye: allow using transposed image and object point arrays
Pavel Rojtberg [Fri, 22 Apr 2016 14:45:28 +0000 (16:45 +0200)]
fisheye: allow using transposed image and object point arrays

8 years agofisheye: create rvecs, tvecs before writing
Pavel Rojtberg [Fri, 22 Apr 2016 09:56:58 +0000 (11:56 +0200)]
fisheye: create rvecs, tvecs before writing

8 years agoAdd interactive calibration app
Vladislav Sovrasov [Fri, 8 Apr 2016 13:30:56 +0000 (16:30 +0300)]
Add interactive calibration app

8 years agoAdd Comment
ohnozzy [Mon, 25 Apr 2016 03:11:50 +0000 (11:11 +0800)]
Add Comment

Add documentation for Kernel::run

8 years agoAdd OpenCL support to linearPolar & logPolar
ohnozzy [Sat, 23 Apr 2016 14:55:09 +0000 (22:55 +0800)]
Add OpenCL  support to linearPolar & logPolar

Add OpenCL  support to linearPolar & logPolar.
The OpenCL code use float instead of double, so that it does not require
cl_khr_fp64 extension, with slight precision lost.

Add explicit conversion

Add explicit conversion from double to float to eliminate warning during
compilation.

8 years agoFix 6457
Eric Liao [Fri, 22 Apr 2016 21:49:43 +0000 (14:49 -0700)]
Fix 6457

Allow configuration of the square size in stereo_calib.

8 years agoChange hardcoded relative path for instrinsics file to current path, matching the...
Eric Liao [Fri, 22 Apr 2016 21:14:25 +0000 (14:14 -0700)]
Change hardcoded relative path for instrinsics file to current path, matching the extrinsics file.

https://github.com/Itseez/opencv/issues/6456

8 years agofixing CLAHE crash with pixels value > 12 bit
Vadzim Piatrou [Fri, 22 Apr 2016 15:55:22 +0000 (18:55 +0300)]
fixing CLAHE crash with pixels value > 12 bit

8 years agoMerge branch '2.4' into master
Alexander Alekhin [Thu, 21 Apr 2016 17:10:51 +0000 (20:10 +0300)]
Merge branch '2.4' into master

Commits:
67fe57a add fixed video
db0ae2c Restore 2.4 source branch for bug fix 6317.
97ac59c Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7 fix bug on border at pyrUp

8 years agoMerge pull request #6441 from asmorkalov:version++
Alexander Alekhin [Wed, 20 Apr 2016 14:21:19 +0000 (14:21 +0000)]
Merge pull request #6441 from asmorkalov:version++

8 years agoMerge branch '2.4.12.x-prep' into 2.4
Alexander Alekhin [Wed, 20 Apr 2016 13:26:12 +0000 (16:26 +0300)]
Merge branch '2.4.12.x-prep' into 2.4

8 years agoMerge pull request #6401 from StevenPuttemans:add_model_visualisation_tool_2.4
Alexander Alekhin [Wed, 20 Apr 2016 13:24:25 +0000 (13:24 +0000)]
Merge pull request #6401 from StevenPuttemans:add_model_visualisation_tool_2.4

8 years agoOpenCV version++.
Alexander Smorkalov [Wed, 20 Apr 2016 13:03:47 +0000 (16:03 +0300)]
OpenCV version++.

8 years agoMerge pull request #6420 from ioxp:foreachDoc
Maksim Shabunin [Wed, 20 Apr 2016 11:55:03 +0000 (11:55 +0000)]
Merge pull request #6420 from ioxp:foreachDoc

8 years agoMerge pull request #6433 from schenker:master
Alexander Alekhin [Tue, 19 Apr 2016 16:06:35 +0000 (16:06 +0000)]
Merge pull request #6433 from schenker:master

8 years agoMerge pull request #6431 from StevenPuttemans:add_fixed_video_2.4
Alexander Alekhin [Tue, 19 Apr 2016 14:19:41 +0000 (14:19 +0000)]
Merge pull request #6431 from StevenPuttemans:add_fixed_video_2.4

8 years agoMerge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4
Alexander Alekhin [Tue, 19 Apr 2016 13:32:44 +0000 (13:32 +0000)]
Merge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4

8 years agoadd fixed video
StevenPuttemans [Tue, 19 Apr 2016 08:43:20 +0000 (10:43 +0200)]
add fixed video

8 years agofix typo
Thomas Schenker [Tue, 19 Apr 2016 13:09:27 +0000 (15:09 +0200)]
fix typo

8 years agoMore compilation warnings fixed
Maksim Shabunin [Tue, 19 Apr 2016 13:08:48 +0000 (16:08 +0300)]
More compilation warnings fixed

8 years agoFixed compiation problems
Maksim Shabunin [Tue, 19 Apr 2016 11:50:07 +0000 (14:50 +0300)]
Fixed compiation problems

8 years agoRestore 2.4 source branch for bug fix 6317.
Kevin, Hu [Tue, 19 Apr 2016 11:27:42 +0000 (19:27 +0800)]
Restore 2.4 source branch for bug fix 6317.

8 years agoMerge pull request #6393 from paroj:v4l_exposure
Alexander Alekhin [Mon, 18 Apr 2016 15:14:21 +0000 (15:14 +0000)]
Merge pull request #6393 from paroj:v4l_exposure

8 years agoMerge pull request #5516 from AVshokurov:master
Alexander Alekhin [Mon, 18 Apr 2016 15:13:14 +0000 (15:13 +0000)]
Merge pull request #5516 from AVshokurov:master

8 years agoMerge pull request #6421 from alalek:backport_6417
Alexander Alekhin [Mon, 18 Apr 2016 15:12:16 +0000 (15:12 +0000)]
Merge pull request #6421 from alalek:backport_6417

8 years agoFixed typo in BRISK feature detector.
Ivar Clemens [Mon, 18 Apr 2016 12:04:04 +0000 (13:04 +0100)]
Fixed typo in BRISK feature detector.

8 years agoMerge pull request #6397 from ioxp:androidCamLog
Alexander Alekhin [Mon, 18 Apr 2016 11:56:18 +0000 (11:56 +0000)]
Merge pull request #6397 from ioxp:androidCamLog

8 years agofix for writing 16-bit jpeg2000
Suleyman TURKMEN [Sat, 16 Apr 2016 21:37:28 +0000 (00:37 +0300)]
fix for writing 16-bit jpeg2000

8 years agoFixing doc for cv::Mat::forEach
Philipp Hasper [Mon, 18 Apr 2016 11:51:07 +0000 (13:51 +0200)]
Fixing doc for cv::Mat::forEach

image.forEachWithPosition does not exist

8 years agoMerge pull request #6410 from alalek:issue_6403
Alexander Alekhin [Mon, 18 Apr 2016 11:43:14 +0000 (11:43 +0000)]
Merge pull request #6410 from alalek:issue_6403

8 years agoMerge pull request #6417 from sturkmen72:patch-14
Alexander Alekhin [Mon, 18 Apr 2016 10:35:28 +0000 (10:35 +0000)]
Merge pull request #6417 from sturkmen72:patch-14

8 years agoMerge pull request #6408 from dtmoodie:InputOutputArray_constructor_fix
Alexander Alekhin [Mon, 18 Apr 2016 10:34:42 +0000 (10:34 +0000)]
Merge pull request #6408 from dtmoodie:InputOutputArray_constructor_fix

8 years agoMerge pull request #6406 from ohnozzy:Bug-Fix-for-Issue-6377
Alexander Alekhin [Mon, 18 Apr 2016 10:29:29 +0000 (10:29 +0000)]
Merge pull request #6406 from ohnozzy:Bug-Fix-for-Issue-6377

8 years agocmake: don't use -isystem for opencv_contrib paths
Alexander Alekhin [Thu, 14 Apr 2016 14:20:57 +0000 (17:20 +0300)]
cmake: don't use -isystem for opencv_contrib paths

8 years agoMerge pull request #6414 from mshabunin:fix-macosx-warnings
Maksim Shabunin [Sun, 17 Apr 2016 22:11:57 +0000 (22:11 +0000)]
Merge pull request #6414 from mshabunin:fix-macosx-warnings

8 years agoUpdates for XCode 7.3
Maksim Shabunin [Fri, 15 Apr 2016 18:48:39 +0000 (21:48 +0300)]
Updates for XCode 7.3

8 years agoMerge pull request #6359 from alalek:videocapture_exceptions
Alexander Alekhin [Sun, 17 Apr 2016 09:30:42 +0000 (09:30 +0000)]
Merge pull request #6359 from alalek:videocapture_exceptions

8 years agofix for writing 16-bit jpeg2000
Suleyman TURKMEN [Sat, 16 Apr 2016 21:37:28 +0000 (00:37 +0300)]
fix for writing 16-bit jpeg2000

8 years agoMerge pull request #6415 from mshabunin:fix-xcode-warnings-24
Maksim Shabunin [Sat, 16 Apr 2016 06:39:00 +0000 (06:39 +0000)]
Merge pull request #6415 from mshabunin:fix-xcode-warnings-24

8 years agoUpdates for XCode 7.3
Maksim Shabunin [Fri, 15 Apr 2016 18:56:50 +0000 (21:56 +0300)]
Updates for XCode 7.3

8 years agotemplated std::vector<T> constructor was being called instead of const std::vector...
Dan [Thu, 14 Apr 2016 19:43:48 +0000 (15:43 -0400)]
templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.

8 years agoMerge pull request #6404 from solosuper:bugfix/issue6315
Alexander Alekhin [Thu, 14 Apr 2016 14:27:58 +0000 (14:27 +0000)]
Merge pull request #6404 from solosuper:bugfix/issue6315

8 years agoMerge pull request #6407 from StevenPuttemans:fix_ts_perf_warnings
Alexander Alekhin [Thu, 14 Apr 2016 14:27:27 +0000 (14:27 +0000)]
Merge pull request #6407 from StevenPuttemans:fix_ts_perf_warnings

8 years agoMerge pull request #6405 from StevenPuttemans:fix_gstreamer_cap_linux
Alexander Alekhin [Thu, 14 Apr 2016 14:27:12 +0000 (14:27 +0000)]
Merge pull request #6405 from StevenPuttemans:fix_gstreamer_cap_linux

8 years agofixing gstreamer cap
StevenPuttemans [Thu, 14 Apr 2016 11:11:26 +0000 (13:11 +0200)]
fixing gstreamer cap

8 years agoremove warnings generated during TS module tests
StevenPuttemans [Thu, 14 Apr 2016 11:48:11 +0000 (13:48 +0200)]
remove warnings generated during TS module tests

8 years agoBug Fix for 6377
ohnozzy [Thu, 14 Apr 2016 11:35:57 +0000 (19:35 +0800)]
Bug Fix for 6377

Rewrite linearPolar & logPolar so that they do not depend on the
deprecated API CvMat. Issue 6377 is resolved in this way because the two
routines do not convert UMat to CvMat anymore.

8 years agofix #6315
solosuper [Thu, 14 Apr 2016 09:57:49 +0000 (11:57 +0200)]
fix #6315

8 years agoadd visualisation tool for 2.4 branch
StevenPuttemans [Thu, 14 Apr 2016 09:17:36 +0000 (11:17 +0200)]
add visualisation tool for 2.4 branch

8 years agoMerge pull request #6305 from rishirajsurti:master
Maksim Shabunin [Thu, 14 Apr 2016 08:42:39 +0000 (08:42 +0000)]
Merge pull request #6305 from rishirajsurti:master

8 years agoThresholding Tutorial using inRange function on a video
rishirajsurti [Mon, 21 Mar 2016 02:53:04 +0000 (08:23 +0530)]
Thresholding Tutorial using inRange function on a video

8 years agoMerge pull request #6373 from terfendail:vt/stereobm_valgrind
Alexander Alekhin [Wed, 13 Apr 2016 13:38:53 +0000 (13:38 +0000)]
Merge pull request #6373 from terfendail:vt/stereobm_valgrind

8 years agoMerge pull request #6399 from mshabunin:fix-flann-memleak
Maksim Shabunin [Wed, 13 Apr 2016 11:34:58 +0000 (11:34 +0000)]
Merge pull request #6399 from mshabunin:fix-flann-memleak

8 years agoMerge pull request #6318 from paroj:gst_cap_props
Alexander Alekhin [Wed, 13 Apr 2016 10:05:40 +0000 (10:05 +0000)]
Merge pull request #6318 from paroj:gst_cap_props

8 years agoMerge pull request #6382 from StevenPuttemans:update_annotation_tool
Maksim Shabunin [Wed, 13 Apr 2016 10:05:25 +0000 (10:05 +0000)]
Merge pull request #6382 from StevenPuttemans:update_annotation_tool

8 years agoMerge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4
Maksim Shabunin [Wed, 13 Apr 2016 10:02:56 +0000 (10:02 +0000)]
Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4

8 years agoFixed memory leak in flann KMeansIndex
Maksim Shabunin [Wed, 13 Apr 2016 09:08:42 +0000 (12:08 +0300)]
Fixed memory leak in flann KMeansIndex

8 years agovectorize process + enable early quitting/storage + enable delete annotion option
StevenPuttemans [Mon, 11 Apr 2016 09:37:39 +0000 (11:37 +0200)]
vectorize process + enable early quitting/storage + enable delete annotion option

8 years agoMerge pull request #6395 from Tauranis:master
Maksim Shabunin [Wed, 13 Apr 2016 07:53:33 +0000 (07:53 +0000)]
Merge pull request #6395 from Tauranis:master

8 years agoMerge pull request #6335 from themightyoarfish:canny_kernel_sz_fix
Maksim Shabunin [Wed, 13 Apr 2016 07:52:05 +0000 (07:52 +0000)]
Merge pull request #6335 from themightyoarfish:canny_kernel_sz_fix

8 years agoMerge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288
Maksim Shabunin [Wed, 13 Apr 2016 07:51:33 +0000 (07:51 +0000)]
Merge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288

8 years agoDeactivated two noisy camera-retrieval log messages in android
Philipp Hasper [Wed, 13 Apr 2016 07:17:33 +0000 (09:17 +0200)]
Deactivated two noisy camera-retrieval log messages in android

They were issued for every frame retrieved - even in a release build.

8 years agovectorize process + enable early quitting/storage + enable delete annotation option
StevenPuttemans [Mon, 11 Apr 2016 10:44:55 +0000 (12:44 +0200)]
vectorize process + enable early quitting/storage + enable delete annotation option

8 years agoBug fix for MLP predict for small values to avoid nan responses.
Tauranis [Tue, 12 Apr 2016 11:28:38 +0000 (08:28 -0300)]
Bug fix for MLP predict for small values to avoid nan responses.

8 years agovideoio: give chance for all enabled backends
Alexander Alekhin [Mon, 4 Apr 2016 11:09:04 +0000 (14:09 +0300)]
videoio: give chance for all enabled backends

"Eat" unexpected backend exceptions

8 years agoMerge pull request #6344 from anatolix:kalmanpyfix
Maksim Shabunin [Tue, 12 Apr 2016 15:55:55 +0000 (15:55 +0000)]
Merge pull request #6344 from anatolix:kalmanpyfix

8 years agoMerge pull request #6352 from fraserharris:patch-1
Maksim Shabunin [Tue, 12 Apr 2016 15:23:43 +0000 (15:23 +0000)]
Merge pull request #6352 from fraserharris:patch-1

8 years agoMerge pull request #6345 from eduardohenriquearnold:master
Maksim Shabunin [Tue, 12 Apr 2016 15:22:32 +0000 (15:22 +0000)]
Merge pull request #6345 from eduardohenriquearnold:master

8 years agoCost estimation boundaries description updated
Vitaly Tuzov [Tue, 12 Apr 2016 14:31:12 +0000 (17:31 +0300)]
Cost estimation boundaries description updated

8 years agoBackport of StereoBM uninitialized memory access problem fix from master branch
Vitaly Tuzov [Tue, 12 Apr 2016 14:27:16 +0000 (17:27 +0300)]
Backport of StereoBM uninitialized memory access problem fix from master branch

8 years agoBug Fix for Issue 6288
ohnozzy [Sat, 9 Apr 2016 11:01:34 +0000 (19:01 +0800)]
Bug Fix for Issue 6288

Added 2 inline functions in persistence.hpp
So that the '>>' operator works correctly for std::Vector<KeyPoint> and
std::Vector<DMatch>

8 years agoMerge pull request #6314 from mvukad:bugfix_dtreeswrite
Maksim Shabunin [Tue, 12 Apr 2016 13:26:25 +0000 (13:26 +0000)]
Merge pull request #6314 from mvukad:bugfix_dtreeswrite

8 years agoMerge pull request #6391 from virtuald:v4l-device-name
Alexander Alekhin [Tue, 12 Apr 2016 12:57:21 +0000 (12:57 +0000)]
Merge pull request #6391 from virtuald:v4l-device-name

8 years agocap_v4l: allow manually controlling exposure
Pavel Rojtberg [Tue, 12 Apr 2016 10:10:54 +0000 (12:10 +0200)]
cap_v4l: allow manually controlling exposure

8 years agoMerge pull request #6383 from alalek:backport_6381
Maksim Shabunin [Tue, 12 Apr 2016 08:40:01 +0000 (08:40 +0000)]
Merge pull request #6383 from alalek:backport_6381

8 years agoMerge pull request #6386 from mshabunin:fix-python-test-issue
Maksim Shabunin [Tue, 12 Apr 2016 08:29:44 +0000 (08:29 +0000)]
Merge pull request #6386 from mshabunin:fix-python-test-issue

8 years agov4l/libv4l: allow opening device by name
Dustin Spicuzza [Tue, 12 Apr 2016 05:00:37 +0000 (01:00 -0400)]
v4l/libv4l: allow opening device by name

- Allows using non-default device names such as /dev/v4l/by-path/pci-0000:00:1d.0-usb-0:1.1:1.0-video-index0

8 years agoMerge pull request #6298 from andy-held:master
Alexander Alekhin [Mon, 11 Apr 2016 17:19:11 +0000 (17:19 +0000)]
Merge pull request #6298 from andy-held:master

8 years agoFixed problem with nonfree python test: could not find local test images
Maksim Shabunin [Mon, 11 Apr 2016 15:45:14 +0000 (18:45 +0300)]
Fixed problem with nonfree python test: could not find local test images

8 years agoEnable directly writing jpeg-encoded streams with GStreamer
Andreas Franek [Fri, 18 Mar 2016 17:02:19 +0000 (18:02 +0100)]
Enable directly writing jpeg-encoded streams with GStreamer

CvVideoWriter_GStreamer assumes a JPEG encoded stream if the height of
the given frame size is 1.

8 years agooperator<< handles keys starting with underscore
Philipp Hasper [Mon, 11 Apr 2016 07:55:33 +0000 (09:55 +0200)]
operator<< handles keys starting with underscore

8 years agoMerge pull request #6381 from ioxp:persistenceFix
Alexander Alekhin [Mon, 11 Apr 2016 09:40:09 +0000 (09:40 +0000)]
Merge pull request #6381 from ioxp:persistenceFix

8 years agooperator<< handles keys starting with underscore
Philipp Hasper [Mon, 11 Apr 2016 07:55:33 +0000 (09:55 +0200)]
operator<< handles keys starting with underscore

8 years agoReworked HAL dft/dct interface, added replacement documentation
Maksim Shabunin [Fri, 8 Apr 2016 13:03:51 +0000 (16:03 +0300)]
Reworked HAL dft/dct interface, added replacement documentation

8 years agoDFT: renamed HAL functions
Maksim Shabunin [Fri, 5 Feb 2016 08:40:40 +0000 (11:40 +0300)]
DFT: renamed HAL functions

8 years agoAlways use hal::dft in crossCorr function
Maksim Shabunin [Thu, 4 Feb 2016 16:29:23 +0000 (19:29 +0300)]
Always use hal::dft in crossCorr function

8 years agoExtracted HAL interfaces for DFT/DCT, added new test
Maksim Shabunin [Wed, 13 Jan 2016 14:23:57 +0000 (17:23 +0300)]
Extracted HAL interfaces for DFT/DCT, added new test

8 years agoFixed uninitialized memory errors in stereoBM
Vitaly Tuzov [Sat, 20 Feb 2016 10:29:34 +0000 (13:29 +0300)]
Fixed uninitialized memory errors in stereoBM

8 years agoFix missing format when writing Algorithm-based objects
mvukad [Tue, 22 Mar 2016 22:19:42 +0000 (15:19 -0700)]
Fix missing format when writing Algorithm-based objects

Added a writeFormat() method to Algorithm which must be called by the
write() method of derived classes.

8 years agoHAL resize, warpAffine, warpPerspective interface
Maksim Shabunin [Tue, 22 Mar 2016 13:52:23 +0000 (16:52 +0300)]
HAL resize, warpAffine, warpPerspective interface

- added HAL documentation support
- added documentation to HAL replacement interface
- updated several HAL functions in imgproc module