Commit Graph

670 Commits

Author SHA1 Message Date
alexandre benoit
72742f5316 resolved conflicts, updated retina class interface and optimized a heavy retinacolor process 2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228 minor chnges for conflict removal 2013-04-29 15:12:44 +02:00
albenoit
9e1ce1ed52 Merge pull request #2 from albenoit/retina_devel
Retina devel
2013-04-27 13:47:30 -07:00
alexandre benoit
ea1a64477f updated tutorial with new retina interface use 2013-04-27 22:39:28 +02:00
alexandre benoit
b62d101115 updated retina interface for cleaner use, following OpenCV standards 2013-04-27 21:13:45 +02:00
Kevin Hughes
69c626e720 starter_video.cpp hid local functions 2013-04-22 22:28:35 -04:00
Kevin Hughes
3441b2df65 starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error 2013-04-22 16:35:23 -04:00
Pastafarianist
28427ce2e8 Fixed typo 2013-04-21 23:04:54 +04:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
564f609885 fixed samples compilation 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
5ee9d3111d fixed gpu tutorial 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
13d087e62d videostab module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
fdeec6896c stitching module fixes 2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
ac0f506d0e split gpuvideo onto gpuoptflow and gpubgsegm 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
eda124ec32 removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
28b1caa730 gpustereo module for stereo correspondence 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
fc3730fcc2 gpuwarping module for image warping 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
a6648b5372 gpuobjdetect module for object detection 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
b08b9ab83b gpucalib3d module for camera calibration and stereo correspondence 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556 gpuvideo module for video processing 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
7544ddbfef gpufeatures2d module 2d for feature detection and matching 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e41aea0acf gpuimgproc module for image processing 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
84de6ce036 gpufilters module for image filtering 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Kevin Hughes
47c84335f0 removed starter_image_sequence.cpp 2013-04-17 13:22:37 -04:00
Kevin Hughes
eedb6fa3c4 removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface 2013-04-17 13:20:32 -04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
Kevin Hughes
b141762070 added an example of using cv::VideoCapture to read image sequences like 000.pmg, 001.png ... 100.png etc. 2013-04-15 13:21:20 -04:00
Andrey Kamaev
909d6fcf51 Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
Andrey Kamaev
5e048d1fa5 Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
2013-04-12 14:37:01 +04:00
Andrey Kamaev
e5a33723fc Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
Kirill Kornyakov
53a06913cb Minor code cleanings in lkdemo.cpp 2013-04-11 17:57:33 +04:00
Kirill Kornyakov
e351538697 #2813 bugfix 2013-04-11 17:50:10 +04:00
Andrey Kamaev
199a35a105 Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
Andrey Kamaev
c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
Andrey Kamaev
69648f0a6f Make photo.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Siva Prasad Varma
e2df8c7e62 Fix bug #2590
replaced wrong check to correct check
2013-04-05 19:09:09 +05:30
Alexander Shishkov
35f75147b0 removed willowgarage.com links 2013-04-04 14:33:00 +04:00
Alexander Shishkov
382695ba5a removed links to the http://opencv.willowgarage.com/ 2013-04-04 13:44:28 +04:00
Andrey Kamaev
c979de1eed Rewrite Mat formatting without std streams 2013-04-03 11:55:19 +04:00
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
3890a74565 Drop outdated definitions from internal.hpp
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
Andrey Kamaev
13b31b0804 Move C++ basic structures to separate header and inverse dependency from C API
cv::Complex, cv::Point_ and cv::Point3_ are moved.
2013-04-01 15:24:32 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev
20534c9beb Merge pull request #692 from vpisarev:refactor_calib3d_stereo 2013-03-26 18:38:16 +04:00
Andrey Kamaev
f282498b1d Drop outdated targets and fix solution folders 2013-03-25 21:57:53 +04:00
Andrey Kamaev
29cfeb7cee Fix build of apps and samples 2013-03-22 22:14:36 +04:00
Andrey Kamaev
82d7292ee7 Merge pull request #680 from vpisarev:c2cpp_video_take2 2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
7661625c39 converter stereo correspondence algorithms to the new style 2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Vadim Pisarevsky
321070ccf0 Merge pull request #669 from vpisarev:fast_lin_svm 2013-03-21 12:22:36 +04:00
Vadim Pisarevsky
07e0f7bf59 refactored video module; use the new-style algorithms now 2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
24c614f686 added load/save feature for SVM classifier in letter_recog sample 2013-03-19 18:41:38 +04:00
Vadim Pisarevsky
a06af5ca25 dramatic speedup of SVM::predict in the case of linear SVM 2013-03-19 18:28:17 +04:00
Vladislav Vinogradov
0a65f2f4af merged gpunonfree and nonfree module 2013-03-18 16:14:37 +04:00
Vladislav Vinogradov
fd7bf0b766 moved SURF_GPU and VIBE to gpunonfree module 2013-03-18 14:06:29 +04:00
marina.kolpakova
0211843062 merge Detection structure for CPU and GPU soft cascade detectors 2013-03-18 06:58:53 +04:00
marina.kolpakova
157a98edf7 refactored cuda error handling; remove optional dependancies in soft cascade training app 2013-03-14 23:43:03 +04:00
marina.kolpakova
a476664144 fixed compilation with latest master changes 2013-03-14 20:12:52 +04:00
Andrey Kamaev
d9cd753835 Merge pull request #645 from taka-no-me:bump_headers 2013-03-14 11:42:23 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
marina.kolpakova
b4b63cd698 add softcascade to people detector sample 2013-03-13 07:39:50 +04:00
Vadim Pisarevsky
df89f30b4a removed preset parameter in createStereoBM, updated stereo_match sample 2013-03-02 02:17:49 +04:00
Georgios Evangelidis
f40725bb50 Add ECC algorithm
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Vladislav Vinogradov
e06c3ec7c5 updated OpenGL functionality:
* removed OpenGLFuncTab, now extensions are loaded internally
* 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
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
262fc929aa Merge branch '2.4' 2013-02-18 15:35:42 +04:00
Vladislav Vinogradov
a3a09cf4d1 refactored OpticalFlowDual_TVL1:
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
Vladislav Vinogradov
1498d2f427 added dual tvl1 optical flow implementation 2013-02-13 15:42:58 +04:00
Ivan Korolev
36451319c1 fixed cmd line parsing in the samples 2013-01-31 12:08:43 +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
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
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
Anatoly Baksheev
680eeecc3b fixed samples compilation 2012-12-17 13:19:26 +04:00
Vadim Pisarevsky
2a42960ff2 Merge branch 'master' of https://github.com/nevion/opencv into cc 2012-12-15 21:45:55 +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
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
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
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
dad56e202f Rename sample & tutorial executables 2012-11-09 10:15:48 +04:00
Andrey Kamaev
b131dfeecd Build tutorial codes together with other samples
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01 Fix Windows build warnings 2012-11-09 10:10:04 +04:00
Jason Newton
4c0cb2576d connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version 2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b connectedComponents: warning free version 2012-11-05 08:10:29 -08:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Kamaev
66b90d19a6 Merge pull request #81 from stephenfox/master 2012-10-31 16:59:45 +04:00