Andrey Kamaev
0938358002
Merge pull requests #136 , #142 , #150 , #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
2012-11-13 19:47:16 +04:00
Andrey Kamaev
72a63922d2
Merge pull request #156 from jet47/gpu-hough-lines-fix
2012-11-13 18:24:36 +04:00
Andrey Kamaev
e4fb680566
Merge pull request #155 from jet47/gpu-test-fix
2012-11-13 18:23:52 +04:00
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +04:00
Andrey Kamaev
8ba9289a2c
Merge pull request #146 from taka-no-me/win_opengl
2012-11-13 18:19:42 +04:00
Andrey Kamaev
4d6bdc1533
Merge pull request #145 from taka-no-me/vec_print
2012-11-13 18:18:48 +04:00
Andrey Kamaev
c803cbb93b
Merge pull request #143 from vpisarev/bug_fixes4
2012-11-13 18:17:33 +04:00
Vladislav Vinogradov
a9919e01d0
fixed bug in gpu::HoughLines
2012-11-13 17:54:17 +04:00
Vladislav Vinogradov
606c23b9aa
fixed gpu module tests
...
uses old CommandLineParser class
2012-11-13 17:50:29 +04:00
Alexander Smorkalov
96e4eed018
Logcat message for disabled test cases added.
2012-11-13 11:41:08 +04:00
Alexander Smorkalov
9f5fcff3ea
More common way of test case disabling implemented.
2012-11-13 10:29:49 +04:00
marina.kolpakova
bd9ca48fab
export to python/java
2012-11-13 02:49:35 +04:00
Alexander Smorkalov
e06c5b6fd5
Code review comments applied.
2012-11-12 17:47:20 +04:00
marina.kolpakova
aa92be34d6
GK107 Policy
2012-11-12 16:37:18 +04:00
marina.kolpakova
580d8173e5
refactor computing of scaling factor
2012-11-12 11:54:40 +04:00
Vladislav Vinogradov
afff9cf716
Optimized buffers reuse in gpu module:
...
ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes
2012-11-12 10:30:35 +04:00
Vladislav Vinogradov
810829f32e
speedup compilation of row_filter.cu and column_filter.cu
...
split them into several small files
2012-11-12 10:16:04 +04:00
Vladislav Vinogradov
29f89e8930
moved block.hpp to include folder
2012-11-12 09:51:31 +04:00
marina.kolpakova
d3ac282487
GPU soft cascade documentation
2012-11-10 05:48:06 +04:00
marina.kolpakova
916967cac5
add comments to class declaration
2012-11-10 05:13:37 +04:00
marina.kolpakova
0cbf9eb22a
add support for CUDA streams
2012-11-10 05:13:26 +04:00
marina.kolpakova
40600fa504
GPU version becomes algorithm
2012-11-10 05:13:19 +04:00
marina.kolpakova
e6eb1b99e1
fix negative confidence bug
2012-11-10 05:13:01 +04:00
marina.kolpakova
27eb2e27db
enable fast integral for Kepler
2012-11-10 05:12:48 +04:00
marina.kolpakova
9b251f8130
remove Sobel normalization
2012-11-10 05:12:38 +04:00
marina.kolpakova
df392cc830
use fast integral for soft cascade
2012-11-10 05:12:27 +04:00
marina.kolpakova
ac5cd48279
add DeviceInfo parameter to the soft cascade tests
2012-11-10 05:12:13 +04:00
marina.kolpakova
fba62c9251
fix compilation problem after rebase
2012-11-10 05:12:01 +04:00
marina.kolpakova
2bd35c4358
add support for precomputed integrals
2012-11-10 05:11:48 +04:00
marina.kolpakova
fa55d51b6a
add sanity check to performance tests for soft cascade
2012-11-10 05:11:35 +04:00
marina.kolpakova
ca81628a9a
fix retrieval of detections count
2012-11-10 05:11:21 +04:00
marina.kolpakova
022a8b9698
fix rounding bug in Level creation
2012-11-10 05:11:11 +04:00
marina.kolpakova
2bcb8dbd83
refactor performance tests
2012-11-10 05:11:00 +04:00
marina.kolpakova
f196e9fda4
add factory method for Fields structure
2012-11-10 05:10:42 +04:00
marina.kolpakova
0898c3c651
kernel policy
2012-11-10 05:10:35 +04:00
marina.kolpakova
916ba4c0ea
refactor preprocessing
2012-11-10 05:10:28 +04:00
marina.kolpakova
fa62e2b72f
move preprocessing into separate function
2012-11-10 05:10:13 +04:00
marina.kolpakova
312a58fcec
fix performance test
2012-11-10 05:10:03 +04:00
marina.kolpakova
ef431f70b6
fix buggy threshold zeroing if feature has zero area
2012-11-10 05:09:45 +04:00
marina.kolpakova
0424e2c8d2
remove debug code
2012-11-10 05:09:34 +04:00
marina.kolpakova
1b9bccb856
move Level into shared memory
2012-11-10 05:09:15 +04:00
marina.kolpakova
30bce16ad6
optimize roi loads
...
only one thread load roi for all block
2012-11-10 05:08:56 +04:00
marina.kolpakova
fdef0adf95
Corrects objects matrix in case of the absence of objects
2012-11-10 05:08:43 +04:00
marina.kolpakova
838842cc96
Add performance detection test in ROI; refactored soft cascade performance tests
2012-11-10 05:08:32 +04:00
marina.kolpakova
dd595376ba
Add performance test for detection in ROI; refactor soft cascade performance tests
2012-11-10 05:08:09 +04:00
marina.kolpakova
eb91593c08
add roi support
2012-11-10 05:08:03 +04:00
marina.kolpakova
64d6e6a48d
add getROISize
2012-11-10 05:07:55 +04:00
marina.kolpakova
672cf1f445
implement different behaviour for up- and down-scaling
2012-11-10 05:07:40 +04:00
marina.kolpakova
56c7ef06e7
integrate Kepler version
2012-11-10 05:07:26 +04:00
marina.kolpakova
7db1323f81
add test that stores detections on the specific scale
2012-11-10 05:07:09 +04:00
marina.kolpakova
b52fea7fae
update soft cascade interface: - add class Detection in interface, - split sync- and async- versions, - add support for detecting at the specific scale.
2012-11-10 05:06:54 +04:00
marina.kolpakova
612a258506
kepler specific version
2012-11-10 05:06:44 +04:00
marina.kolpakova
0314e0e5d7
add kind in detection representation
2012-11-10 05:06:30 +04:00
marina.kolpakova
c0359ed5c5
fix test: enough size for detection matrix
2012-11-10 05:06:17 +04:00
marina.kolpakova
72b499df00
add detection storing
2012-11-10 05:06:05 +04:00
marina.kolpakova
8108bd30fe
optimize memory usage
2012-11-10 05:05:43 +04:00
marina.kolpakova
b83d4add2e
memory optimization
2012-11-10 05:05:25 +04:00
marina.kolpakova
4d9c7c1012
preprocessing ~1.981 ms
2012-11-10 05:05:17 +04:00
marina.kolpakova
1917366528
empty cascade
2012-11-10 05:05:09 +04:00
marina.kolpakova
4881205bae
refactor logs
2012-11-10 05:04:52 +04:00
marina.kolpakova
dca27b4622
fix cast bug; add logging
2012-11-10 05:04:36 +04:00
marina.kolpakova
e606a0d651
remove dead code
2012-11-10 05:04:20 +04:00
marina.kolpakova
ba50d19341
first version of soft cascade on GPU
2012-11-10 05:03:59 +04:00
marina.kolpakova
1bf85996b3
add detections vector initialization in tests
2012-11-10 05:03:43 +04:00
marina.kolpakova
08b4e780de
add shrinking kernel
2012-11-10 05:03:29 +04:00
marina.kolpakova
1cf7a46f3a
fix data paths in performance test
2012-11-10 05:03:05 +04:00
marina.kolpakova
0691dc554f
fix compilation
2012-11-10 05:02:52 +04:00
marina.kolpakova
5d15e4ea58
CUDA kernels interface
2012-11-10 05:02:37 +04:00
marina.kolpakova
1a52a322b5
add performance test for GPU soft cascade
2012-11-10 05:02:16 +04:00
marina.kolpakova
14a0dd8c98
fix typo in cascade loading
2012-11-10 05:02:01 +04:00
marina.kolpakova
a3af5ede80
CUDA callers
2012-11-10 05:01:44 +04:00
marina.kolpakova
4aac1444ad
integral channel storage are cached as a cascade's field
2012-11-10 05:01:25 +04:00
marina.kolpakova
1ab7af6995
GPU soft cascade: buffers preallocation
2012-11-10 05:01:09 +04:00
marina.kolpakova
2b7ce8b160
precompute feature response for scaling factor
2012-11-10 05:00:53 +04:00
marina.kolpakova
267d140bfe
soft cascade: gpu representation
2012-11-10 05:00:33 +04:00
marina.kolpakova
dd9c53497b
GPU interface for soft cascade
2012-11-10 05:00:16 +04:00
marina.kolpakova
d65b3e0617
fix warning in CUDA samples
2012-11-10 04:59:55 +04:00
Alexander Smorkalov
baef62b4d2
Java test fix. Eclipse test execution fix.
2012-11-09 11:46:14 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +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
Andrey Kamaev
8c9c2b3a03
Fix build on Windows with OpenGl enabled
...
There was missing windows.h include in OpenGL interop code.
2012-11-09 10:00:24 +04:00
Andrey Kamaev
e5ffbf9498
Fix stream output operator for Vec<uchar,n>
...
This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers.
2012-11-09 09:54:43 +04:00
marina.kolpakova
665bf430d5
fix warnings under win
2012-11-09 00:07:32 +04:00
Vadim Pisarevsky
2e54e2a586
fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility.
2012-11-08 16:15:04 +04:00
Vladislav Vinogradov
bff818afbd
fixed static build of gpu module with ffmpeg:
...
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
2012-11-08 15:49:56 +04:00
Vadim Pisarevsky
9163471987
improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525 )
2012-11-08 14:09:43 +04:00
marina.kolpakova
8a3e897999
min and max params become double
2012-11-08 02:34:49 +04:00
marina.kolpakova
e379771c03
git warning
2012-11-08 02:34:49 +04:00
marina.kolpakova
f93cffaa0d
fix compilation under win
2012-11-08 02:34:49 +04:00
marina.kolpakova
1022094dc0
fix levels computing
2012-11-08 02:34:49 +04:00
marina.kolpakova
f1e36043e6
clean code
2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161
fixed typo
2012-11-08 02:34:49 +04:00
marina.kolpakova
5fb9f48360
fix angle scaling
2012-11-08 02:34:49 +04:00
marina.kolpakova
31a073ca66
documentation
2012-11-08 02:34:49 +04:00
marina.kolpakova
4207552e19
add object init
2012-11-08 02:34:49 +04:00
marina.kolpakova
157ab66ab9
add ROI support
2012-11-08 02:34:49 +04:00
marina.kolpakova
6a3a723938
refactor integral channels
2012-11-08 02:34:48 +04:00
marina.kolpakova
65543c53f6
update test according to resize usage
2012-11-08 02:34:48 +04:00
marina.kolpakova
4a1c4a9862
soft cascade become Algorithm
2012-11-08 02:34:48 +04:00
Vladislav Vinogradov
a0be7b57f5
fixed bug in gpu::PyrLKOpticalFlow::dense
...
vector index out of range
2012-11-07 17:13:19 +04:00
NikoKJ
95869a6081
fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch.
2012-11-07 13:49:09 +08:00
marina.kolpakova
ff8417db00
remove input frame size constraints
2012-11-07 03:19:07 +04:00
marina.kolpakova
3cb9afb4e7
test update because changed Sobel Normalization
2012-11-07 03:19:07 +04:00
marina.kolpakova
a84334cfc2
brief soft cascade interface description
2012-11-07 03:19:07 +04:00
marina.kolpakova
2e8ed77383
get rid of hard-coded values
2012-11-07 03:19:07 +04:00
marina.kolpakova
16dd09ccfc
move scale related parameters to SoftCascade constructor
2012-11-07 03:19:07 +04:00
marina.kolpakova
017d970b9a
load SoftCascade from FileStorage
2012-11-07 03:19:06 +04:00
marina.kolpakova
a22ee13620
rename markDetection to addDetection
2012-11-07 03:19:06 +04:00
marina.kolpakova
40c0c60e2b
remove unused struct
2012-11-07 03:19:06 +04:00
marina.kolpakova
7b6da394f0
rename Stage to Weak because there is no such term for Soft Cascades
2012-11-07 03:19:06 +04:00
marina.kolpakova
2d0fc80c95
use IntegralChannels class
2012-11-07 03:19:06 +04:00
marina.kolpakova
3d41846c39
move frame processing into separate class
2012-11-07 03:19:06 +04:00
marina.kolpakova
5651743784
remove debug imshow from code
2012-11-07 03:19:06 +04:00
marina.kolpakova
8e092f8b5d
add Detection struct to interface
2012-11-07 03:19:06 +04:00
marina.kolpakova
754fd7311b
improve pointer usage
2012-11-07 03:19:06 +04:00
marina.kolpakova
2914f24521
improve cpu version of SoftCascade:
...
- remove division
- remove cvRound
- cache feature area
2012-11-07 03:19:06 +04:00
marina.kolpakova
2d2c46e717
add const qualifier to detectMultiScale method
2012-11-07 03:19:06 +04:00
marina.kolpakova
9771c3c7ec
remove Mat copying
2012-11-07 03:19:05 +04:00
marina.kolpakova
0ff8a4633d
remove pow calculations
2012-11-07 03:19:05 +04:00
marina.kolpakova
cc300a69b1
add perfomance test for CPU soft cascade
2012-11-07 03:19:05 +04:00
marina.kolpakova
26af7d7389
refactor logs
2012-11-07 03:19:05 +04:00
marina.kolpakova
b6081438fa
clean code
2012-11-07 03:19:05 +04:00
marina.kolpakova
296aa8854c
fix hog channels
2012-11-07 03:19:05 +04:00
marina.kolpakova
efd2615844
fix floating point bug
2012-11-07 03:19:05 +04:00
marina.kolpakova
765dea9ddf
fix bugs in the soft cascade detect method; add options for debug logging
...
- WITH_DEBUG_OUT for logging cascade scales
- DEBUG_STORE_IMAGES for xml matrix serialization
- DEBUG_SHOW_RESULT to see detection result
2012-11-07 03:19:05 +04:00
marina.kolpakova
ba27d89173
add feature rescaling according to Dollal's paper FPDW
2012-11-07 03:19:05 +04:00
marina.kolpakova
8d90b973b0
add detectAt to soft cascade
2012-11-07 03:19:05 +04:00
marina.kolpakova
801368ee82
refactoring
2012-11-07 03:19:05 +04:00
marina.kolpakova
6f53be4102
shrinking before integral calculation
2012-11-07 03:19:04 +04:00
marina.kolpakova
dc74ce20ab
OpenCV friendly xml format for soft cascade
2012-11-07 03:19:04 +04:00
marina.kolpakova
c04725b681
add apply cascade method
2012-11-07 03:19:04 +04:00
marina.kolpakova
695827050f
Integral images for ICF
2012-11-07 03:19:04 +04:00
marina.kolpakova
b0b85f36f6
add test for soft cascade detect method
2012-11-07 03:19:04 +04:00
marina.kolpakova
f01c5d9033
compute scales pyramid
2012-11-07 03:19:04 +04:00
marina.kolpakova
a54d456ad0
parse soft cascade from xml
2012-11-07 03:19:04 +04:00
marina.kolpakova
fe2c38be80
add method to fill soft cascade
2012-11-07 03:19:04 +04:00
marina.kolpakova
7290d8576d
add ICF feature
2012-11-07 03:19:04 +04:00
marina.kolpakova
fb113e5ce4
scale pyramid calculations
2012-11-07 03:19:04 +04:00
marina.kolpakova
9966d7feba
add structures for cascade representation
2012-11-07 03:19:04 +04:00
marina.kolpakova
108fd169f7
dummy soft cascade
2012-11-07 03:19:03 +04:00
Vladislav Vinogradov
beb377b38c
gpu implementation of Dual TV-L1 Optical Flow
2012-11-02 19:51:43 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Vadim Pisarevsky
9a08b7be45
fixed compile problem with the old Xcode (<4.5)
2012-11-02 15:29:16 +04:00
Andrey Kamaev
f2af0e7a57
Merge pull request #132 from taka-no-me/version-2.4.3
2012-11-02 14:31:30 +04:00
Andrey Kamaev
4ac5223afa
Merge pull request #131 from taka-no-me/tegra-fast
2012-11-02 14:31:02 +04:00
Andrey Kamaev
828faf4e68
Merge pull request #129 from cuda-geek/CCL-test-fix
2012-11-02 14:30:20 +04:00
Andrey Kamaev
63ee26adda
Merge pull request #127 from cuda-geek/apple2clang
2012-11-02 14:29:39 +04:00
Andrey Kamaev
4a2f626d85
Remove "-rc" suffix from version
2012-11-02 14:27:34 +04:00
Andrey Kamaev
dbb5a32453
Use Tegra version of cv::FAST
2012-11-02 13:16:16 +04:00
Vadim Pisarevsky
42471c082f
possibly fixed compile errors in GPU module on Windows
2012-11-02 12:03:25 +04:00
marina.kolpakova
97cab339d2
fix Connected Components Labeling test crash
2012-11-01 23:59:01 +04:00
Kirill Kornyakov
1c77f0abfe
Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator()
2012-11-01 22:28:46 +04:00
Kirill Kornyakov
2efd9b6ad7
Fixed a couple of minor issues in Javadocs
2012-11-01 22:28:46 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
LeonidBeynenson
02646427fb
Fixed arguments of the function calcOpticalFlowSF.
2012-11-01 19:31:45 +04:00
marina.kolpakova
5ce9965459
Merge pull request #125 from taka-no-me:perf_tests
2012-11-01 19:31:33 +04:00
marina.kolpakova
358fcbd5b6
Merge pull request #115 from asmorkalov:java_test_data_update
2012-11-01 19:29:18 +04:00
marina.kolpakova
09dec4e873
Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb
2012-11-01 19:26:30 +04:00
marina.kolpakova
334f6344dd
Merge pull request #120 from NikoKJ:ocl2.4.3
2012-11-01 19:16:22 +04:00
marina.kolpakova
9b92de9a88
Merge pull request #121 from branch asmorkalov:android_samples_fix
2012-11-01 19:11:53 +04:00
Vadim Pisarevsky
d9d4e8df6f
fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)
2012-11-01 16:37:39 +04:00
Andrey Kamaev
e3be5f138a
Fixed sanity checks in several performance tests
2012-11-01 16:29:30 +04:00
Alexander Smorkalov
34896529d5
Review comments applied.
2012-11-01 16:19:11 +04:00
Andrey Kamaev
fd4909360f
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
2012-11-01 12:44:10 +04:00
Andrey Kamaev
7267d518d5
Fix build in Visual Studio 2005
2012-11-01 12:42:51 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
Andrey Kamaev
74fe158f4b
Merge pull request #117 from vpisarev/doc_updates
2012-10-31 16:56:04 +04:00
Andrey Kamaev
3e10e057cb
Merge pull request #110 from vpisarev/test_fixes2
2012-10-31 16:52:50 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
NikoKJ
2045c85ad5
a minor bug fix for brute force
2012-10-31 16:01:56 +08:00
Vadim Pisarevsky
adc1d94e95
updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request
2012-10-30 15:25:46 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
08ff5f92f4
minor updates for doc redirections and tutorial images size
2012-10-30 15:06:13 +04:00
Alexander
b0106ca25e
Test data form features2d updated.
2012-10-30 15:05:09 +04:00
Andrey Kamaev
f3a158c862
Merge pull request #102 from NikoKJ/ocl4_2.43
2012-10-30 13:01:57 +04:00
NikoKJ
9ccdd17376
eliminate all the warnings on win32 and win64
...
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
2012-10-30 13:01:42 +04:00
Vadim Pisarevsky
63bd6f9adf
fixed compile errors in ocl tests; disabled a few problematic tests
2012-10-29 23:37:18 +04:00
marina.kolpakova
0f65dacb8b
Merge pull request #104 from AoD314:master
2012-10-29 15:12:52 +04:00
marina.kolpakova
e55b2f7d60
Merge pull request #99 from jet47:tvl1-opt-flow
2012-10-29 15:00:40 +04:00
morozov.andrey
e0cfc0ccf5
fixed bug with incorrect syntax in CommandLineParser
2012-10-26 19:46:17 +04:00
Andrey Kamaev
ad982f4ed6
Turn off video IO perf tests on Android
2012-10-26 17:00:31 +04:00
Andrey Kamaev
fcad269e53
Specify sanity threshold for WarpPerspective perf test
2012-10-26 17:00:31 +04:00
Andrey Kamaev
84934f7bfc
Fix SHORT data type support in Algorithm
...
* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages
2012-10-26 17:00:13 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
016b2cadb0
Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
...
Some code refactoring done.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
9217095955
Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.
2012-10-26 13:30:20 +04:00
Andrey Kamaev
729d76ad09
Merge branch '2.4'
2012-10-25 15:32:48 +04:00
Andrey Kamaev
bbb2d27add
Merge pull request #74 from taka-no-me/cl2cpp
2012-10-25 14:56:53 +04:00
Andrey Kamaev
63397e825c
Cleanup CMakeLists.txt of ocl module
2012-10-25 14:55:37 +04:00
Andrey Kamaev
42414b5689
Merge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4
2012-10-25 14:52:50 +04:00
Vladislav Vinogradov
8db5b7d7d4
fixed warnings under Windows
2012-10-25 13:28:30 +04:00
Vladislav Vinogradov
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
marina.kolpakova
772586801b
Merge pull request #87 from jet47:cmd-parser-fix
2012-10-25 00:40:50 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00