Alexander Alekhin
e9539061db
Merge pull request #5124 from StevenPuttemans:fix_annotation_tool_2.4
2015-08-08 16:51:51 +00:00
StevenPuttemans
ba7bf1ef68
add checks on input parameters for valid path and folder
...
opening a folder is system specific - made system specific code
added license
2015-08-06 10:23:41 +02:00
Alexander Alekhin
5a53f41622
Merge branch '2.4.10.x-prep' into 2.4
2015-08-05 16:20:12 +03:00
Alexander Alekhin
80844fd554
Merge pull request #5096 from terfendail:2.4
2015-08-03 12:46:45 +00:00
Vitaly Tuzov
a96a6bf149
Resize area result verification moved to the separate function
2015-07-31 15:01:33 +03:00
Vitaly Tuzov
b7c9aaa471
Added more resize_area tests to ensure right rounding behavior for half and quarter downscaling
2015-07-30 18:48:06 +03:00
Alexander Smorkalov
1f5fd865aa
Merge pull request #5092 from etalanin:update-branch-to-2-4-12
2015-07-29 18:57:02 +00:00
Evgeny Talanin
9a3dccab20
Increase Android Manager version
2015-07-29 21:16:21 +03:00
Evgeny Talanin
ac6ca660f4
Increase version to 2.4.12
2015-07-29 20:34:47 +03:00
Alexander Alekhin
6f47c26acf
Merge pull request #5091 from jet47:gpu-sanity-epsilon
2015-07-29 16:29:37 +00:00
Vladislav Vinogradov
945663bc9b
increase epsilon for some GPU sanity tests
2015-07-29 18:57:14 +03:00
Alexander Alekhin
0263b49298
Merge pull request #5090 from SpecLad:autotune-crash
2015-07-29 15:47:20 +00:00
Roman Donchenko
c2f59a0f73
flann: fix AutotunedIndex crashing if a KDTree index is selected
...
Backport of mariusmuja/flann@f8ca6df3 .
2015-07-29 18:03:48 +03:00
Maksim Shabunin
9eda260495
Merge pull request #4211 from alalek:fix_python_2_4
2015-07-24 13:33:51 +00:00
Maksim Shabunin
3ed54b9008
Merge pull request #4220 from alalek:fix_gcc_warnings_2_4
2015-07-24 13:09:44 +00:00
Alexander Alekhin
6b954cd24e
Merge pull request #4219 from SpecLad:freak-missing-init
2015-07-22 12:52:36 +00:00
Alexander Alekhin
42ba5c7d16
fix GCC 4.9 warnings
2015-07-22 14:17:54 +03:00
Roman Donchenko
72ddeea479
FREAK: add missing field initialization
2015-07-22 14:06:39 +03:00
Vadim Pisarevsky
869dda4117
Merge pull request #4204 from gladilov-gleb:minMaxLocBugFix
2015-07-22 10:52:16 +00:00
Gleb Gladilov
07de67c32f
Added test of minMaxLoc on filling with maximums of int
2015-07-22 11:43:35 +03:00
Gleb Gladilov
c467d0d553
Fixed minMaxLoc and test functions
2015-07-21 17:17:23 +03:00
Alexander Alekhin
0906744788
fix python cross-compilation
2015-07-21 12:41:57 +03:00
Alexander Smorkalov
67158b12cd
Merge pull request #4191 from SpecLad:irc-workaround
2015-07-16 08:17:45 +00:00
Roman Donchenko
9e50cf5375
Refactor a section of icvRotatingCalipers to work around a GCC bug
...
https://bugs.launchpad.net/ubuntu/+source/gcc-4.9/+bug/1474304
2015-07-14 13:26:47 +03:00
Alexander Alekhin
4bf82e50d0
Merge pull request #4187 from SpecLad:chessboard-png
2015-07-13 15:52:46 +00:00
Roman Donchenko
2e86d46cf2
CV_ChessboardDetectorTimingTest: don't ignore missing test data
2015-07-09 17:32:08 +03:00
Vadim Pisarevsky
707d10f115
Merge pull request #4137 from asmorkalov:as/ros_conflict
2015-06-22 11:52:05 +00:00
Alexander Alekhin
83a4ad5f51
Merge branch '2.4.9.x-prep' into 2.4
2015-06-19 14:55:38 +03:00
Alexander Alekhin
e7b82a8561
Merge branch '2.4.8.x-prep' into 2.4
2015-06-19 14:54:18 +03:00
Alexander Smorkalov
546e68dc65
Merge pull request #4034 from jet47:opencv_run_all_tests_unix
2015-06-17 08:19:47 +00:00
Vadim Pisarevsky
b7c2a46830
Merge pull request #4107 from SpecLad:libav-compat
2015-06-16 13:22:40 +00:00
Vadim Pisarevsky
719099ad6d
Merge pull request #4104 from SpecLad:arm64-packaging
2015-06-16 13:19:11 +00:00
Vadim Pisarevsky
2e9004813e
Merge pull request #4088 from howtobeahacker:2.4
2015-06-16 12:31:13 +00:00
Vincent Rabaud
50842b9036
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 f052b0bc4d
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
3d6413cfc6
fixed compile warnings; hopefully fixed test failures
...
(cherry picked from commit 30912b49f3
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
2015-06-09 15:53:08 +03:00
Alexander Smorkalov
57ab0d4d17
Debian packages header update to fix conflict with OpenCV from deb repo.
2015-06-09 14:59:12 +03:00
Roman Donchenko
02f8b85dd9
Add ARM64 packaging support
2015-06-08 18:03:08 +03:00
Roman Donchenko
1fbdca0c9b
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
...
Because that's the variable actually used by CPack.
2015-06-08 18:03:07 +03:00
howtobeahacker
9eaac6105f
correct covariation matrix formula in Harris corner detector
2015-06-03 17:33:40 +08:00
Vadim Pisarevsky
83ace8d580
Merge pull request #4085 from berak:patch-3
2015-06-03 07:25:17 +00:00
berak
851ce27240
http://code.opencv.org/issues/4359 2.4 branch
2015-06-03 07:48:29 +02:00
Vadim Pisarevsky
70f8d807c8
Merge pull request #4003 from uwinsoftware:2.4
2015-05-29 18:55:55 +00:00
Vadim Pisarevsky
daa21a4385
Merge pull request #4057 from apavlenko:24_java_memory_release
2015-05-28 14:59:46 +00:00
Vadim Pisarevsky
13cef0cdfc
Merge pull request #4061 from ilya-lavrenov:android
2015-05-26 17:24:05 +00:00
Ilya Lavrenov
083aced3b4
fixed OS names
2015-05-26 17:41:23 +03:00
Andrey Pavlenko
72ec9c159e
releasing native memory of temp Mat objects in generated Java code
2015-05-26 13:58:54 +03:00
Andrey Pavlenko
5b00d9da49
releasing native memory in Java converters
2015-05-26 13:58:35 +03:00
Vadim Pisarevsky
74bb0beeb0
Merge pull request #4008 from cr333:triangulation_fix_2.4
2015-05-23 10:18:08 +00:00
Vadim Pisarevsky
08714c510f
Merge pull request #4042 from ilya-lavrenov:android_mk
2015-05-21 13:17:46 +00:00
