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
Roman Donchenko
bed3512dd5
Merge pull request #1288 from nghiaho12:haar
2013-08-19 12:04:24 +04:00
Roman Donchenko
473ca0849d
Merge pull request #1285 from SpecLad:enum-compare
2013-08-19 12:00:18 +04:00
Nghia Ho
c6858c3fb0
Buffer is accessed out of bounds.
2013-08-17 20:32:13 +10:00
Roman Donchenko
449b99a6d7
Merge pull request #1286 from SpecLad:optflow-sf-init
2013-08-16 19:59:26 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Bahram Dahi
230bc03d97
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
2013-08-16 08:14:32 -07:00
Roman Donchenko
e8f85903c5
Merge pull request #1280 from asmorkalov:winrt_detect_fix
2013-08-16 19:03:45 +04:00
Roman Donchenko
2349f7ea89
Merge pull request #1257 from SpecLad:merge-2.4
2013-08-16 18:42:18 +04:00
Alexander Smorkalov
ddbeac503c
WindowsRT availability check reorganized. Build script updated.
2013-08-16 05:22:54 -07:00
Roman Donchenko
5ca1b559a8
Merge pull request #1284 from melody-rain:superres_example_2
2013-08-16 16:07:41 +04:00
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...
2013-08-16 14:43:18 +04:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
2013-08-16 13:58:14 +04:00
Roman Donchenko
2304a561ca
Fixed a -Wenum-compare warning in cudev.
2013-08-16 13:53:37 +04:00
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
2013-08-16 12:52:48 +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
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
2013-08-16 12:22:18 +04:00
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
2013-08-16 12:10:07 +04:00
Roman Donchenko
35cb59bb22
Merge pull request #1258 from apavlenko:java_video_capture
2013-08-16 12:05:13 +04:00
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
2013-08-15 23:49:32 +04:00
Roman Donchenko
95143fdc13
Merge pull request #1275 from rdm12:bug_1922
2013-08-15 19:12:23 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52
applied comments after review
2013-08-15 16:18:01 +04:00
Roman Donchenko
73c5069f54
Merge pull request #1276 from nghiaho12:mushroom
2013-08-15 12:05:02 +04:00
Roman Donchenko
556028eff5
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
2013-08-15 11:54:55 +04:00
Bahram Dahi
83e21568ee
Minor bug fix, missing const in method signature
2013-08-14 15:54:13 -07:00
Bahram Dahi
6cf9070b9a
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
2013-08-14 15:08:34 -07:00
kamjagin
ed29d91d42
adding std to cstdint typedef of uint32_t
2013-08-14 17:16:52 +02:00
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
2013-08-14 17:16:52 +02:00
Roman Donchenko
d09c89c63e
Merge pull request #1265 from abidrahmank:misc_docs2
2013-08-14 19:03:45 +04:00
Roman Donchenko
7b95bb20f7
Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4
2013-08-14 18:50:26 +04:00
Roman Donchenko
902aa309f8
Merge pull request #1270 from rdm12:bugfix_3094
2013-08-14 18:49:38 +04:00
Dmitry Retinskiy
f013baf739
bug #1922 : restored most of the class definitions in basic_structures.rst
2013-08-14 17:37:59 +04:00
Nghia Ho
21641d04a7
Fixed mismatching allocation and deallocation: el_ptr
2013-08-14 23:36:29 +10:00
Roman Donchenko
6ae9870de4
Merge pull request #1254 from pengx17:2.4_filter2d_
2013-08-14 17:27:18 +04:00
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
2013-08-14 17:25:01 +04:00
kamjagin
69287c936b
missed # in if defined
2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926
added HAVE_QTKIT to tests
2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
Dmitry Retinskiy
4eb85189e5
bug #3094 : added CV_Assert to PyrDown_ to check if source matrix is not empty
2013-08-14 15:30:35 +04:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Roman Donchenko
bcba3fc6b8
Merge pull request #1263 from abidrahmank:pyCLAHE_24
2013-08-14 12:10:22 +04:00
Roman Donchenko
e3d508902e
Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial
2013-08-14 12:08:59 +04:00
Roman Donchenko
ceacd75ab1
Merge pull request #1245 from rdm12:doc_tutorial_camera_calibration
2013-08-14 12:07:25 +04:00
Roman Donchenko
18358521f2
Merge pull request #1162 from jet47:cudev-integration
2013-08-14 12:00:34 +04:00
peng xiao
124ede611b
Update with apavlenko's suggestions.
2013-08-14 10:00:09 +08:00
abidrahmank
1b93ecfae8
docs changes
2013-08-13 22:07:44 +05:30
abidrahmank
92d04d439e
docs changes
2013-08-13 21:58:49 +05:30
