Vadim Pisarevsky
20aaa8fe77
Merge pull request #2560 from akarsakov:gaussianblur_integer
11 years ago
Vadim Pisarevsky
92db6786a9
Merge pull request #2578 from akrynski:patch-1
11 years ago
Vadim Pisarevsky
4eede18027
Merge pull request #2606 from alalek:icv_downloader
11 years ago
Vadim Pisarevsky
9cdd15e141
Merge pull request #2615 from krodyush:pullreq/140319-PyrLKOpticalFlow-fix
11 years ago
Roman Donchenko
534f9623f2
Merge pull request #2616 from SpecLad:merge-2.4
11 years ago
Elena Gvozdeva
3553e9379b
fixed
11 years ago
unknown
36d33dd6c2
Review comments
11 years ago
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
11 years ago
Andrey Pavlenko
8176e893c0
Merge pull request #2609 from alalek:tests_fixes
11 years ago
Andrey Pavlenko
5ff59af09d
Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor
11 years ago
Andrey Pavlenko
f4c5679db8
Merge pull request #2614 from ilya-lavrenov:ipp_laplacian
11 years ago
Alexander Karsakov
53bc93730c
Added suppressing deprecation for ippiMulC_32f_C1IR
11 years ago
Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
11 years ago
Ilya Lavrenov
884b706b3a
fixed warning
11 years ago
Ilya Lavrenov
ad7f2311c0
cv::Laplacian
11 years ago
Ilya Lavrenov
2a051a124f
cvtColor
11 years ago
Andrey Pavlenko
5522c14efc
Merge pull request #2607 from ilya-lavrenov:warn_sup
11 years ago
krodyush
57992e0169
replace IPatchLocal[][] into *IPatchLocal to fix compilation error on some devices.
11 years ago
Tony
fd5e180657
Rebase branch gtk3
11 years ago
Tony
265148b974
Correction to enable compilation on platform with only GTK2 libs
...
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
11 years ago
Tony
cb4fffc72a
Fix logic error in OpenCVFindLibsGUI.cmake
...
When with_gtk is selected but GTK3 is not present the current logic
fails to check for GTK2. This edit corrects this.
11 years ago
Tony
c0dbc083ea
Correct error with GTK3 not found selection
...
When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
version requirements) is present.
Selection logic for printing 'GTK: No' when the libraries are not found
has also been removed so the message is printed when GTK is not found or
selected in common with other libraries.
Changes committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
11 years ago
Tony
65f63421fa
Change quotes around GTK headers for angle brackets
...
The linux buildbots have started to fail compilation due to not
finding the gtk headers. The quotes have been changed to angle brackets
to indicate to the compiler that these are system includes.
11 years ago
Tony
a28ad40c2a
Fix bug in GTK+3 logic introduced by previous merge
...
During merging of conflicting versions of this file, I erroneously
deleted several lines in the GUI reporting section. This is repaired
in this commit.
11 years ago
Tony
f318b5bc9d
Improve GTK+ library selection logic.
...
The new logic will select GTK+3 by default if WITH_GTK is selected. If
the GTK+3 libraries are not found, then GTK+2 libraries will be selected
if found.
This can be overridden by using WITH_GTK_2_X to force selection of GTK+2
(if found).
11 years ago
Tony
1638341270
Use GTK_VERSION_MAJOR to switch between GTK+ version two and three
...
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.
The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
modified: cmake/templates/cvconfig.h.in
modified: modules/highgui/src/window.cpp
modified: modules/highgui/src/window_gtk.cpp
11 years ago
Tony
befdef9685
Merge remote-tracking branch 'upstream/master'
...
Rebase to lates upstream
11 years ago
Tony
512cb4fced
Correction to enable compilation on platform with only GTK2 libs
...
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
11 years ago
unknown
d2b4ee1e9b
More intendation fixes
11 years ago
unknown
06df383675
Indent fixes
11 years ago
Alexander Alekhin
3a1a3da782
fix tests
11 years ago
Andrey Pavlenko
f104d5be8c
Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist
11 years ago
Andrey Pavlenko
fd90efc9dd
Merge pull request #2593 from arkunze:pullreq/140319-color
11 years ago
Alexander Alekhin
047d285b7d
ICV: added package downloader
11 years ago
Roman Donchenko
df8e28283f
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
11 years ago
Roman Donchenko
4c2db3d6e7
Merge pull request #2579 from maksqwe:test_operations_fix
11 years ago
Roman Donchenko
8ab224746b
Merge pull request #2603 from maksqwe:unused_fix_2.4
11 years ago
Ilya Lavrenov
19d470749b
added macro for denoting region for suppression of "Wdeprecated-declarations"
11 years ago
Andrey Pavlenko
925178749a
removing `SuppressWarning` and `CV_OPENCL_RUN`
11 years ago
Alexander Alekhin
3578f0afe9
ocl: workaround for synchronization issue in ::map()
11 years ago
Alexander Alekhin
588658d1a3
tapi: stitching: fix documentation
11 years ago
Alexander Alekhin
026b13b3db
TAPI: stitching: blender: fix OpenCL path & adjust test condition
11 years ago
Alexander Alekhin
e6cc1be7e8
stitching: allow to use dynamic DescriptorMatcher
11 years ago
Alexander Alekhin
06738468af
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
11 years ago
Alexander Alekhin
c22d92c1cb
stitching: extend logging
11 years ago
Alexander Alekhin
a7f69a37e3
stitching: use BORDER_CONSTANT in warp
11 years ago
Alexander Alekhin
c4a31a1ab1
TAPI: stitching: optimize compare operation
11 years ago
Alexander Alekhin
7a5c1babde
TAPI: stitching: optimize exposure
11 years ago
Alexander Alekhin
2737e3c99b
TAPI: stitching: workaround for problem getUMat() call
11 years ago
Alexander Alekhin
c1ea6f3c42
TAPI: stitching: improve warpers
11 years ago