Commit Graph

1150 Commits

Author SHA1 Message Date
cuda-geek 6b4304efda Merge pull request #388 from ivan-korolev:fix_cmd_line_parsing_in_samples 2013-01-31 17:15:14 +04:00
Andrey Kamaev 57d3152cd0 Merge branch '2.4' 2013-01-31 14:35:27 +04:00
Ivan Korolev 36451319c1 fixed cmd line parsing in the samples 2013-01-31 12:08:43 +04:00
Andrey Kamaev f489eb9a5d Fix build warnings in OpenCL samples 2013-01-30 17:25:03 +04:00
Andrey Kamaev 7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +04:00
Andrey Kamaev 68be50bbab Fix clang build warning 2013-01-30 13:31:00 +04:00
Andrey Kamaev 9690ed8232 Fix build of OpenCV samples (Linux) 2013-01-30 12:48:01 +04:00
Vadim Pisarevsky c69312ea0d fixed #2580, #2210. some work on #2025.
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.

added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
cuda-geek 11dfceb2c9 Merge pull request #328 from jet47:new-gpu-fixes 2013-01-29 11:00:37 +04:00
Andrey Kamaev f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Andrey Kamaev d5b15d6523 Fix ocl build warnings 2013-01-24 17:08:30 +04:00
Stefan Romberg 9f417268b3 Fixed visualization by choosing the color appropriate to the detection
Fixed visualization by choosing the color appropriate to the detection
score.
Previously the example showed all detections with the same color
disregarding the confidence. This led to the impression that the object
detection did not work at all because there are many detections with low
confidences.

PR to master was
https://github.com/Itseez/opencv/pull/320
2013-01-24 10:01:18 +01:00
Vladislav Vinogradov ae6266e101 fixes for gpu module:
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Vadim Pisarevsky dc4d0398f3 converted few more comp. geometry functions to C++ 2013-01-22 16:54:31 +04:00
Vadim Pisarevsky b68df415a9 Merge pull request #135 from nevion:master 2013-01-10 16:43:45 +04:00
marina.kolpakova 45191dd6a5 merge CUDA dev branch 2012-12-29 19:44:38 +04:00
Anatoly Baksheev 389ecbe96d warnings, renamed Marina's GPU_PERF_TEST_P 2012-12-25 22:00:20 +04:00
Andrey Kamaev 132b5d6435 Merge release 2.4.3.2 2012-12-25 19:07:08 +04:00
Andrey Pavlenko dd8e648d78 hiding empty menu button on Android 4 2012-12-25 17:49:10 +04:00
Andrey Kamaev 13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +04:00
Vladislav Vinogradov 5138b7d209 Merge branch 'master' into cuda-dev 2012-12-24 13:48:33 +04:00
Andrey Kamaev 9944282b09 Fix build with STLPort from NDK r8d 2012-12-22 00:59:56 +04:00
Andrey Kamaev 962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Alexander Smorkalov 77df8730ef Tutorial-5 sample extended.
Application menu reorganized;
Resolution control added.
2012-12-20 11:16:34 +04:00
Alexander Smorkalov 1555922228 OpenCV for Android SDK installation improved;
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
2012-12-19 17:28:46 +04:00
Vladislav Vinogradov 41c9377db0 fixed warnings under windows 2012-12-18 18:03:54 +04:00
Anatoly Baksheev 680eeecc3b fixed samples compilation 2012-12-17 13:19:26 +04:00
Vladislav Vinogradov 1a1f454241 updated gpu houghlines sample 2012-12-17 11:15:45 +04:00
Vladislav Vinogradov da017fbeb9 fast optical flow bm implementation 2012-12-17 10:39:19 +04:00
Vadim Pisarevsky 2a42960ff2 Merge branch 'master' of https://github.com/nevion/opencv into cc 2012-12-15 21:45:55 +04:00
Andrey Kamaev f5cd20d80b Merge branch 2.4 2012-12-14 14:46:41 +04:00
Vladislav Vinogradov caf91ac159 new gpu::HoughLinesP implementation 2012-12-13 17:18:25 +04:00
Vladislav Vinogradov da93a1dab9 fixed build for CARMA platform 2012-12-13 13:49:32 +04:00
marina.kolpakova a6c3ed5b36 Merge branch master into cuda-dev 2012-12-11 01:12:14 +04:00
Jason Newton 6a4d881a78 use vector instead of non-standard stack allocation. also correct program argument borkage 2012-12-08 23:09:05 -08:00
Alexander Smorkalov d550f95347 Date and time added to saved file name. 2012-12-07 14:46:53 +04:00
Vladislav Vinogradov aad76090ce gpu::HoughLinesP 2012-12-06 15:14:20 +04:00
Vladislav Vinogradov 05d842bcd8 a bit more opengl refactoring:
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Andrey Kamaev e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Alexander Smorkalov 22484872fa Sample Tutorial-5 improved
Aditional toasts added;
Exception handling improved;
Bitmap recycling added.
2012-11-30 18:41:46 +04:00
Vladislav Vinogradov 08fbf667f9 refactored opengl functionality
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Andrey Kamaev 60a98aa5f7 Merge pull request #199 from apavlenko/remove_android_tutorial0
removing Android tutorial 0
2012-11-30 01:20:07 -08:00
Andrey Pavlenko ea83d384c1 removing Android tutorial 0 since it has become irrelevant after moving to the new application framework 2012-11-30 12:32:16 +04:00
Alexander Smorkalov d36f8b9eb3 Code review comments applied
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
2012-11-29 18:26:57 +04:00
Alexander Smorkalov 86f7a357ae Tutorial-5 functionality implemented. 2012-11-27 18:06:43 +04:00
Alexander Smorkalov 24c920a33a Base for new sample added. 2012-11-27 18:06:43 +04:00
Jason Newton 00bdca7684 A few changes to comply with upstream requirements for merge.
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.

-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Alexander Smorkalov e95fc27490 Samples updated
In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
2012-11-27 12:47:41 +04:00
marina.kolpakova 209f16455d Merge cuda-geek/soft-cascade-gpu into cuda-dev 2012-11-26 19:15:02 +04:00
marina.kolpakova 1712d0930c Merge origin/master into cuda-dev 2012-11-26 18:56:33 +04:00