opencv

Commit Graph

Author	SHA1	Message	Date
Maksim Shabunin	f49936a849	Fixed cmake and build issues when using Visual Studio 2015	9 years ago
Vicente Olivert Riera	23bf3e337a	superres: Fix return value VideoFrameSource_GPU superres module fails to compile with the following error messages: [100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o /opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)': /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int)operator new(4ul)' from 'int' to 'cv::Ptr<cv::superres::FrameSource>' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope /opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: some warnings being treated as errors make[3]: * [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1 make[3]: * Waiting for unfinished jobs.... This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object. (cherry picked from commit `2e393ab833`)	10 years ago
Maksim Shabunin	91e21847e2	Some changes to make migration to 3.0 easier	10 years ago
Roman Donchenko	13d67b6ae7	Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp This is actually the same warning that the suppression at the bottom suppresses, but that one doesn't suppress it when using a native compiler (go figure). I remove the forced inclusion of precompiled headers into all sources, since otherwise this workaround doesn't work - the header with the warning is included before I can use a pragma.	10 years ago
Vicente Olivert Riera	2e393ab833	superres: Fix return value VideoFrameSource_GPU superres module fails to compile with the following error messages: [100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o /opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)': /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int)operator new(4ul)' from 'int' to 'cv::Ptr<cv::superres::FrameSource>' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource' /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope /opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: some warnings being treated as errors make[3]: * [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1 make[3]: * Waiting for unfinished jobs.... This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.	10 years ago
Alexander Smorkalov	ca40a749b6	Turn off superres accuracy tests if video i/o is not supported.	10 years ago
Maksim Shabunin	e88a36621e	Fixed warning during cross compile for ARM	10 years ago
Alexander Alekhin	b1ac35e14a	ocl: fix mac and superres test	11 years ago
Alexander Smorkalov	b4e4f13f9e	Superres module enabled for Android. GPU samples build fixed for Android.	11 years ago
Alexander Smorkalov	b3e18d23a3	Implicit CUDA and OpenCL control for module definition added. Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.	11 years ago
Vladislav Vinogradov	8b8c368148	fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)	11 years ago
Ilya Lavrenov	6b9ebcbf3d	deleted extra semicolons	11 years ago
Alexander Smorkalov	6da7c50fb5	Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.	11 years ago
Roman Donchenko	d07e7897a0	Fixed building with OpenCL, but without the ocl module. HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not necessary.	11 years ago
Andrey Pavlenko	2b6fca68bf	fixing typo	11 years ago
peng xiao	7285341083	1. Let btvRegWeights to be constant per `process` call. 2. Let Farneback to be the default optical flow method. 3. Fix a timing method bug for ocl path. 4. Remove useless finish operation in farneback 5. Refactor buffer usage.	11 years ago
Alexander Alekhin	b00f79ac5f	ocl: move program names into opencl_kernels.hpp	11 years ago
Alexander Alekhin	e8d9ed8955	ocl: split initialization.cpp into 3 files: context, operations, programcache	11 years ago
Roman Donchenko	e9a28f66ee	Normalized file endings.	11 years ago
Roman Donchenko	f55740da70	Deleted all trailing whitespace.	11 years ago
Roman Donchenko	d9f71b762f	Deleted almost all of the precomp.cpp files. Looks like we don't actually use them; when creating precompiled headers with Visual C++, a dummy .cpp is created at build time.	12 years ago
Jin Ma	027b8021b1	Added farneback to superres module.	12 years ago
Roman Donchenko	523048f99f	Fixed a compilation error (get<N> not found).	12 years ago
Roman Donchenko	ac39bfb4cc	Remove HAVE_CVCONFIG_H - it's always defined.	12 years ago
peng xiao	30239ad58e	Fix build error.	12 years ago
peng xiao	9b3c318e85	Add super resolution's OpenCL implementation. Accuracy and performance tests are also provided.	12 years ago
Roman Donchenko	3ea4836a0a	Changed the impls argument to be an array name. Turns out, you can't use preprocessor directives inside macro arguments. Who'd have thought?	12 years ago
Roman Donchenko	51a672ec40	Disabled the cuda variant when CUDA is not available.	12 years ago
Roman Donchenko	936236e4b1	Extended the CPU/GPU selection mechanism in performance tests. Now it allows choosing between arbitrary implementation variants.	12 years ago
Roman Donchenko	e8721f1f6f	Automatically add CUDA support to a module if it has CUDA sources. Backport from master.	12 years ago
Vladislav Vinogradov	870563ba25	fixed compilation warning for CUDA files command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]	12 years ago
Vladislav Vinogradov	4dbd0f0e8f	fixed compilation issues with gpu modules: * disabled warnings from thrust * fixed warnings from ts_gtest.h * possibly fixed superres compilation in Debug mode on Windows	12 years ago
Vladislav Vinogradov	f0b19d4659	updated license header in whole gpu module	12 years ago
Vladislav Vinogradov	0a65f2f4af	merged gpunonfree and nonfree module	12 years ago
Vladislav Vinogradov	abc9ef6809	moved utility functions from gpu_perf_test and gpu_test to ts module	12 years ago
Vladislav Vinogradov	7a0d6f7733	Super Resolution module	12 years ago

38 Commits (25b4d8a1b5a5a1f90f5006999766fdbd12250ce9)