Roman Donchenko
90f8906e1e
Merge pull request #1690 from SpecLad:cmake-2.8.12
11 years ago
Roman Donchenko
c016c43d25
Fixed Android SDK build - again.
11 years ago
Andrey Pavlenko
2e5db6e56c
fixing typo
11 years ago
Andrey Pavlenko
2b6fca68bf
fixing typo
11 years ago
Roman Donchenko
55ede74022
Merge pull request #1680 from alalek:cmake_fix_android_builds
11 years ago
Ilya Lavrenov
e1596d69cc
fixed extrapolation in ocl::adaptiveBilateralFilter
11 years ago
Alexander Alekhin
7a8f9fe746
cmake: fix android installation for different NDK ABIs
11 years ago
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
11 years ago
Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.
Also modified some gpu sources in a similar manner.
11 years ago
peng xiao
68a8a11161
Rewrite distanceToCenters.
...
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
of double.
NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added
added ROI support in accuracy test of distanceToCenters
11 years ago
Roman Donchenko
1188894133
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
11 years ago
Roman Donchenko
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
)
11 years ago
Roman Donchenko
5a5d569d72
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
(cherry picked from commit 424a7b0ab0
)
Conflicts:
modules/highgui/test/test_ffmpeg.cpp
11 years ago
Roman Donchenko
260c2e0b08
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
(cherry picked from commit 3f3ae33327
)
11 years ago
Roman Donchenko
d3af86c0ea
Added the missing setting of HAVE_FFMPEG to true on Windows.
...
While the FFmpeg video IO backend gets compiled even without it,
the tests (for both FFmpeg and video IO) don't. This should fix
that.
11 years ago
Roman Donchenko
76b904b022
Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES.
...
The reasons for that are twofold:
1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023
Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022
I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)
I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
11 years ago
Roman Donchenko
e1c8f5d723
Removed a stray comma in the Android toolchain file.
...
It was actually acting as an additional argument, breaking the error message.
11 years ago
Ilya Lavrenov
9ea6001d08
enabled ocl::bilateralFilter ROI testing
11 years ago
Andrey Pavlenko
f177e65871
Merge pull request #1683 from alalek:ocl_restore_showdiff
11 years ago
yao
dd0fa63ca8
fix the bug of ocl::bruteForceMatcher
11 years ago
Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
11 years ago
Roman Donchenko
496859a944
Merge pull request #1643 from alalek:cmake_fix_java_link_rules
11 years ago
Roman Donchenko
7804240528
Merge pull request #1679 from ilya-lavrenov:ocl_equalizeHist
11 years ago
Alexander Alekhin
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
11 years ago
Roman Donchenko
f51e490bad
Fixed a Wmissing-declarations warning when compiling with MinGW.
11 years ago
Vladislav Vinogradov
e5947f581a
fix CUDA 5.5 support (npp, arm cross compilation) in CMake scripts:
...
The patch was submitted to CMake and might be available
in the next CMake release.
But until we have the fix in CMake we should add workaround in our scripts.
11 years ago
Roman Donchenko
f0bc253d0e
Merge pull request #1667 from SpecLad:detect-openmp
11 years ago
Roman Donchenko
119cdc57e9
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
11 years ago
Ilya Lavrenov
dab3000778
fixed bug in ocl::equalizeHist
11 years ago
Roman Donchenko
c7408003d2
Merge pull request #1678 from wejeus:ios-documentationfix-2.4
11 years ago
Roman Donchenko
f5bd8fecc9
Merge pull request #1674 from alalek:cmake_fix
11 years ago
Samuel Wejéus
eddaaa9643
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
11 years ago
Andrey Pavlenko
2279c209c8
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
11 years ago
Andrey Pavlenko
931a2ae14f
Merge pull request #1673 from ilya-lavrenov:ocl_norm
11 years ago
Andrey Pavlenko
e7f39eb46e
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
11 years ago
Andrey Pavlenko
4cf598a862
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
11 years ago
Peng Xiao
4b712eeded
Update imgproc_canny.cl
...
Reordering condition checking.
11 years ago
Alexander Alekhin
133d889e33
ocl: show diff
11 years ago
konstantin
9f0995fbe0
try to made compatible with mac
11 years ago
Ilya Lavrenov
5864895ec6
fixed ocl::copyMakeBorder
11 years ago
konstantin
ebb2c3e01f
try to fix build error
11 years ago
Ilya Lavrenov
7c1443cbdd
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
11 years ago
konstantin
2f62940a0e
Added few opencl optimizations (as Intel platform codepath):
...
1. HaarDetetctor: repack nodes to reduce memory footprint
2. cornerMinEigVal: 4 ocl kernels are fused into 1 for sobel calculation
11 years ago
Alexander Alekhin
d571b28eaa
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
11 years ago
Ilya Lavrenov
29499ed51a
moved to relative errors in ocl::norm tests
11 years ago
Ilya Lavrenov
87fc3441f2
workaround for cv::multiply bug
11 years ago
Roman Donchenko
6dda2652cd
Merge pull request #1659 from ilya-lavrenov:ocl_examples
11 years ago
Roman Donchenko
bb461fab34
Merge pull request #1649 from asandwhich:2.4
11 years ago
Roman Donchenko
a549621aac
Merge pull request #1666 from SpecLad:cv-cap-openni
11 years ago
Roman Donchenko
f82eb0f79c
Add better OpenMP detection and make an option to enable it.
...
Bug report and inspiration: http://code.opencv.org/issues/3328
11 years ago