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
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
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
Vladislav Vinogradov
c8d1fccdac
compare cv::gpu::calcHist with cv::calcHist
2013-08-01 18:00:05 +04:00
Alexander Smorkalov
e03ffde346
WinRT API Certification fixes for core and contrib.
2013-07-31 05:43:53 -07:00
Alexander Smorkalov
62b85a41da
TLS calls on WinRT replaced on variables with C++11 "thread" attribute.
2013-07-31 05:43:52 -07:00
Alexander Smorkalov
6257df1c4b
API restricted on WinRT partially removed from core.
...
Additional CMAKE flag WITH_WINRT added.
2013-07-31 05:43:51 -07:00
Andrey Pavlenko
9b5d1596dc
Merge pull request #891 from NCBee:2.4
2013-07-31 16:38:16 +04:00
Andrey Pavlenko
4c35449b7d
Merge pull request #1139 from StevenPuttemans:bugfix_3101
2013-07-31 15:14:03 +04:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
76a938c7ef
Merge pull request #1197 from apavlenko:fix_unstable_perf_tests
2013-07-31 15:07:19 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Andrey Pavlenko
46192e7b11
Merge pull request #1207 from kirill-kornyakov:fix-for-readme
2013-07-31 09:23:38 +04:00
Kirill Kornyakov
252a11c437
Updated README.md
2013-07-30 18:51:53 +04:00
Kirill Kornyakov
11617e5d0b
Updated gitignore relative to new platforms dir
2013-07-30 18:48:20 +04:00
Andrey Pavlenko
0851766806
Merge pull request #1121 from pengx17:2.4_gftt_perf_test
2013-07-30 18:40:10 +04:00
Andrey Pavlenko
6a77bfb503
Merge pull request #1172 from StevenPuttemans:bugfix_3166_24
2013-07-30 18:39:41 +04:00
Andrey Pavlenko
646e817b36
Merge pull request #1070 from Daniil-Osokin:calibrationSampleAndroid
2013-07-30 17:56:01 +04:00
Andrey Pavlenko
2b8d868560
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Andrey Pavlenko
c43b896541
Merge pull request #1177 from janstarzy:refactor
2013-07-30 17:39:09 +04:00
Andrey Pavlenko
bc78e87a61
Merge pull request #1123 from bitwangyaoyao:2.4_fix
2013-07-30 17:13:27 +04:00
Andrey Pavlenko
26a3cabbf8
Merge pull request #1193 from SpecLad:exports-for-contrarians
2013-07-30 16:50:29 +04:00
Andrey Pavlenko
eb0d26b5be
fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')
2013-07-30 16:42:45 +04:00
Andrey Pavlenko
373dfa8ccc
Merge pull request #1201 from alekcac:gittip
2013-07-30 16:35:59 +04:00
Andrey Pavlenko
ea6002ebc7
Merge pull request #1185 from znah:cumpute_method_for_2_4
2013-07-30 15:46:48 +04:00
kdrobnyh
6af10a2937
Some changes in sum and mean functions
2013-07-30 00:54:27 +04:00
