Commit Graph

9160 Commits

Author SHA1 Message Date
Andrey Pavlenko
76a938c7ef Merge pull request #1197 from apavlenko:fix_unstable_perf_tests 2013-07-31 15:07:19 +04:00
Andrey Pavlenko
6a40067424 Merge pull request #1206 from StevenPuttemans:feature_3169 2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72 Added bugfix #2795
- changing license header
- fixed bug in QtKit when changing camera resolution
2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Andrey Pavlenko
46192e7b11 Merge pull request #1207 from kirill-kornyakov:fix-for-readme 2013-07-31 09:23:38 +04:00
Kirill Kornyakov
252a11c437 Updated README.md 2013-07-30 18:51:53 +04:00
Kirill Kornyakov
11617e5d0b Updated gitignore relative to new platforms dir 2013-07-30 18:48:20 +04:00
Andrey Pavlenko
0851766806 Merge pull request #1121 from pengx17:2.4_gftt_perf_test 2013-07-30 18:40:10 +04:00
Andrey Pavlenko
6a77bfb503 Merge pull request #1172 from StevenPuttemans:bugfix_3166_24 2013-07-30 18:39:41 +04:00
Andrey Pavlenko
646e817b36 Merge pull request #1070 from Daniil-Osokin:calibrationSampleAndroid 2013-07-30 17:56:01 +04:00
Andrey Pavlenko
2b8d868560 Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix 2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
Andrey Pavlenko
c43b896541 Merge pull request #1177 from janstarzy:refactor 2013-07-30 17:39:09 +04:00
Andrey Pavlenko
bc78e87a61 Merge pull request #1123 from bitwangyaoyao:2.4_fix 2013-07-30 17:13:27 +04:00
Andrey Pavlenko
26a3cabbf8 Merge pull request #1193 from SpecLad:exports-for-contrarians 2013-07-30 16:50:29 +04:00
Andrey Pavlenko
eb0d26b5be fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r') 2013-07-30 16:42:45 +04:00
Andrey Pavlenko
373dfa8ccc Merge pull request #1201 from alekcac:gittip 2013-07-30 16:35:59 +04:00
Andrey Pavlenko
ea6002ebc7 Merge pull request #1185 from znah:cumpute_method_for_2_4 2013-07-30 15:46:48 +04:00
kdrobnyh
94bc4c4429 Some changes in erosion and dilation functions 2013-07-30 15:13:04 +04:00
peng xiao
8b90cb375a Fix doc build error. 2013-07-30 14:12:22 +08:00
peng xiao
892c088e1b Some modifications to sortByKey API.
Add documentation.
2013-07-30 11:53:25 +08:00
kdrobnyh
6af10a2937 Some changes in sum and mean functions 2013-07-30 00:54:27 +04:00
Andrey Pavlenko
301de6e038 Merge pull request #1202 from hansmi:docfix3149 2013-07-29 15:29:22 +04:00
Andrey Pavlenko
e213af6c0d Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres 2013-07-29 15:25:56 +04:00
Michael Hanselmann
cdc2ee9789 Documentation fix for cv::compare (issue 3149)
Since commit d8417af086 (July 2011) cv::compare produces an array with
the same size and type as the input arrays.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2013-07-28 16:19:19 +02:00
Alexander Shishkov
3ad22dbc41 Update README.md 2013-07-28 01:01:46 +04:00
Alexander Shishkov
4a36dfd123 Update README.md 2013-07-28 00:37:38 +04:00
Alexander Shishkov
64f4957d32 Rename README to README.md 2013-07-28 00:25:07 +04:00
Alexander Shishkov
435d26391a Added gittip button 2013-07-28 00:23:52 +04:00
Frédéric Devernay
6be8757e8b fix signedness error
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c fix cap_qtkit.mm for multithreaded applications
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.

Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
2013-07-26 18:39:03 +02:00
Andrey Pavlenko
3a0e26b89d adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so) 2013-07-26 17:27:31 +04:00
Dmitry Retinskiy
1d571b1eaa bugfix #3121: corrected calculation of blue channel index 2013-07-26 16:31:39 +04:00
Roman Donchenko
ee182eb086 Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
2013-07-26 14:35:40 +04:00
Roman Donchenko
d945b20db9 Merge pull request #1191 from jet47:gpu-perf4au-fix 2013-07-26 13:01:42 +04:00
Vladislav Vinogradov
dfd2957841 fixed gpu_perf4au perf test (added cuda impl) 2013-07-26 11:13:39 +04:00
peng xiao
a6d558042c Fix build errors 2013-07-26 14:32:37 +08:00
Jin Ma
027b8021b1 Added farneback to superres module. 2013-07-26 14:14:40 +08:00
yao
270b2c7918 generating the lut table instead of hard coding one 2013-07-26 11:17:27 +08:00
Daniil Osokin
23c802b4cd Added camera calibration sample for android 2013-07-26 01:19:32 +04:00
kdrobnyh
4dfd40bec0 Add IPP mean and sum functions 2013-07-25 21:27:35 +04:00
Jan Starzynski
d6b86d43c9 removed declaration of throwJavaException 2013-07-25 14:53:22 +02:00
Alexander Mordvintsev
57bd485119 compute method for Feature2D 2013-07-25 16:22:31 +04:00
Jan Starzynski
70930a30a1 refactored throwJavaException() and removed useless returns 2013-07-25 13:36:27 +02:00
Roman Donchenko
be8b3687f4 Merge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2 2013-07-25 12:00:55 +04:00
Alexander Pacha
0b15cfd48c Added FREAK-descriptor extractor to documentation.
Previously it was missing.
Ordered all descriptors by year of first publication.
2013-07-25 16:40:09 +12:00
Jan Starzynski
925e4eec98 removed multiplied code for exception handling 2013-07-24 17:27:03 +02:00
Roman Donchenko
0e4882aa16 Merge pull request #1169 from asmorkalov:winrt_tbb_dbg_wrn_fix 2013-07-24 16:08:17 +04:00
Alexander Smorkalov
908039c658 Warning suppresion for TBB on WinRT added. 2013-07-24 09:21:30 +04:00
Roman Donchenko
48e31fd202 Merge pull request #1168 from StevenPuttemans:feature_2753 2013-07-23 11:54:40 +04:00