Commit Graph

11125 Commits

Author SHA1 Message Date
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
c4e1edbb83 Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep 2013-07-30 18:22:08 +04:00
hbristow
627b9df85f removed experimental IO from build 2013-07-31 00:00:50 +10:00
hbristow
6549e5e052 Added flaky support for finding Matlab on Windows machines 2013-07-30 23:58:32 +10:00
Nghia Ho
3fcdbbe734 Merge https://github.com/Itseez/opencv 2013-07-30 23:58:10 +10: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
93923141d5 Merge pull request #1108 from nailbiter:optimLP 2013-07-30 17:50:31 +04:00
Andrey Pavlenko
b31293c984 Merge pull request #1194 from SpecLad:no-const-inputarray 2013-07-30 17:41:26 +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
cd62f9f7cb Merge pull request #1164 from bitwangyaoyao:master_fixHaar 2013-07-30 16:14:24 +04:00
Andrey Pavlenko
c5e569d178 Merge pull request #1204 from berak:Bug_3170 2013-07-30 16:13:03 +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
Andrey Pavlenko
41d180f90a Merge pull request #1198 from znah:py_flann_fix 2013-07-30 14:17:33 +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
abidrahmank
fa1b96bd36 imshow docs improvement bug#2490 2013-07-30 07:00:51 +05:30
abidrahmank
9628bb0b44 morphologyex docs bug#2169 2013-07-30 06:46:59 +05:30
Alex Leontiev
3013ad6624 Minor fixes
Request to comments on pull request for simplex method. In particular
*) while(1) is replaced with for(;;)
*) if(true){...} constructions in tests are replaced with #if 1 ...
 #endif
2013-07-30 04:14:36 +03:00
kdrobnyh
6af10a2937 Some changes in sum and mean functions 2013-07-30 00:54:27 +04:00
abidrahmank
29ddbbaa86 epilines pydocs 2013-07-30 00:27:58 +05:30
Fedor Morozov
258b98d15b Tonemap as Algorithm 2013-07-29 21:35:10 +04:00
ozantonkal
f5816c883f fix setting color of 3D objects 2013-07-29 15:10:48 +02:00
ozantonkal
b64e6ccc6c static function for appending clouds in cloud collection widget 2013-07-29 15:06:05 +02:00
Andrey Pavlenko
9e8dd28b0e Merge pull request #1200 from shervinemami:patch-1 2013-07-29 15:31:36 +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
ozantonkal
42266b04a5 makeCameraPose implementation 2013-07-29 12:25:46 +02:00
berak
1b10860f36 added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt 2013-07-29 12:16:37 +02:00
ozantonkal
250dac5b71 fix: trajectory path is now relative to the global frame 2013-07-29 11:01:59 +02: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
Nghia Ho
cb16f733b9 Added C interface 2013-07-28 15:31:58 +10: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
Nghia Ho
a40f217a38 changed from isnormal to isfinite, the prev ignored zero 2013-07-28 01:06:55 +10:00
Nghia Ho
a0576d7b2a Fixed ret 2013-07-28 00:46:44 +10:00
Nghia Ho
e2f00ce846 New intersection function for rotated rectangles 2013-07-28 00:12:24 +10:00
Shervin Emami
7dc147c1f2 Changed cornerHarris description to say it finds corners, not edges 2013-07-26 19:13:25 -07: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