Roman Donchenko
afc6f79038
Inlined the getMD5 macro, which no longer saves us anything.
2013-08-12 15:38:58 +04:00
Roman Donchenko
57c1e8f333
Merge pull request #1242 from asmorkalov:android_native_cam
2013-08-12 14:47:48 +04:00
Roman Donchenko
504ebda7c4
Merge pull request #1235 from WonderRico:bugfix_dshow
2013-08-12 14:33:30 +04:00
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
fd056235d3
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
2013-08-12 11:44:38 +02:00
WonderRico
d067749c21
fix _index / index
2013-08-12 11:19:53 +02:00
Roman Donchenko
19d8f4f8dd
Merge pull request #1247 from StevenPuttemans:bugfix_3205
2013-08-12 12:21:36 +04:00
Roman Donchenko
98cd04c191
Merge pull request #1163 from kdrobnyh:Morphology
2013-08-12 12:06:31 +04:00
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
2013-08-12 10:04:15 +02:00
Roman Donchenko
314f3d84e1
Merge pull request #1246 from StevenPuttemans:bugfix_3206
2013-08-12 11:57:39 +04:00
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
2013-08-12 09:49:19 +02:00
Denis Zaryaev
129f315f7c
bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140 )
2013-08-11 21:05:30 +03:00
WonderRico
a048387376
fix formating
2013-08-09 16:13:40 +02:00
Roman Donchenko
8d39350b4d
Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample
2013-08-09 17:45:21 +04:00
Alexander Smorkalov
fff91eef0b
Native camera libraries updated.
...
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
2013-08-09 17:43:21 +04:00
Roman Donchenko
167abf0dae
Merge pull request #1244 from vkocheganov:bugfix_3179
2013-08-09 11:49:27 +04:00
Dmitry Retinskiy
2765f3f7ad
Minor language corrections in the tutorial document
2013-08-09 10:32:34 +04:00
kocheganovvm
e4b201be25
Fix unsequenced modifications (Bug #3179 ).
2013-08-08 18:55:47 +04:00
Roman Donchenko
4dc63273f0
Renamed ocl tests' precomp files according to convention.
...
Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
2013-08-08 18:18:54 +04:00
Roman Donchenko
6d7f29a03a
Made it so that a dummy .cpp is actually created when compiling with VC++.
2013-08-08 16:49:14 +04:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
kdrobnyh
7da5fa01d4
Removed extra {} in erosion and dilation functions
2013-08-08 12:30:28 +04:00
Roman Donchenko
e57407849a
Removed obsolete CMake workaround.
2013-08-08 12:03:41 +04:00
Roman Donchenko
36874300c8
Removed CMakeParseArguments.cmake, which we don't use.
...
It's part of CMake nowadays, too.
2013-08-08 12:03:41 +04:00
Roman Donchenko
a23abef9bd
Removed OpenCVFindPkgConfig.cmake, since it's bundled with CMake now.
...
In fact, I don't think we actually use it... but I kept the include,
just in case.
2013-08-08 12:03:41 +04:00
Roman Donchenko
656416d174
Dropped OpenCVConfig.cmake - we don't use it anymore.
2013-08-08 12:03:41 +04:00
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
2013-08-08 12:03:41 +04:00
Roman Donchenko
a87756e9b3
Bumped minimal CMake version to 2.8.7.
2013-08-08 12:03:30 +04:00
Roman Donchenko
79b6f68f54
Merge pull request #1233 from vpisarev:24_ipp_78
2013-08-08 12:00:52 +04:00
Daniil Osokin
65c5c4df70
Fixed build of camera calibration android sample
2013-08-08 09:31:25 +04:00
Vadim Pisarevsky
d5539975d7
polished the patch
2013-08-07 22:34:29 +04:00
Andrey Pavlenko
1c55096c01
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
2013-08-07 21:05:43 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Roman Donchenko
92c823f82f
Merge pull request #1237 from SpecLad:xls-separate-wh
2013-08-07 15:21:35 +04:00
Roman Donchenko
a495bbb967
Added a new file for recording minimal dependency versions.
2013-08-07 13:56:09 +04:00
Roman Donchenko
e23f31311d
xls-report.py: separated image width and height for easier analysis.
2013-08-07 13:43:03 +04:00
Roman Donchenko
95bdd4b670
Merge pull request #1189 from pengx17:2.4_sort_by_key
2013-08-07 11:41:23 +04:00
peng xiao
5aaed77cbc
Fix a bug of retinaParameters.
...
When colorMode is set to 0 via Retina::_init method, _retinaParameters's
colorMode variable is not correctly assigned.
2013-08-07 14:36:24 +08:00
Andrey Pavlenko
04c86f28b1
Merge pull request #1228 from vkocheganov:bug_3191
2013-08-06 21:01:40 +04:00
Andrey Pavlenko
a7da129984
Merge pull request #1187 from kdrobnyh:mean_and_sum
2013-08-06 20:54:52 +04:00
Andrey Pavlenko
ab4fe8dd2c
Merge pull request #1230 from SpecLad:merge-2.4
2013-08-06 20:54:30 +04:00
Andrey Pavlenko
e0659a5967
Merge pull request #1231 from SpecLad:static-ts
2013-08-06 20:53:43 +04:00
WonderRico
7e7fb0b75d
Bug #3201 fix
2013-08-06 18:35:49 +02:00
Roman Donchenko
5dd598fc6d
Fix building the iOS framework after I dropped the VERSION macro.
...
This version uses CMake to generate Info.plist, which should be more
reliable than the old approach.
2013-08-06 18:56:36 +04:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
131458847b
Make ts always static.
...
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
2013-08-06 17:56:25 +04:00
Roman Donchenko
2911b12145
Merge pull request #1216 from alekcac:sphinx
2013-08-06 14:31:15 +04:00
