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
kdrobnyh
4943b0a73c
Merge pull request #3 from Itseez/2.4
...
OpenCV changes
2013-08-14 02:29:15 -07:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Changlin Hsieh
c1dd38cbff
Fix GPU example build failed with cuda 5.5
2013-08-14 16:16:03 +08: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
Achal Dave
0bc609257d
Comparing rejected stage index with minimum required neighbors does not make sense
...
As described here, http://code.opencv.org/issues/3064 , the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
2013-08-13 20:42:04 -07: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
abidrahmank
96c1df14f4
CLAHE Python bindings
2013-08-13 19:51:32 +05:30
Roman Donchenko
43c7a8ae93
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
2013-08-13 16:34:19 +04:00
Roman Donchenko
fae7b20815
Merge pull request #1255 from SpecLad:no-cr
2013-08-13 16:33:55 +04:00
StevenPuttemans
89012e8f6b
Missing including of nonfree module to support the use of SURF
...
detector/descriptor.
2013-08-13 14:23:24 +02:00
Roman Donchenko
99624628a9
Merge pull request #1260 from SpecLad:no-cr-master
2013-08-13 16:00:20 +04:00
Andrey Pavlenko
f3b1933a92
LinkedList -> ArrayList
2013-08-13 15:51:37 +04:00
Roman Donchenko
339dd983ee
Adjusted the camera calibration sample to master API.
2013-08-13 14:55:27 +04:00
Roman Donchenko
4fb81052a8
Merge pull request #1256 from kamjagin:2.4
2013-08-13 13:37:09 +04:00
Roman Donchenko
77df8e574f
Fixed CR line endings in non_linear_svms.rst.
2013-08-13 13:29:09 +04:00
Andrey Pavlenko
4902db1c42
also fixing JNI library name in JUnit tests
2013-08-13 13:18:01 +04:00
peng xiao
2fb2ac8836
Apply bugfix #3121 for OCL.
2013-08-13 17:17:07 +08:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
