Roman Donchenko
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
aa96d8d053
Fix the name of perf tests' precompiled header.
11 years ago
Roman Donchenko
adc1dd2799
Merge pull request #1301 from asmorkalov:java_video_capture_fix
11 years ago
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
11 years ago
Alexander Smorkalov
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
11 years ago
Vladislav Vinogradov
cd2b7448f4
eliminate unnecessary double arithmetics in CUDA
11 years ago
Roman Donchenko
abf372d759
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
11 years ago
Roman Donchenko
0b270e2b08
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
11 years ago
Roman Donchenko
3fc1885f48
Merge pull request #1294 from jet47:gpu-tests-fix
11 years ago
Roman Donchenko
70fffa48e5
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
11 years ago
Vladislav Vinogradov
7bda6992e5
fixed gpu BGR <-> YUV color conversion
11 years ago
Vladislav Vinogradov
9f33de7071
added cvconfig.hpp header file to gpu tests
...
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
11 years ago
Roman Donchenko
bed3512dd5
Merge pull request #1288 from nghiaho12:haar
11 years ago
Roman Donchenko
473ca0849d
Merge pull request #1285 from SpecLad:enum-compare
11 years ago
Vladislav Vinogradov
cfbd791465
fixed gpu cvtColor for BGR <-> YUV
11 years ago
Nghia Ho
c6858c3fb0
Buffer is accessed out of bounds.
11 years ago
Roman Donchenko
449b99a6d7
Merge pull request #1286 from SpecLad:optflow-sf-init
11 years ago
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
11 years ago
Bahram Dahi
230bc03d97
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
11 years ago
Roman Donchenko
e8f85903c5
Merge pull request #1280 from asmorkalov:winrt_detect_fix
11 years ago
Roman Donchenko
2349f7ea89
Merge pull request #1257 from SpecLad:merge-2.4
11 years ago
Alexander Smorkalov
ddbeac503c
WindowsRT availability check reorganized. Build script updated.
11 years ago
Roman Donchenko
5ca1b559a8
Merge pull request #1284 from melody-rain:superres_example_2
11 years ago
Roman Donchenko
7d768d2159
In calcOpticalFlowSF, fixed several uninitialized uses of matrices.
...
This should fix that pesky test failure that pops up from time to time.
I don't actually know if the default values should be zeros, but the tests
pass, so...
11 years ago
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
11 years ago
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
11 years ago
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
11 years ago
Roman Donchenko
2304a561ca
Fixed a -Wenum-compare warning in cudev.
11 years ago
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
11 years ago
Jin Ma
8fb6b689c6
1. Added OpenCL version of superres to the sample.
...
2. Modified according to the feedback of the community.
11 years ago
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
11 years ago
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
11 years ago
Roman Donchenko
35cb59bb22
Merge pull request #1258 from apavlenko:java_video_capture
11 years ago
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
11 years ago
Roman Donchenko
95143fdc13
Merge pull request #1275 from rdm12:bug_1922
11 years ago
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
11 years ago
Dmitry Retinskiy
ab8c0fde52
applied comments after review
11 years ago
Roman Donchenko
73c5069f54
Merge pull request #1276 from nghiaho12:mushroom
11 years ago
Roman Donchenko
556028eff5
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
11 years ago
Bahram Dahi
83e21568ee
Minor bug fix, missing const in method signature
11 years ago
Bahram Dahi
6cf9070b9a
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
11 years ago
kamjagin
ed29d91d42
adding std to cstdint typedef of uint32_t
11 years ago
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
11 years ago
Roman Donchenko
d09c89c63e
Merge pull request #1265 from abidrahmank:misc_docs2
11 years ago
Roman Donchenko
7b95bb20f7
Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4
11 years ago
Roman Donchenko
902aa309f8
Merge pull request #1270 from rdm12:bugfix_3094
11 years ago
Dmitry Retinskiy
f013baf739
bug #1922 : restored most of the class definitions in basic_structures.rst
11 years ago
Nghia Ho
21641d04a7
Fixed mismatching allocation and deallocation: el_ptr
11 years ago
Roman Donchenko
6ae9870de4
Merge pull request #1254 from pengx17:2.4_filter2d_
11 years ago
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
11 years ago