platform/upstream/opencv.git
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 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 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 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 #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 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 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 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 #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 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 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 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 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 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 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 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

8 years agoMerge pull request #6367 from shengyu7697:fix_quote
Alexander Alekhin [Wed, 6 Apr 2016 11:17:35 +0000 (11:17 +0000)]
Merge pull request #6367 from shengyu7697:fix_quote

8 years agofix quote
shengyu [Wed, 6 Apr 2016 06:31:06 +0000 (14:31 +0800)]
fix quote

8 years agoMerge pull request #6265 from huang-qiao:master
Alexander Alekhin [Wed, 6 Apr 2016 04:51:58 +0000 (04:51 +0000)]
Merge pull request #6265 from huang-qiao:master

8 years agofix OpenCV_CONFIG_PATH get null value after CMake 2.8.11
qiao [Mon, 21 Mar 2016 13:38:10 +0000 (21:38 +0800)]
fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11

syntax of cmake "get_filename_component" changed after version 2.8.11

for cmake version < 2.8.11
  get_filename_component(<VAR> <FileName> PATH [CACHE])

for cmake version >= 2.8.11
  get_filename_component(<VAR> <FileName> DIRECTORY [CACHE])

Update OpenCVConfig.cmake

Update OpenCVConfig.cmake.in

8 years agoMerge pull request #6244 from dreifachstein:topic-cmake-install
Alexander Alekhin [Tue, 5 Apr 2016 15:23:55 +0000 (15:23 +0000)]
Merge pull request #6244 from dreifachstein:topic-cmake-install

8 years agoMerge pull request #6358 from alalek:ffmpeg_fix_timeout
Alexander Alekhin [Tue, 5 Apr 2016 11:07:00 +0000 (11:07 +0000)]
Merge pull request #6358 from alalek:ffmpeg_fix_timeout

8 years agoffmpeg: interrupt callback fix
Alexander Alekhin [Mon, 4 Apr 2016 10:08:52 +0000 (13:08 +0300)]
ffmpeg: interrupt callback fix

8 years agoMerge pull request #6312 from KnockSoftware:split-float-epsilon
Vadim Pisarevsky [Sun, 3 Apr 2016 23:10:10 +0000 (23:10 +0000)]
Merge pull request #6312 from KnockSoftware:split-float-epsilon

8 years agoMerge pull request #6351 from mshabunin:fix_java_moments
Maksim Shabunin [Fri, 1 Apr 2016 09:19:09 +0000 (09:19 +0000)]
Merge pull request #6351 from mshabunin:fix_java_moments

8 years agoMerge pull request #6353 from shengyu7697:fix_right_quote
Maksim Shabunin [Fri, 1 Apr 2016 09:18:41 +0000 (09:18 +0000)]
Merge pull request #6353 from shengyu7697:fix_right_quote

8 years agomissing right quote
shengyu [Fri, 1 Apr 2016 03:03:50 +0000 (11:03 +0800)]
missing right quote

8 years agoAdded description of the AR model
Fraser Harris [Fri, 1 Apr 2016 00:57:55 +0000 (17:57 -0700)]
Added description of the AR model

8 years agoMerge pull request #6346 from filipsladek:box_filter_32FC1
Alexander Alekhin [Thu, 31 Mar 2016 17:06:52 +0000 (17:06 +0000)]
Merge pull request #6346 from filipsladek:box_filter_32FC1

8 years agoMerge pull request #6340 from BloodAxe:parallel_logistic_regression
Alexander Alekhin [Thu, 31 Mar 2016 17:06:20 +0000 (17:06 +0000)]
Merge pull request #6340 from BloodAxe:parallel_logistic_regression

8 years agoJava wrapper for moments: do not truncate values in set method
Maksim Shabunin [Thu, 31 Mar 2016 09:57:10 +0000 (12:57 +0300)]
Java wrapper for moments: do not truncate values in set method

8 years agoadd performance test for CV_32FC1
filipsladek [Thu, 31 Mar 2016 07:05:02 +0000 (09:05 +0200)]
add performance test for CV_32FC1

8 years agoMerge pull request #6329 from paroj:window_gui_cpp
Alexander Alekhin [Wed, 30 Mar 2016 14:34:54 +0000 (14:34 +0000)]
Merge pull request #6329 from paroj:window_gui_cpp

8 years agoadd testcase for CV_32FC1
filipsladek [Wed, 30 Mar 2016 08:38:22 +0000 (10:38 +0200)]
add testcase for CV_32FC1

8 years agocode style
filipsladek [Tue, 29 Mar 2016 20:44:03 +0000 (22:44 +0200)]
code style

8 years agoBox filter implemented for CV_32FC1
filipsladek [Tue, 29 Mar 2016 20:30:49 +0000 (22:30 +0200)]
Box filter implemented for CV_32FC1

8 years agoEnforced DecisionFunction vector indexes to be saved on SVM save/load methods
Eduardo Arnold [Tue, 29 Mar 2016 19:29:41 +0000 (16:29 -0300)]
Enforced DecisionFunction vector indexes to be saved on SVM save/load methods

8 years agosmall platform compatability fix for ESC key
Anatoly Orlov [Tue, 29 Mar 2016 17:02:35 +0000 (20:02 +0300)]
small platform compatability fix for ESC key

