Roman Donchenko
|
2d6f35d6ed
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
|
2013-08-27 19:15:47 +04:00 |
|
Kirill Kornyakov
|
030fa5673e
|
bugfix-for-3231
|
2013-08-23 12:34:35 +04:00 |
|
Roman Donchenko
|
f55740da70
|
Deleted all trailing whitespace.
|
2013-08-21 18:59:24 +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 |
|
Jin Ma
|
8fb6b689c6
|
1. Added OpenCL version of superres to the sample.
2. Modified according to the feedback of the community.
|
2013-08-16 16:31:31 +08:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Vladislav Vinogradov
|
9086efa8e9
|
fixed warnings
|
2013-04-02 13:24:00 +04:00 |
|
Andrey Kamaev
|
71e43852ce
|
Fix MSVC build issues
|
2013-04-01 15:24:34 +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 |
|