Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
11 years ago
Leszek Swirski
6e4fb8f275
Replace $(Configuration) with $<CONFIGURATION>
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
Vadim Pisarevsky
b1aa4a4913
yet another attempt to fix test failures
11 years ago
Vadim Pisarevsky
e14171fd33
fixed crash in Python bindings
11 years ago
Roman Donchenko
7e1ded0ebd
Merge pull request #1664 from SpecLad:merge-2.4
11 years ago
Vadim Pisarevsky
a9065b7d0c
trying to fix failures in tests
11 years ago
Vadim Pisarevsky
303df78cca
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
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
Roman Donchenko
dfe07df87b
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.
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
424a7b0ab0
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
11 years ago
Roman Donchenko
3f3ae33327
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
This should actually remove the need for the workaround from
the previous commit.
11 years ago
Roman Donchenko
eb86d37b26
Removed some dubious FFmpeg hack that no longer works.
11 years ago
Roman Donchenko
66beb44286
Applied a change from 555c505b
to 3rdparty/tbb/CMakeLists.txt.
...
Odd that it wasn't merged automatically...
11 years ago
Roman Donchenko
6dda2652cd
Merge pull request #1659 from ilya-lavrenov:ocl_examples
11 years ago
Vadim Pisarevsky
5a34272150
fixed build on Windows
11 years ago
Vadim Pisarevsky
de521fc9fa
fixed some more compile bugs (including Python bindings)
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
Vadim Pisarevsky
d3076c5014
hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors
11 years ago
Roman Donchenko
e384a7bb95
Merge pull request #1665 from SpecLad:cuda-min-ver
11 years ago
Roman Donchenko
779acfa715
Suppressed -Wundef in bioinspired, because of OpenCL headers.
11 years ago
Roman Donchenko
8ff267cbac
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
...
Bug report: http://code.opencv.org/issues/3329
11 years ago
Roman Donchenko
49c6533227
Move the minimal CUDA version into the minimal version list.
11 years ago
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
11 years ago
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
11 years ago