Roman Donchenko
98cd04c191
Merge pull request #1163 from kdrobnyh:Morphology
2013-08-12 12:06:31 +04: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
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
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
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
a7da129984
Merge pull request #1187 from kdrobnyh:mean_and_sum
2013-08-06 20:54:52 +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
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
Alexander Shishkov
b84b8db277
Removed useless .*
2013-08-06 14:28:07 +04:00
Roman Donchenko
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
2013-08-05 12:58:37 +04:00
Roman Donchenko
4fb2e9a85a
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
2013-08-05 12:52:15 +04:00
Roman Donchenko
d92b638768
Merge pull request #1226 from apavlenko:fix_java_test_ellipse2poly
2013-08-05 12:38:19 +04:00
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
2013-08-05 11:45:17 +04:00
Andrey Pavlenko
a06891851d
fixing compilation with -Werror=format-security enabled
2013-08-05 11:11:54 +04:00
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +04:00
Andrey Pavlenko
a2ff1b07b3
Merge pull request #1219 from asmorkalov:winrt_neon
2013-08-04 21:59:06 +04:00
Alexander Smorkalov
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
Alexander Shishkov
afd7429cbd
Update OpenCVDetectPython.cmake
...
On my MacOS the output of the sphinx-build binary is the following:
Error: Insufficient arguments.
Sphinx v1.2b1
Usage: /usr/local/bin/sphinx-build [options] sourcedir outdir [filenames...]
...
I have installed sphinx, but without this change HAVE_SPHINX==0 for me, so I can't build docs.
2013-08-03 00:17:40 +04:00
Andrey Pavlenko
ee8687ba19
Merge pull request #1214 from StevenPuttemans:feature_3169_others
2013-08-02 17:59:06 +04:00
Vladislav Vinogradov
d13ecd0d76
increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5
2013-08-02 17:31:34 +04:00
Andrey Pavlenko
f0d854ce39
Merge pull request #1205 from asmorkalov:winrt_api_cert_fix
2013-08-02 16:27:23 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Alexander Smorkalov
63786c389f
Warning and review notes fixes.
...
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
2013-08-02 04:10:56 -07:00
Andrey Pavlenko
add2ea75c3
Merge pull request #1212 from jet47:gpu-calc-hist
2013-08-02 13:23:04 +04:00
Vladislav Vinogradov
55cb26551f
use NPP version for Fermi
2013-08-02 09:05:21 +04:00
Vladislav Vinogradov
a28cb99e88
optimized version of histEven for CV_8UC1
2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
bfca1afd9e
rewrite histEven test
2013-08-01 18:00:05 +04:00