8 years agokalman.py was broken totally
Anatoly Orlov [Tue, 29 Mar 2016 15:27:35 +0000 (18:27 +0300)]
kalman.py was broken totally

1. Following condition is True on each iteration becuase -1 % 0xFF is 255 not -1

code = cv2.waitKey(100) % 0x100
if code != -1:
   break

this were resetting point position on each cycle not on key press as intended

2. Previous small bug were masking serious bug with matrix operation on matrices of incorrect size.
   As the result on 2nd iteration of internal cycle program has crushed.

   I have fixed it too, matrix operation was taken from examples/cpp/kalman.cpp where it looks like
   randn( processNoise, Scalar(0), Scalar::all(sqrt(KF.processNoiseCov.at<float>(0, 0))));
   which is something totally different from previous code here.

   Example behave as it should now, i.e. point moving by circle trajectory as in C++ example.

8 years agoMerge pull request #6332 from sovrasov:python_rng_seed
Alexander Alekhin [Tue, 29 Mar 2016 14:23:26 +0000 (14:23 +0000)]
Merge pull request #6332 from sovrasov:python_rng_seed

8 years agoAdded parallel implementation of compute_gradient method.
Eugene Khvedchenya [Tue, 29 Mar 2016 08:09:54 +0000 (11:09 +0300)]
Added parallel implementation of compute_gradient method.

8 years agoChange setRNGSeed implementaion
Vladislav Sovrasov [Tue, 29 Mar 2016 07:54:42 +0000 (10:54 +0300)]
Change setRNGSeed implementaion

8 years agoFix epsilon comparison when splitting
Evan Heidtmann [Tue, 22 Mar 2016 00:33:36 +0000 (17:33 -0700)]
Fix epsilon comparison when splitting

8 years agoError message for wrong kernel size was insufficient.
themightyoarfish [Mon, 28 Mar 2016 12:06:55 +0000 (14:06 +0200)]
Error message for wrong kernel size was insufficient.

When setting a wrong kernel size, the error message only tells the user that it
must be odd, however the conditions for rejection include values > 7 which must
be communicated. Without that, the message would be incorrect and confusing if
the user is unaware that only values 3, 5, 7 are accepted.

8 years agoMerge pull request #6321 from mshabunin:hal_cmake
Vadim Pisarevsky [Sun, 27 Mar 2016 08:06:24 +0000 (08:06 +0000)]
Merge pull request #6321 from mshabunin:hal_cmake

8 years agoMerge pull request #6326 from sovrasov:python_samples_update
Vadim Pisarevsky [Sun, 27 Mar 2016 08:03:28 +0000 (08:03 +0000)]
Merge pull request #6326 from sovrasov:python_samples_update

8 years agoMerge pull request #6311 from peters:master
Alexander Alekhin [Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)]
Merge pull request #6311 from peters:master

8 years agoFix doxygen warnings
Vladislav Sovrasov [Fri, 25 Mar 2016 13:34:45 +0000 (16:34 +0300)]
Fix doxygen warnings

8 years agoAdd function setRNGSeed and seed setup in python tests
Vladislav Sovrasov [Fri, 25 Mar 2016 13:17:58 +0000 (16:17 +0300)]
Add function setRNGSeed and seed setup in python tests

8 years agoMerge pull request #6313 from amannababanana:master
Alexander Alekhin [Fri, 25 Mar 2016 11:31:17 +0000 (11:31 +0000)]
Merge pull request #6313 from amannababanana:master

8 years agoMerge pull request #6322 from berak:fix_linux_eclipse_tutorial
Maksim Shabunin [Fri, 25 Mar 2016 07:39:19 +0000 (07:39 +0000)]
Merge pull request #6322 from berak:fix_linux_eclipse_tutorial

8 years agohighgui: add CV_GUI_* flags to enum in cpp so they appear in bindings
Pavel Rojtberg [Thu, 24 Mar 2016 22:58:47 +0000 (23:58 +0100)]
highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings

8 years agoReplace of some synthetic scenes in python samples
Vladislav Sovrasov [Thu, 24 Mar 2016 17:05:26 +0000 (20:05 +0300)]
Replace of some synthetic scenes in python samples

8 years agofix changed libraries in eclipse tutorial
berak [Thu, 24 Mar 2016 14:56:10 +0000 (15:56 +0100)]
fix changed libraries in eclipse tutorial

8 years agoFixed cutom_hal.hpp file generation
Maksim Shabunin [Thu, 24 Mar 2016 14:39:16 +0000 (17:39 +0300)]
Fixed cutom_hal.hpp file generation

8 years agoUsing find_package to import custom HAL library
Maksim Shabunin [Thu, 24 Mar 2016 14:05:54 +0000 (17:05 +0300)]
Using find_package to import custom HAL library

8 years agocap_gst: inspect sink instead of videoconvert to find out properties
Pavel Rojtberg [Wed, 23 Mar 2016 15:24:10 +0000 (16:24 +0100)]
cap_gst: inspect sink instead of videoconvert to find out properties

videoconvert might not be present on a manual pipeline, but appsink must
be.

8 years agoMerge pull request #6243 from mshabunin:hal_morph
Vadim Pisarevsky [Wed, 23 Mar 2016 13:09:19 +0000 (13:09 +0000)]
Merge pull request #6243 from mshabunin:hal_morph