Alexander Alekhin [Fri, 19 Jun 2015 11:54:18 +0000 (14:54 +0300)]
Merge branch '2.4.8.x-prep' into 2.4
Alexander Smorkalov [Wed, 17 Jun 2015 08:19:47 +0000 (08:19 +0000)]
Merge pull request #4034 from jet47:opencv_run_all_tests_unix
Vadim Pisarevsky [Tue, 16 Jun 2015 13:22:40 +0000 (13:22 +0000)]
Merge pull request #4107 from SpecLad:libav-compat
Vadim Pisarevsky [Tue, 16 Jun 2015 13:19:10 +0000 (13:19 +0000)]
Merge pull request #4104 from SpecLad:arm64-packaging
Vadim Pisarevsky [Tue, 16 Jun 2015 12:31:13 +0000 (12:31 +0000)]
Merge pull request #4088 from howtobeahacker:2.4
Vincent Rabaud [Thu, 7 May 2015 11:38:59 +0000 (11:38 +0000)]
get code to compile on Ubuntu Saucy
A define was forgotten for the codecs and there was a typo for
another.
(cherry picked from commit
f052b0bc4d2619daafe5c56d91fc4a6cb00b8b7c)
Conflicts:
modules/videoio/src/ffmpeg_codecs.hpp
Vadim Pisarevsky [Wed, 22 Apr 2015 21:39:44 +0000 (00:39 +0300)]
fixed compile warnings; hopefully fixed test failures
(cherry picked from commit
30912b49f3514895efbc597da89e6421bf08e60b)
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
Vadim Pisarevsky [Wed, 22 Apr 2015 18:57:29 +0000 (21:57 +0300)]
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
(cherry picked from commit
2b2e3ee93c6788b892b084cc04d0ead5ab75c197)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
Roman Donchenko [Mon, 8 Jun 2015 15:01:24 +0000 (18:01 +0300)]
Add ARM64 packaging support
Roman Donchenko [Mon, 8 Jun 2015 13:08:58 +0000 (16:08 +0300)]
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
Because that's the variable actually used by CPack.
howtobeahacker [Wed, 3 Jun 2015 09:33:40 +0000 (17:33 +0800)]
correct covariation matrix formula in Harris corner detector
Vadim Pisarevsky [Wed, 3 Jun 2015 07:25:17 +0000 (07:25 +0000)]
Merge pull request #4085 from berak:patch-3
berak [Wed, 3 Jun 2015 05:48:29 +0000 (07:48 +0200)]
http://code.opencv.org/issues/4359 2.4 branch
Vadim Pisarevsky [Fri, 29 May 2015 18:55:55 +0000 (18:55 +0000)]
Merge pull request #4003 from uwinsoftware:2.4
Vadim Pisarevsky [Thu, 28 May 2015 14:59:45 +0000 (14:59 +0000)]
Merge pull request #4057 from apavlenko:24_java_memory_release
Vadim Pisarevsky [Tue, 26 May 2015 17:24:05 +0000 (17:24 +0000)]
Merge pull request #4061 from ilya-lavrenov:android
Ilya Lavrenov [Tue, 26 May 2015 14:32:02 +0000 (17:32 +0300)]
fixed OS names
Andrey Pavlenko [Tue, 26 May 2015 10:50:56 +0000 (13:50 +0300)]
releasing native memory of temp `Mat` objects in generated Java code
Andrey Pavlenko [Tue, 26 May 2015 10:10:54 +0000 (13:10 +0300)]
releasing native memory in Java converters
Vadim Pisarevsky [Sat, 23 May 2015 10:18:08 +0000 (10:18 +0000)]
Merge pull request #4008 from cr333:triangulation_fix_2.4
Vadim Pisarevsky [Thu, 21 May 2015 13:17:46 +0000 (13:17 +0000)]
Merge pull request #4042 from ilya-lavrenov:android_mk
Vadim Pisarevsky [Thu, 21 May 2015 12:33:42 +0000 (12:33 +0000)]
Merge pull request #4037 from Lectem:patch-1
Vadim Pisarevsky [Thu, 21 May 2015 12:24:46 +0000 (12:24 +0000)]
Merge pull request #4041 from ilya-lavrenov:warning_fix
Ilya Lavrenov [Thu, 21 May 2015 10:38:28 +0000 (13:38 +0300)]
fixed Android mk generation for arm64-v8a
Ilya Lavrenov [Thu, 21 May 2015 08:49:06 +0000 (11:49 +0300)]
fixed warning
Lectem [Wed, 20 May 2015 10:18:28 +0000 (12:18 +0200)]
fix mutex for uclibc
The uClibc doesn't have pthread_spin_* implemented on their 'old' linux threads.
Since it is on linux, we have to check if uclibc is using this implementation or not.
Alexander Smorkalov [Wed, 20 May 2015 05:12:43 +0000 (05:12 +0000)]
Merge pull request #4030 from asmorkalov:as/accurate_cuda_arch_aarch64
Alexander Smorkalov [Wed, 20 May 2015 05:12:24 +0000 (05:12 +0000)]
Merge pull request #4033 from jet47:gpu-tests-fix
Vladislav Vinogradov [Tue, 19 May 2015 15:23:10 +0000 (18:23 +0300)]
exclude dates from report names
Vladislav Vinogradov [Tue, 19 May 2015 15:22:30 +0000 (18:22 +0300)]
save tests console output to separate log files
Vladislav Vinogradov [Tue, 19 May 2015 15:17:28 +0000 (18:17 +0300)]
check that current directory has write access
Vladislav Vinogradov [Tue, 19 May 2015 14:28:43 +0000 (17:28 +0300)]
do not loose logs from nvidia tests
Vladislav Vinogradov [Tue, 19 May 2015 14:27:50 +0000 (17:27 +0300)]
use fixed seed for RNG in gpu SolvePnPRansac test
Vladislav Vinogradov [Tue, 19 May 2015 14:27:23 +0000 (17:27 +0300)]
use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
Alexander Smorkalov [Tue, 19 May 2015 10:23:55 +0000 (13:23 +0300)]
Precise default CUDA version for Tegra X1 chips.
Vadim Pisarevsky [Mon, 18 May 2015 15:38:21 +0000 (15:38 +0000)]
Merge pull request #3829 from ippei-i:2.4-flann-lsh-addable-index
Alexander Smorkalov [Mon, 18 May 2015 08:00:12 +0000 (08:00 +0000)]
Merge pull request #3785 from jet47:tiny-gpu-module
Christian Richardt [Wed, 13 May 2015 13:47:00 +0000 (15:47 +0200)]
Fixed triangulation bug code.opencv.org/issues/4334.
Vadim Pisarevsky [Tue, 12 May 2015 15:12:03 +0000 (15:12 +0000)]
Merge pull request #3975 from StevenPuttemans:RGB_doc_fixing_2.4
Nguyen Nguyen [Fri, 8 May 2015 16:06:03 +0000 (12:06 -0400)]
Revert support for audio
Nguyen Nguyen [Fri, 8 May 2015 15:33:11 +0000 (11:33 -0400)]
temporary fixes
Nguyen Nguyen [Wed, 6 May 2015 21:01:38 +0000 (17:01 -0400)]
Adding audio to opencv
Vadim Pisarevsky [Wed, 6 May 2015 15:35:35 +0000 (15:35 +0000)]
Merge pull request #3981 from patrikhuber:vs2015-support
Vladislav Vinogradov [Thu, 23 Apr 2015 13:20:56 +0000 (16:20 +0300)]
fix tests compilation issue on Windows
Vladislav Vinogradov [Fri, 6 Mar 2015 12:45:14 +0000 (15:45 +0300)]
fix performance tests in tiny mode
Vladislav Vinogradov [Fri, 6 Mar 2015 10:59:08 +0000 (13:59 +0300)]
fix accuracy tests in tiny mode
Vladislav Vinogradov [Fri, 6 Mar 2015 10:58:52 +0000 (13:58 +0300)]
turn on stereob instantiates that required for tests
Vladislav Vinogradov [Fri, 6 Mar 2015 10:58:35 +0000 (13:58 +0300)]
turn on some instantiates that required for other primitives
Vladislav Vinogradov [Thu, 5 Mar 2015 15:38:36 +0000 (18:38 +0300)]
fixed seg faults
Vladislav Vinogradov [Wed, 4 Mar 2015 14:03:15 +0000 (17:03 +0300)]
reduce color instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:41:12 +0000 (16:41 +0300)]
reduce copy_make_border instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:37:41 +0000 (16:37 +0300)]
reduce matrix_reductions instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:27:20 +0000 (16:27 +0300)]
reduce pyramids instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:23:30 +0000 (16:23 +0300)]
reduce resize instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:18:57 +0000 (16:18 +0300)]
reduce remap instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:15:14 +0000 (16:15 +0300)]
reduce warp instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:08:19 +0000 (16:08 +0300)]
reduce stereobm instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:02:54 +0000 (16:02 +0300)]
reduce element_operations instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:57:18 +0000 (14:57 +0300)]
reduce add_weighted instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:44:52 +0000 (14:44 +0300)]
reduce brute_force_matcher instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:32:11 +0000 (14:32 +0300)]
reduce bilateral filter instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:24:18 +0000 (14:24 +0300)]
reduce filter2d instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:18:49 +0000 (14:18 +0300)]
reduce separable filter instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 10:38:46 +0000 (13:38 +0300)]
introduce BUILD_TINY_GPU_MODULE CMake option
it adds OPENCV_TINY_GPU_MODULE definition, that will allow
to build tiny version of gpu module (with limited image format support)
Alexander Smorkalov [Wed, 6 May 2015 12:50:08 +0000 (12:50 +0000)]
Merge pull request #3990 from jet47:cuda-bitwise-mask
Alexander Smorkalov [Wed, 6 May 2015 12:47:59 +0000 (12:47 +0000)]
Merge pull request #3976 from SpecLad:rm-insertIframe
Alexander Smorkalov [Wed, 6 May 2015 12:47:41 +0000 (12:47 +0000)]
Merge pull request #3989 from asmorkalov:as/tbb_dep
Vladislav Vinogradov [Wed, 6 May 2015 10:28:08 +0000 (13:28 +0300)]
Bug #4315 : fix CUDA bitwise operations with mask
Alexander Smorkalov [Wed, 6 May 2015 10:10:39 +0000 (13:10 +0300)]
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
Nguyen Nguyen [Tue, 5 May 2015 17:14:26 +0000 (13:14 -0400)]
Adding code to deal with audio output
Nguyen Nguyen [Mon, 4 May 2015 20:21:25 +0000 (16:21 -0400)]
Fixed memory leak when recording video in iOS
Nguyen Nguyen [Mon, 4 May 2015 16:38:55 +0000 (12:38 -0400)]
Exporting videoFileString to outside world
Maksim Shabunin [Mon, 4 May 2015 10:13:44 +0000 (10:13 +0000)]
Merge pull request #3969 from Dikay900:master_to_2_4
StevenPuttemans [Thu, 30 Apr 2015 08:51:16 +0000 (10:51 +0200)]
Fixing all wrong uses of RGB channels instead of the OpenCV BGR standard
Patrik Huber [Sat, 2 May 2015 12:31:43 +0000 (13:31 +0100)]
Add support for VS2015
Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.
Roman Donchenko [Thu, 30 Apr 2015 12:26:40 +0000 (15:26 +0300)]
Remove insertIframe.js
It hasn't been used since f82c04f. Also, the line adding the script had
an unneeded pathto call, so the script was being loaded from the wrong path
anyway.
Belev [Mon, 27 Apr 2015 08:10:47 +0000 (11:10 +0300)]
Fix typo
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
Conflicts:
doc/tutorials/core/adding_images/adding_images.markdown
doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.markdown
doc/tutorials/core/random_generator_and_text/random_generator_and_text.markdown
modules/imgproc/include/opencv2/imgproc.hpp
Andrey Pavlenko [Tue, 28 Apr 2015 16:22:31 +0000 (16:22 +0000)]
Merge pull request #3961 from apavlenko:2.4_fix_polylines_empty
Martin Ueding [Thu, 23 Apr 2015 11:30:14 +0000 (13:30 +0200)]
Add example data types for calibrateCamera call
It took me a while to figure out what was meant with
OpenCV Error: Assertion failed (i < 0) in getMat
While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/)
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
After I fixed that, I got the next error message:
OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
collectCalibrationData, file
/build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
line 3193
The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.
In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.
Conflicts:
modules/calib3d/include/opencv2/calib3d.hpp
Vadim Pisarevsky [Tue, 28 Apr 2015 10:54:45 +0000 (10:54 +0000)]
Merge pull request #3946 from zjulujia:bugfix_for_hog_detectMultiScale_with_weights
Vadim Pisarevsky [Tue, 28 Apr 2015 10:49:05 +0000 (10:49 +0000)]
Merge pull request #3959 from jet47:gpu-fixes
Vadim Pisarevsky [Tue, 28 Apr 2015 10:48:33 +0000 (10:48 +0000)]
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
Vadim Pisarevsky [Tue, 28 Apr 2015 10:47:05 +0000 (10:47 +0000)]
Merge pull request #3965 from Dikay900:2_4_diff_to_master_2
Vadim Pisarevsky [Tue, 28 Apr 2015 10:41:42 +0000 (10:41 +0000)]
Merge pull request #3963 from Dikay900:2_4_diff_to_master
Pierre Moulon [Fri, 14 Feb 2014 11:21:35 +0000 (12:21 +0100)]
Fix a typo error
Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
Adi Shavit [Thu, 3 Jul 2014 19:14:58 +0000 (22:14 +0300)]
Added call to clone() to avoid unexpected change to external data.
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
Dikay900 [Sat, 25 Apr 2015 12:31:50 +0000 (14:31 +0200)]
fix qt example on 2.4 with vs2010 and higher
Brian Park [Wed, 22 Oct 2014 05:47:49 +0000 (22:47 -0700)]
add input paramter checking that verifies the existance of the input files to stero_match example
remove the unnecessary header file
check input paramter by checking the image size
Chris Mayo [Tue, 30 Dec 2014 10:13:10 +0000 (10:13 +0000)]
Act on INSTALL_PYTHON_EXAMPLES
Conflicts:
samples/CMakeLists.txt
Ben Hagen [Mon, 19 Jan 2015 20:51:19 +0000 (21:51 +0100)]
store user-provided data in PlaneTracker class
Yang Fan [Tue, 14 Apr 2015 05:39:00 +0000 (13:39 +0800)]
ENH: explicitly declared outputFilename to surpress error C2668
Conflicts:
samples/gpu/video_writer.cpp
Abhijit Kundu [Mon, 28 Apr 2014 11:23:49 +0000 (07:23 -0400)]
Added suuport for finding Intel TBB for Visual Studio 2013
Simon Heinen [Fri, 20 Feb 2015 11:54:54 +0000 (12:54 +0100)]
squashed #3729
Update android+AsyncServiceHelper.java
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Update android+AsyncServiceHelper.java
small formatting fixes
Eric Sommerlade [Mon, 23 Feb 2015 13:12:42 +0000 (06:12 -0700)]
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp
Ying Xiong [Mon, 6 Apr 2015 20:37:06 +0000 (16:37 -0400)]
Silence cmake 3.0+ warnings about MACOSX_RPATH
ttagu99 [Tue, 14 Apr 2015 01:01:53 +0000 (10:01 +0900)]
findcontour_example check image empty
侯骥 [Wed, 11 Jun 2014 08:29:30 +0000 (10:29 +0200)]
Update MatchTemplate_Demo.cpp
Jay Bosamiya [Sat, 17 Jan 2015 17:23:30 +0000 (22:53 +0530)]
Fix typo
RafaRuiz [Tue, 24 Mar 2015 09:06:55 +0000 (09:06 +0000)]
Update lkdemo.cpp because of memory leak
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
Pastafarianist [Sun, 21 Apr 2013 19:04:54 +0000 (23:04 +0400)]
Fixed typo