Commit Graph

18835 Commits

Author SHA1 Message Date
Maksim Shabunin 1307bb1d03 Merge pull request #6314 from mvukad:bugfix_dtreeswrite 2016-04-12 13:26:25 +00:00
Alexander Alekhin 2b29db860c Merge pull request #6391 from virtuald:v4l-device-name 2016-04-12 12:57:21 +00:00
Dustin Spicuzza e489f29d0f 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
2016-04-12 01:25:34 -04:00
Alexander Alekhin 2f0676fb88 Merge pull request #6298 from andy-held:master 2016-04-11 17:19:11 +00:00
Andreas Franek 1b3a967223 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.
2016-04-11 17:10:57 +02:00
Alexander Alekhin 78286f3a44 Merge pull request #6381 from ioxp:persistenceFix 2016-04-11 09:40:09 +00:00
Philipp Hasper 47c4ee974a operator<< handles keys starting with underscore 2016-04-11 09:55:33 +02:00
mvukad 695e33b25b 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.
2016-04-07 13:49:42 -07:00
Alexander Alekhin 06ea0aa02b Merge pull request #6367 from shengyu7697:fix_quote 2016-04-06 11:17:35 +00:00
shengyu 2d41321ca0 fix quote 2016-04-06 14:31:06 +08:00
Alexander Alekhin 7783836fff Merge pull request #6265 from huang-qiao:master 2016-04-06 04:51:59 +00:00
qiao a7fe73f284 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
2016-04-06 11:33:53 +08:00
Alexander Alekhin 1f7fea9092 Merge pull request #6244 from dreifachstein:topic-cmake-install 2016-04-05 15:23:55 +00:00
Alexander Alekhin 7d4a8bc437 Merge pull request #6358 from alalek:ffmpeg_fix_timeout 2016-04-05 11:07:00 +00:00
Alexander Alekhin 7d9a480597 ffmpeg: interrupt callback fix 2016-04-04 13:17:04 +03:00
Vadim Pisarevsky 46d218bcec Merge pull request #6312 from KnockSoftware:split-float-epsilon 2016-04-03 23:10:10 +00:00
Maksim Shabunin 0c068768a5 Merge pull request #6351 from mshabunin:fix_java_moments 2016-04-01 09:19:09 +00:00
Maksim Shabunin fbbe75895a Merge pull request #6353 from shengyu7697:fix_right_quote 2016-04-01 09:18:41 +00:00
shengyu 21513caf3f missing right quote 2016-04-01 11:03:50 +08:00
Alexander Alekhin 873884aa47 Merge pull request #6346 from filipsladek:box_filter_32FC1 2016-03-31 17:06:52 +00:00
Alexander Alekhin ab3fb8b2f8 Merge pull request #6340 from BloodAxe:parallel_logistic_regression 2016-03-31 17:06:20 +00:00
Maksim Shabunin a5af69de6a Java wrapper for moments: do not truncate values in set method 2016-03-31 12:57:10 +03:00
filipsladek a821fde44e add performance test for CV_32FC1 2016-03-31 09:05:02 +02:00
Alexander Alekhin a056c9b113 Merge pull request #6329 from paroj:window_gui_cpp 2016-03-30 14:34:55 +00:00
filipsladek f635381662 add testcase for CV_32FC1 2016-03-30 10:38:22 +02:00
filipsladek 493ac1df37 code style 2016-03-29 22:44:03 +02:00
filipsladek 9c3f790edb Box filter implemented for CV_32FC1 2016-03-29 22:30:49 +02:00
Alexander Alekhin ff0d115800 Merge pull request #6332 from sovrasov:python_rng_seed 2016-03-29 14:23:26 +00:00
Eugene Khvedchenya ee92a36123 Added parallel implementation of compute_gradient method. 2016-03-29 11:09:54 +03:00
Vladislav Sovrasov 72ed4173df Change setRNGSeed implementaion 2016-03-29 10:54:42 +03:00
Evan Heidtmann 0712bccf52 Fix epsilon comparison when splitting 2016-03-28 14:16:32 -07:00
Vadim Pisarevsky 1e1dc1429f Merge pull request #6321 from mshabunin:hal_cmake 2016-03-27 08:06:24 +00:00
Vadim Pisarevsky 481473eb12 Merge pull request #6326 from sovrasov:python_samples_update 2016-03-27 08:03:28 +00:00
Alexander Alekhin ee123b8a9e Merge pull request #6311 from peters:master 2016-03-26 19:55:17 +00:00
Vladislav Sovrasov 362d52a3cb Fix doxygen warnings 2016-03-25 16:34:45 +03:00
Vladislav Sovrasov a490b64e9b Add function setRNGSeed and seed setup in python tests 2016-03-25 16:17:58 +03:00
Alexander Alekhin 05384f05cc Merge pull request #6313 from amannababanana:master 2016-03-25 11:31:17 +00:00
Maksim Shabunin 50edaae06c Merge pull request #6322 from berak:fix_linux_eclipse_tutorial 2016-03-25 07:39:19 +00:00
Pavel Rojtberg 0ac31a0bd7 highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings 2016-03-24 23:58:47 +01:00
Vladislav Sovrasov 1f8fd5382c Replace of some synthetic scenes in python samples 2016-03-24 20:05:26 +03:00
berak 0b389b24f6 fix changed libraries in eclipse tutorial 2016-03-24 16:09:14 +01:00
Maksim Shabunin 79ffaa8ce9 Fixed cutom_hal.hpp file generation 2016-03-24 17:39:16 +03:00
Maksim Shabunin 727743809e Using find_package to import custom HAL library 2016-03-24 17:05:54 +03:00
Vadim Pisarevsky e792ee89de Merge pull request #6243 from mshabunin:hal_morph 2016-03-23 13:09:19 +00:00
Vadim Pisarevsky e547916e88 Merge pull request #6285 from sovrasov:python_tests_cleanup 2016-03-23 13:07:00 +00:00
Lucas Solomon d2d5d32fe0 remove trailing whitespace 2016-03-22 22:31:16 -07:00
Lucas Solomon 688b4d9d7a return 0 from VideoCapture::read() when cannot connect to camera 2016-03-22 19:03:28 -07:00
Peter Rekdal Sunde 278747ba45 Add support for ffmpeg 3.0. 2016-03-22 22:52:35 +01:00
Maksim Shabunin fd1b66b37d Merge pull request #6286 from StevenPuttemans:add_num_features_info 2016-03-21 14:08:49 +00:00
Maksim Shabunin 26416343c4 Merge pull request #6300 from berak:fix_akaze_sample 2016-03-21 14:01:17 +00:00