1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Commit Graph

244 Commits

Author SHA1 Message Date
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?
2013-06-20 15:18:35 +04:00
Roman Donchenko b581f27249 Made perf tests record module name, selected implementation and number of threads. 2013-06-19 17:55:42 +04:00
Roman Donchenko 936236e4b1 Extended the CPU/GPU selection mechanism in performance tests.
Now it allows choosing between arbitrary implementation variants.
2013-06-19 17:55:42 +04:00
Vladislav Vinogradov 4c9773d55f renamed gpu headers (made it more consistent) 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov 3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Roman Donchenko 7efb24917f Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex 2013-05-22 12:57:04 +04:00
Roman Donchenko 029fce10c9 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Leszek Swirski 0e8c2b0395 Fix visibility of g_linked_ptr_mutex on Windows
Reverts some changes in b8ed00bd64
2013-05-15 14:42:28 +01:00
Andrey Kamaev b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Pavlenko d5881bc00a adding version info to test log 2013-05-12 18:36:55 +04:00
Andrey Kamaev 416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov bc0e563092 CV_GPU_TEST_MAIN macros 2013-04-18 11:33:30 +04:00
Andrey Kamaev 8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
Andrey Kamaev 96b008cd29 Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
Andrey Kamaev 802d004bbb Fix build issues 2013-04-13 16:53:59 +04:00
Andrey Kamaev 9deea80b83 Update gtest to upstream r652
It is already marked as a gtest 1.7.0
2013-04-13 16:29:05 +04:00
Andrey Kamaev 517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev 71e43852ce Fix MSVC build issues 2013-04-01 15:24:34 +04:00
Andrey Kamaev 2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev 49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
marina.kolpakova 4096b54560 use static assertation where suitable 2013-03-25 00:29:12 +04:00
Vladislav Vinogradov f0b19d4659 updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
Andrey Kamaev 1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Andrey Kamaev 89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Vladislav Vinogradov abc9ef6809 moved utility functions from gpu_perf_test and gpu_test to ts module 2013-03-18 14:06:19 +04:00
Andrey Kamaev ad5cddc007 Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Vladislav Vinogradov ecb2ebfba4 Move opengl iterop code to cv::ogl namespace
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
cuda-geek 11dfceb2c9 Merge pull request #328 from jet47:new-gpu-fixes 2013-01-29 11:00:37 +04:00
Andrey Kamaev f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Vladislav Vinogradov b7e6b5af1b fixed tests (call resetDevice, if there was a gpu failure) 2013-01-23 21:05:04 +04:00
Andrey Pavlenko 81721d0dce enabling sanity checks for warp and resize functions on Android
- add syntetic images generation function to ts
- use generated syntetic images
2013-01-23 17:25:30 +04:00
marina.kolpakova 45191dd6a5 merge CUDA dev branch 2012-12-29 19:44:38 +04:00
Anatoly Baksheev be22891f71 added GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app) 2012-12-25 21:23:15 +04:00
Andrey Kamaev 13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +04:00
Vladislav Vinogradov 5138b7d209 Merge branch 'master' into cuda-dev 2012-12-24 13:48:33 +04:00
Andrey Kamaev 9944282b09 Fix build with STLPort from NDK r8d 2012-12-22 00:59:56 +04:00
Andrey Kamaev b6efec5f8b Add support for Android NDK r8d 2012-12-21 15:39:23 +04:00
Vladislav Vinogradov 660d23aa04 added cv::gpu::resetDevice to RunPerfTestBody 2012-12-20 15:33:04 +04:00
Andrey Kamaev b0d3830399 Update gtest to upstream r629 2012-12-05 03:02:37 +04:00
Andrey Kamaev 7267d518d5 Fix build in Visual Studio 2005 2012-11-01 12:42:51 +04:00
Andrey Kamaev 3ffe0f0117 Remove unused tbb::task_scheduler_init from perf tests 2012-10-15 16:25:06 +04:00
Kirill Kornyakov 84176fa027 Added perf test for warpPerpsective with large resolutions 2012-10-12 17:14:23 +04:00
marina.kolpakova 800cb9d0e6 allow gpu module write sanity data for GPU and CPU tests in one xml 2012-10-12 14:46:18 +04:00
Andrey Kamaev 97640847c5 Add methods to sort keypoints and corresponding descriptors 2012-10-11 18:25:45 +04:00
marina.kolpakova b28acfc12e add GPU module specific command line arguments 2012-10-10 16:13:25 +04:00
marina.kolpakova f5d6367ea1 GPU module performance tests are aligned with other OpenCV pefrofmance tests 2012-10-10 16:13:24 +04:00
Andrey Kamaev 39d6eb7312 Add sanity check support for vector<DMatch> 2012-10-09 19:17:58 +04:00
Andrey Kamaev 95b6a103b5 Add sanity checks support for vertor<KeyPoint> 2012-10-09 18:41:26 +04:00
Andrey Kamaev e2ff0ed1fb Add sanity checks to objdetect module perf tests 2012-10-09 15:28:51 +04:00