Roman Donchenko
|
93f757f8a2
|
Boring changes - superres.
|
2013-09-05 19:02:58 +04:00 |
|
Roman Donchenko
|
beada19ad0
|
Merge pull request #1297 from SpecLad:merge-2.4
|
2013-08-20 14:10:22 +04:00 |
|
Roman Donchenko
|
f76dd99299
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
|
2013-08-19 19:02:36 +04:00 |
|
Vladislav Vinogradov
|
9f33de7071
|
added cvconfig.hpp header file to gpu tests
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
|
2013-08-19 12:46:57 +04:00 |
|
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.
|
2013-08-08 12:43:07 +04:00 |
|
Andrey Pavlenko
|
f7ce70f70a
|
Merge pull request #1110 from SpecLad:config-cleanup
|
2013-07-30 17:39:35 +04:00 |
|
Roman Donchenko
|
feaa12a274
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
|
2013-07-16 11:52:41 +04:00 |
|
Roman Donchenko
|
ac39bfb4cc
|
Remove HAVE_CVCONFIG_H - it's always defined.
|
2013-07-10 16:02:07 +04:00 |
|
peng xiao
|
9b3c318e85
|
Add super resolution's OpenCL implementation.
Accuracy and performance tests are also provided.
|
2013-06-26 08:43:23 +08:00 |
|
Vladislav Vinogradov
|
3eeaa9189c
|
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
|
2013-06-07 13:05:39 +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
|
033dd77504
|
superres module fixes
|
2013-04-18 12:36:11 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
f77a375354
|
Merge branch '2.4'
|
2013-03-29 19:38:35 +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 |
|
Vladislav Vinogradov
|
7a0d6f7733
|
Super Resolution module
|
2013-02-27 13:41:15 +04:00 |
|