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
4037a4f227
Fixed OpenCV_LIBS when find_package has been used with explicit components.
...
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/ >.
11 years ago
Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
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
Roman Donchenko
5c77784ac9
Merge pull request #1827 from asmorkalov:android_ndk_r9b
11 years ago
Roman Donchenko
0a90a36a1f
Merge pull request #1793 from SpecLad:external-docs-1
11 years ago
Roman Donchenko
c47190ef90
Merge pull request #1787 from hs3180:2.4
11 years ago
Ilya Lavrenov
198cd1a40d
added area fast mode to ocl::resize
11 years ago
Roman Donchenko
4746a710bb
Merge pull request #1820 from asmorkalov:android_native_camera_44
11 years ago
Roman Donchenko
3e55d705cc
Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum
11 years ago
Roman Donchenko
56f791679b
Merge pull request #1825 from jet47:fix-opengl-mem-leak
11 years ago
Roman Donchenko
68d1110cde
Merge pull request #1821 from SpecLad:watch-your-slashes
11 years ago
Alexander Smorkalov
e08b075db0
Android NDK r9b support added.
11 years ago
Vladislav Vinogradov
66221a32b9
fixed memory leak in ogl::Texture2D
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
Ilya Lavrenov
c0456df611
workaround for ocl::absSum (eliminated error: unreachable executed)
11 years ago
Roman Donchenko
85f92fabbd
Merge pull request #1815 from asmorkalov:android_native_camera_build_automation
11 years ago
Roman Donchenko
239704f986
Added Visual Studio 2013 detection.
11 years ago
Roman Donchenko
7973594a01
Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}.
...
If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty,
then the resulting path becomes absolute.
Fixes <http://code.opencv.org/issues/3350 >.
11 years ago
Ilya Lavrenov
f70d63e4c9
added INTER_AREA interpolation to ocl::resize
11 years ago
Alexander Smorkalov
26d3a1a036
Prebuilt libnative_camera_xxx updated.
11 years ago
Roman Donchenko
bb4bf7a1f9
Merge pull request #1811 from Nerei:fixed_some_build_errors
11 years ago
Alexander Smorkalov
04d293d2c4
Initial NativeCamera support for Android 4.4 KitKat.
11 years ago
Roman Donchenko
cdf4e4e0b5
Merge pull request #1810 from Nerei:2.4
11 years ago
Alexander Smorkalov
e3f450cffb
NativeCamera build with AndroidStub backported from OpenCV master.
11 years ago
Roman Donchenko
8b99a1e850
Merge pull request #1806 from akarsakov:ffmpeg_without_iconv
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
Alexander Karsakov
83cefcb92a
FFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options: --enable-w32threads --disable-iconv --cpu=i686 (workaroud for http://trac.ffmpeg.org/ticket/2363 )
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
Anatoly Baksheev
13bb236ad5
fixed some warnings
11 years ago
Anatoly Baksheev
8f6f9c3e58
compilation for VS2008
11 years ago