opencv

Commit Graph

Author	SHA1	Message	Date
Roman Donchenko	10340fe234	Merge pull request #949 from SpecLad:merge-2.4	12 years ago
Roman Donchenko	aa7f70c31e	Merge pull request #951 from apavlenko:fix_java_test_randshuffle	12 years ago
Roman Donchenko	0a42a3eb06	Merge pull request #956 from IanVS:COLOR_CODE	12 years ago
IanVS	41fc41829c	Updated documentation to new "COLOR_" format for color conversion enums.	12 years ago
Roman Donchenko	bae85660da	Merge remote-tracking branch 'origin/2.4' Pull requests: #943 from jet47:cuda-5.5-support #944 from jet47:cmake-2.8.11-cuda-fix #912 from SpecLad:contributing #934 from SpecLad:parallel-for #931 from jet47:gpu-test-fixes #932 from bitwangyaoyao:2.4_fixBFM #918 from bitwangyaoyao:2.4_samples #924 from pengx17:2.4_arithm_fix #925 from pengx17:2.4_canny_tmp_fix #927 from bitwangyaoyao:2.4_perf #930 from pengx17:2.4_haar_ext #928 from apavlenko:bugfix_3027 #920 from asmorkalov:android_move #910 from pengx17:2.4_oclgfft #913 from janm399:2.4 #916 from bitwangyaoyao:2.4_fixPyrLK #919 from abidrahmank:2.4 #923 from pengx17:2.4_macfix Conflicts: modules/calib3d/src/stereobm.cpp modules/features2d/src/detectors.cpp modules/gpu/src/error.cpp modules/gpu/src/precomp.hpp modules/imgproc/src/distransform.cpp modules/imgproc/src/morph.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/perf/precomp.cpp modules/ocl/perf/precomp.hpp modules/ocl/src/arithm.cpp modules/ocl/src/canny.cpp modules/ocl/src/filtering.cpp modules/ocl/src/haar.cpp modules/ocl/src/hog.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/pyrlk.cpp modules/video/src/bgfg_gaussmix2.cpp modules/video/src/lkpyramid.cpp platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh platforms/scripts/ABI_compat_generator.py samples/ocl/facedetect.cpp	12 years ago
Roman Donchenko	a760684674	Merge pull request #950 from apavlenko:fix_java_mat_dump	12 years ago
Andrey Pavlenko	c2d3ce9ce5	fix failing test small matrix becomes the same after shuffling	12 years ago
Andrey Pavlenko	c7873dd03d	fixing broken Mat::dump() in Java	12 years ago
Vadim Pisarevsky	6e119049ce	Merge pull request #945 from malcolmreynolds:master	12 years ago
Malcolm Reynolds	a9c9210bf9	update safe_call.hpp to fix OpenCL import on case sensitive mac FS On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.	12 years ago
Malcolm Reynolds	229ff632b6	update util.hpp to fix OpenCL import on case sensitive mac FS On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.	12 years ago
Roman Donchenko	75cf5cc4ee	Merge pull request #943 from jet47:cuda-5.5-support	12 years ago
Roman Donchenko	5237647f75	Merge pull request #944 from jet47:cmake-2.8.11-cuda-fix	12 years ago
Vladislav Vinogradov	bcf8bdb401	fixed constructors for functional objects (added __host__ modifier)	12 years ago
Vladislav Vinogradov	58e472754a	fixed norm diff function (it uses pre-allocated buffer now)	12 years ago
Vladislav Vinogradov	0521e8908c	fixed NPP error constants usage	12 years ago
Vladislav Vinogradov	09a7e86a39	fixed NPP library search (it was splitted)	12 years ago
Vladislav Vinogradov	013581f371	fixed GPU module compialtion with CMake 2.8.11 CMake 2.8.11 removed linkage with CUDA driver library, but it's used by gpu video encoding/decoding	12 years ago
Roman Donchenko	e9c298b784	Merge pull request #912 from SpecLad:contributing	12 years ago
Roman Donchenko	34c5f47f60	Merge pull request #934 from SpecLad:parallel-for	12 years ago
Roman Donchenko	85360572b0	Merge pull request #931 from jet47:gpu-test-fixes	12 years ago
Roman Donchenko	f90fd5b0da	Split CLAHE into its own file, because it's faster that way. Yes, it's as ludicrous as it sounds, but it's still true. Bizarrely, the previous commit makes CLAHE run about 10% slower on Android, even though it doesn't even touch any CLAHE code. Splitting it off fixes that, although the reason it does is a mystery for the ages. It's cleaner when it's in its own file, anyway. ;=]	12 years ago
Roman Donchenko	29b13ec1de	Replaced most of the usages of parallel_for with that of parallel_for_. This should allow many algorithms to take advantage of more parallelization technologies.	12 years ago
Vadim Pisarevsky	37091b086c	Merge pull request #932 from bitwangyaoyao:2.4_fixBFM	12 years ago
Vadim Pisarevsky	6bb9342a5f	Merge pull request #918 from bitwangyaoyao:2.4_samples	12 years ago
Vadim Pisarevsky	5a4efe8bcf	Merge pull request #924 from pengx17:2.4_arithm_fix	12 years ago
Vadim Pisarevsky	678371be39	Merge pull request #925 from pengx17:2.4_canny_tmp_fix	12 years ago
Vadim Pisarevsky	c176131a67	Merge pull request #927 from bitwangyaoyao:2.4_perf	12 years ago
Roman Donchenko	c3f5e73769	Merge pull request #930 from pengx17:2.4_haar_ext	12 years ago
yao	7ed9c0e87a	Fix brute_force_matcher's hung on some Intel CPU OCL	12 years ago
peng xiao	fd7ba355ee	Add non-stump based ocl Haar cascade classifier support. For example, haarcascade_frontalface_alt2.xml is now supported. Note that classifier's pattern of a cascade file must be consistent, i.e., all trees must either have two nodes or one node, otherwise unexpected results will occur. Other fixes: Test cases are updated. Some unused codes are removed. Fix some problems of haar when using OclCascadeClassifierBuf.	12 years ago
Vladislav Vinogradov	6b1c28ce6d	fixed some gpu tests (different rounding results due to float arithmetics)	12 years ago
Roman Donchenko	0ae40507e5	Merge pull request #928 from apavlenko:bugfix_3027	12 years ago
Roman Donchenko	fbb25787cd	Merge pull request #920 from asmorkalov:android_move	12 years ago
Roman Donchenko	d81d3fc830	Merge pull request #921 from SpecLad:merge-2.4	12 years ago
Roman Donchenko	b890274738	Merge pull request #910 from pengx17:2.4_oclgfft	12 years ago
peng xiao	006e4242b2	Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft	12 years ago
Andrey Pavlenko	e28f6fae49	fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF)	12 years ago
yao	a9b7ff41bd	adjust test cases	12 years ago
peng xiao	d015fa76fa	Fix 2.4 ocl Canny. This fix is a workaround for current 2.4 branch without introducing an additional oclMat buffer into CannyBuf object. Test case is cleaned up. Volatile keywords in kernels are removed for performance concern.	12 years ago
Vadim Pisarevsky	2ccdf56119	Merge pull request #913 from janm399:2.4	12 years ago
Vadim Pisarevsky	24ca620c32	Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK	12 years ago
Vadim Pisarevsky	d3c7ae6adf	Merge pull request #919 from abidrahmank:2.4	12 years ago
Vadim Pisarevsky	ecb1f3c4d2	Merge pull request #923 from pengx17:2.4_macfix	12 years ago
yao	d81c145fa9	fix memory leak	12 years ago
yao	14bd6402be	revise perf	12 years ago
peng xiao	1d0c283508	Fix a bug when pushing pointers of arguments into std::vector. When argument pointers pushed into an vector and the pointers point to address on stack, we need to make sure they are valid until kernels are successfully flushed onto the queue.	12 years ago
Alexander Smorkalov	f85cf5bdd9	Build fixes. Build scrips reorganized.	12 years ago
peng xiao	6fae02c05d	Fix some OpenCL kernel file build errors on Mac.	12 years ago
Roman Donchenko	7561b1c6e5	Replace the pull request guidelines with a link to the wiki. I've moved the contents of CONTRIBUTING.md to the wiki (and slightly expanded it), so the former is no longer required. I've put a link to the wiki page and a summary in the README.	12 years ago

1 2 3 4 5 ...

8541 Commits (10340fe2347fecc65d37d70310badfbd16ed2a35) All Branches Search

8541 Commits (10340fe2347fecc65d37d70310badfbd16ed2a35)

All Branches