Andrey Pavlenko
9bf2516eb1
Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
11 years ago
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
11 years ago
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
11 years ago
Roman Donchenko
3703c7040a
Merge pull request #1828 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
95006af170
Merge pull request #1816 from SpecLad:no-more-epoch
11 years ago
Roman Donchenko
63b3db53d7
Merge pull request #1830 from SpecLad:config-includes
11 years ago
Vadim Pisarevsky
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
11 years ago
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
11 years ago
Roman Donchenko
ef27ac3782
In the example in OpenCVConfig.cmake.in, explicitly add the include paths.
...
After #1801 , the include directories are no longer added automatically,
so we should show the user how to do that.
11 years ago
Roman Donchenko
7f935717cb
In OpenCVConfig.cmake.in, lowercased the commands in the example.
...
This is the preferred style nowadays, and more consistent with the
rest of the code.
11 years ago
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
11 years ago
Vadim Pisarevsky
d0b3c7a518
added some diagnostic into Tonemap test
11 years ago
Vadim Pisarevsky
8c44995ea6
another attempt to fix compile errors
11 years ago
Vadim Pisarevsky
241002384c
fixed some more compile errors
11 years ago
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
11 years ago
Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
11 years ago
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
11 years ago
Roman Donchenko
bb4bf7a1f9
Merge pull request #1811 from Nerei:fixed_some_build_errors
11 years ago
Roman Donchenko
7703b63cae
Merge pull request #1722 from StevenPuttemans:feature_1631_second
11 years ago
Roman Donchenko
4fd1960425
Merge pull request #1807 from KonstantinMatskevich:intel_bug
11 years ago
Roman Donchenko
3f927abb4d
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
11 years ago
Konstantin Matskevich
327d9f274b
fixed Split for device version equals 78712
11 years ago
Konstantin Matskevich
0e1717c14c
fixing bugs for Intel platform CPU device
11 years ago
Roman Donchenko
f5ded41016
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
11 years ago
StevenPuttemans
2b106db02f
Applied all fixes related to translating C to C++ code
...
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
11 years ago
Anatoly Baksheev
9e3a29701e
Viz code beautification
11 years ago
Anatoly Baksheev
efcc341219
added viz tutorial 3 test
11 years ago
Anatoly Baksheev
e154bce259
fixed compilation for vs2008
11 years ago
Anatoly Baksheev
d8600d3d13
fixed all Viz warnings
...
moved some headers to precomp.hpp
11 years ago
Anatoly Baksheev
5c6248005a
fixed warnings
11 years ago
Anatoly Baksheev
dfef42f94e
Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.
11 years ago
Anatoly Baksheev
0dad070473
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
11 years ago
Anatoly Baksheev
d275e29ea4
compilation & warnings
11 years ago
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
11 years ago
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
11 years ago
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
11 years ago
Roman Donchenko
f95ff0a352
Merge pull request #1802 from SpecLad:cmake-templates
11 years ago
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
11 years ago
Roman Donchenko
b8c46f4cce
Merge pull request #1804 from alekcac:youtube_link_fix
11 years ago
Roman Donchenko
bb0d88cf6f
Merge pull request #1801 from vrabaud:master
11 years ago
Roman Donchenko
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
11 years ago
Alexander Shishkov
4c9a6bd4ec
Update widget_pose.rst
...
changed Youtube link to our channel
11 years ago
Roman Donchenko
428fb72625
Made the generated file templates' naming more consistent.
...
The general convention is <output file name> + ".in".
11 years ago
Vincent Rabaud
154d119e13
do not use include_directories when calling find_package(OpenCV)
...
This is something that should be left to the user, that's the whole
point of OpenCV_INCLUDE_DIRS.
11 years ago
Roman Donchenko
3b7acf2657
Fix building with FFmpeg 0.8.
...
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
11 years ago
Roman Donchenko
01f8645bc8
Merge pull request #1794 from vrabaud:2.4
11 years ago
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
11 years ago
Roman Donchenko
84da6ca265
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
11 years ago
Roman Donchenko
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
11 years ago
Vincent Rabaud
8e944cfe70
cleaner fix
11 years ago