Andrey Pavlenko [Tue, 6 Aug 2013 16:53:43 +0000 (20:53 +0400)]
Merge pull request #1231 from SpecLad:static-ts
Roman Donchenko [Tue, 6 Aug 2013 13:56:25 +0000 (17:56 +0400)]
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.
Roman Donchenko [Tue, 6 Aug 2013 10:31:14 +0000 (14:31 +0400)]
Merge pull request #1216 from alekcac:sphinx
Alexander Shishkov [Tue, 6 Aug 2013 10:28:07 +0000 (14:28 +0400)]
Removed useless .*
Roman Donchenko [Mon, 5 Aug 2013 08:58:37 +0000 (12:58 +0400)]
Merge pull request #1225 from apavlenko:fix_format_security
Roman Donchenko [Mon, 5 Aug 2013 08:52:15 +0000 (12:52 +0400)]
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
Roman Donchenko [Mon, 5 Aug 2013 08:38:18 +0000 (12:38 +0400)]
Merge pull request #1226 from apavlenko:fix_java_test_ellipse2poly
Andrey Pavlenko [Mon, 5 Aug 2013 07:45:17 +0000 (11:45 +0400)]
fixing java test after fix in OpenCV library
Andrey Pavlenko [Mon, 5 Aug 2013 07:11:54 +0000 (11:11 +0400)]
fixing compilation with `-Werror=format-security` enabled
Andrey Pavlenko [Mon, 5 Aug 2013 06:26:38 +0000 (10:26 +0400)]
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
Andrey Pavlenko [Mon, 5 Aug 2013 06:20:24 +0000 (10:20 +0400)]
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
Alexander Smorkalov [Sun, 4 Aug 2013 18:34:36 +0000 (22:34 +0400)]
Difference in method definition and declaration fixed (Bug #3189).
Andrey Pavlenko [Sun, 4 Aug 2013 17:59:05 +0000 (21:59 +0400)]
Merge pull request #1219 from asmorkalov:winrt_neon
Alexander Smorkalov [Sun, 4 Aug 2013 15:47:42 +0000 (08:47 -0700)]
NEON instruction set enabled for WIN32 on ARM by default.
Alexander Shishkov [Fri, 2 Aug 2013 20:17:40 +0000 (00:17 +0400)]
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.
Andrey Pavlenko [Fri, 2 Aug 2013 13:59:05 +0000 (17:59 +0400)]
Merge pull request #1214 from StevenPuttemans:feature_3169_others
Andrey Pavlenko [Fri, 2 Aug 2013 12:27:22 +0000 (16:27 +0400)]
Merge pull request #1205 from asmorkalov:winrt_api_cert_fix
StevenPuttemans [Fri, 2 Aug 2013 12:05:08 +0000 (14:05 +0200)]
Added sample links in documentation for python2, ocl and gpu
Alexander Smorkalov [Mon, 29 Jul 2013 11:38:18 +0000 (04:38 -0700)]
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.
Andrey Pavlenko [Fri, 2 Aug 2013 09:23:03 +0000 (13:23 +0400)]
Merge pull request #1212 from jet47:gpu-calc-hist
Vladislav Vinogradov [Fri, 2 Aug 2013 05:05:21 +0000 (09:05 +0400)]
use NPP version for Fermi
Vladislav Vinogradov [Thu, 1 Aug 2013 12:51:52 +0000 (16:51 +0400)]
optimized version of histEven for CV_8UC1
Vladislav Vinogradov [Thu, 1 Aug 2013 12:25:16 +0000 (16:25 +0400)]
rewrite histEven test
Vladislav Vinogradov [Thu, 1 Aug 2013 09:58:46 +0000 (13:58 +0400)]
compare cv::gpu::calcHist with cv::calcHist
Alexander Smorkalov [Thu, 25 Jul 2013 14:22:14 +0000 (07:22 -0700)]
WinRT API Certification fixes for core and contrib.
Alexander Smorkalov [Tue, 23 Jul 2013 13:44:57 +0000 (06:44 -0700)]
TLS calls on WinRT replaced on variables with C++11 "thread" attribute.
Alexander Smorkalov [Fri, 19 Jul 2013 09:43:05 +0000 (02:43 -0700)]
API restricted on WinRT partially removed from core.
Additional CMAKE flag WITH_WINRT added.
Andrey Pavlenko [Wed, 31 Jul 2013 12:38:14 +0000 (16:38 +0400)]
Merge pull request #891 from NCBee:2.4
Andrey Pavlenko [Wed, 31 Jul 2013 11:14:03 +0000 (15:14 +0400)]
Merge pull request #1139 from StevenPuttemans:bugfix_3101
Andrey Pavlenko [Wed, 31 Jul 2013 11:10:26 +0000 (15:10 +0400)]
Merge pull request #1019 from jet47:opengl-documentation
Andrey Pavlenko [Wed, 31 Jul 2013 11:07:19 +0000 (15:07 +0400)]
Merge pull request #1197 from apavlenko:fix_unstable_perf_tests
Andrey Pavlenko [Wed, 31 Jul 2013 10:31:21 +0000 (14:31 +0400)]
Merge pull request #1206 from StevenPuttemans:feature_3169
StevenPuttemans [Mon, 29 Jul 2013 13:51:16 +0000 (15:51 +0200)]
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
Andrey Pavlenko [Wed, 31 Jul 2013 05:23:37 +0000 (09:23 +0400)]
Merge pull request #1207 from kirill-kornyakov:fix-for-readme
Kirill Kornyakov [Tue, 30 Jul 2013 14:51:53 +0000 (18:51 +0400)]
Updated README.md
Kirill Kornyakov [Tue, 30 Jul 2013 14:48:20 +0000 (18:48 +0400)]
Updated gitignore relative to new platforms dir
Andrey Pavlenko [Tue, 30 Jul 2013 14:40:10 +0000 (18:40 +0400)]
Merge pull request #1121 from pengx17:2.4_gftt_perf_test
Andrey Pavlenko [Tue, 30 Jul 2013 14:39:41 +0000 (18:39 +0400)]
Merge pull request #1172 from StevenPuttemans:bugfix_3166_24
Andrey Pavlenko [Tue, 30 Jul 2013 13:56:01 +0000 (17:56 +0400)]
Merge pull request #1070 from Daniil-Osokin:calibrationSampleAndroid
Andrey Pavlenko [Tue, 30 Jul 2013 13:50:50 +0000 (17:50 +0400)]
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
Andrey Pavlenko [Tue, 30 Jul 2013 13:39:35 +0000 (17:39 +0400)]
Merge pull request #1110 from SpecLad:config-cleanup
Andrey Pavlenko [Tue, 30 Jul 2013 13:39:09 +0000 (17:39 +0400)]
Merge pull request #1177 from janstarzy:refactor
Andrey Pavlenko [Tue, 30 Jul 2013 13:13:26 +0000 (17:13 +0400)]
Merge pull request #1123 from bitwangyaoyao:2.4_fix
Andrey Pavlenko [Tue, 30 Jul 2013 12:50:28 +0000 (16:50 +0400)]
Merge pull request #1193 from SpecLad:exports-for-contrarians
Andrey Pavlenko [Tue, 30 Jul 2013 12:42:45 +0000 (16:42 +0400)]
fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')
Andrey Pavlenko [Tue, 30 Jul 2013 12:35:58 +0000 (16:35 +0400)]
Merge pull request #1201 from alekcac:gittip
Andrey Pavlenko [Tue, 30 Jul 2013 11:46:47 +0000 (15:46 +0400)]
Merge pull request #1185 from znah:cumpute_method_for_2_4
Andrey Pavlenko [Mon, 29 Jul 2013 11:29:22 +0000 (15:29 +0400)]
Merge pull request #1202 from hansmi:docfix3149
Andrey Pavlenko [Mon, 29 Jul 2013 11:25:55 +0000 (15:25 +0400)]
Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres
Michael Hanselmann [Sun, 28 Jul 2013 14:18:12 +0000 (16:18 +0200)]
Documentation fix for cv::compare (issue 3149)
Since commit
d8417af0860 (July 2011) cv::compare produces an array with
the same size and type as the input arrays.
Signed-off-by: Michael Hanselmann <public@hansmi.ch>
Alexander Shishkov [Sat, 27 Jul 2013 21:01:46 +0000 (01:01 +0400)]
Update README.md
Alexander Shishkov [Sat, 27 Jul 2013 20:37:38 +0000 (00:37 +0400)]
Update README.md
Alexander Shishkov [Sat, 27 Jul 2013 20:25:07 +0000 (00:25 +0400)]
Rename README to README.md
Alexander Shishkov [Sat, 27 Jul 2013 20:23:52 +0000 (00:23 +0400)]
Added gittip button
Andrey Pavlenko [Fri, 26 Jul 2013 13:27:31 +0000 (17:27 +0400)]
adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so)
Dmitry Retinskiy [Fri, 26 Jul 2013 12:13:07 +0000 (16:13 +0400)]
bugfix #3121: corrected calculation of blue channel index
Roman Donchenko [Fri, 26 Jul 2013 10:35:40 +0000 (14:35 +0400)]
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
Roman Donchenko [Fri, 26 Jul 2013 09:01:41 +0000 (13:01 +0400)]
Merge pull request #1191 from jet47:gpu-perf4au-fix
Vladislav Vinogradov [Fri, 26 Jul 2013 07:13:39 +0000 (11:13 +0400)]
fixed gpu_perf4au perf test (added cuda impl)
Jin Ma [Fri, 26 Jul 2013 06:14:26 +0000 (14:14 +0800)]
Added farneback to superres module.
yao [Fri, 26 Jul 2013 03:17:27 +0000 (11:17 +0800)]
generating the lut table instead of hard coding one
Daniil Osokin [Mon, 1 Jul 2013 20:53:18 +0000 (00:53 +0400)]
Added camera calibration sample for android
Jan Starzynski [Thu, 25 Jul 2013 12:53:22 +0000 (14:53 +0200)]
removed declaration of throwJavaException
Alexander Mordvintsev [Thu, 25 Jul 2013 12:22:31 +0000 (16:22 +0400)]
compute method for Feature2D
Jan Starzynski [Thu, 25 Jul 2013 11:36:27 +0000 (13:36 +0200)]
refactored throwJavaException() and removed useless returns
Roman Donchenko [Thu, 25 Jul 2013 08:00:55 +0000 (12:00 +0400)]
Merge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2
Alexander Pacha [Thu, 25 Jul 2013 04:40:09 +0000 (16:40 +1200)]
Added FREAK-descriptor extractor to documentation.
Previously it was missing.
Ordered all descriptors by year of first publication.
Jan Starzynski [Wed, 24 Jul 2013 15:27:03 +0000 (17:27 +0200)]
removed multiplied code for exception handling
Roman Donchenko [Wed, 24 Jul 2013 12:08:17 +0000 (16:08 +0400)]
Merge pull request #1169 from asmorkalov:winrt_tbb_dbg_wrn_fix
Alexander Smorkalov [Mon, 22 Jul 2013 14:02:04 +0000 (07:02 -0700)]
Warning suppresion for TBB on WinRT added.
Roman Donchenko [Tue, 23 Jul 2013 07:54:39 +0000 (11:54 +0400)]
Merge pull request #1168 from StevenPuttemans:feature_2753
StevenPuttemans [Tue, 23 Jul 2013 07:49:09 +0000 (09:49 +0200)]
Adapted the reference underscore to link properly
StevenPuttemans [Tue, 23 Jul 2013 06:49:25 +0000 (08:49 +0200)]
Fixed bug 3166 - added paper reference to stardetector code
StevenPuttemans [Mon, 22 Jul 2013 13:16:22 +0000 (15:16 +0200)]
Made change to install in windows guide, showing only difference between VS2010 and VS2012
Roman Donchenko [Mon, 22 Jul 2013 11:34:13 +0000 (15:34 +0400)]
Merge pull request #1165 from vpisarev:24_ipp
Vadim Pisarevsky [Mon, 22 Jul 2013 10:20:13 +0000 (14:20 +0400)]
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
Roman Donchenko [Mon, 22 Jul 2013 09:28:28 +0000 (13:28 +0400)]
Merge pull request #1161 from SpecLad:xls-comp-bug
Roman Donchenko [Mon, 22 Jul 2013 08:48:43 +0000 (12:48 +0400)]
Fix xls-report.py not working with more than one comparison.
Andrey Pavlenko [Sun, 21 Jul 2013 14:47:16 +0000 (18:47 +0400)]
Merge pull request #1158 from StevenPuttemans:bugfix_3165
Andrey Pavlenko [Sun, 21 Jul 2013 14:46:58 +0000 (18:46 +0400)]
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new
Philippe FOUBERT [Sat, 20 Jul 2013 13:03:30 +0000 (15:03 +0200)]
Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
StevenPuttemans [Fri, 19 Jul 2013 12:11:04 +0000 (14:11 +0200)]
Applied bugfix #3165 : Changed min_eps value
Roman Donchenko [Fri, 19 Jul 2013 08:48:49 +0000 (12:48 +0400)]
Merge pull request #1148 from StevenPuttemans:patch_3125
Roman Donchenko [Fri, 19 Jul 2013 08:22:58 +0000 (12:22 +0400)]
Merge pull request #1141 from apavlenko:fix_warning_unreach_code
Roman Donchenko [Fri, 19 Jul 2013 08:15:30 +0000 (12:15 +0400)]
Merge pull request #1150 from janstarzy:spelling
StevenPuttemans [Fri, 19 Jul 2013 07:29:48 +0000 (09:29 +0200)]
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
Andrey Pavlenko [Thu, 18 Jul 2013 15:50:51 +0000 (19:50 +0400)]
minor improvement (consistency, readability)
Andrey Pavlenko [Thu, 18 Jul 2013 15:15:49 +0000 (19:15 +0400)]
removing unreachible code
StevenPuttemans [Thu, 18 Jul 2013 13:34:38 +0000 (15:34 +0200)]
Added brackets around line 888-892 for correct code!
Jan Starzynski [Thu, 18 Jul 2013 13:33:25 +0000 (15:33 +0200)]
fixed cpackage -> package
StevenPuttemans [Thu, 18 Jul 2013 12:24:19 +0000 (14:24 +0200)]
Changed first approach to a more general MS-specific approach.
Suggested by @SpecLad
Roman Donchenko [Thu, 18 Jul 2013 12:02:46 +0000 (16:02 +0400)]
Merge pull request #1137 from StevenPuttemans:bugfix_3131_24
Jan Starzynski [Thu, 18 Jul 2013 11:24:55 +0000 (13:24 +0200)]
corrected some spelling errors
Roman Donchenko [Thu, 18 Jul 2013 10:29:47 +0000 (14:29 +0400)]
Merge pull request #1147 from jet47:gpu-sanity-test-name
Andrey Pavlenko [Thu, 18 Jul 2013 10:23:12 +0000 (14:23 +0400)]
Merge pull request #1138 from janstarzy:mat-dist
Vladislav Vinogradov [Thu, 18 Jul 2013 09:41:27 +0000 (13:41 +0400)]
removed GPU_/CPU_ prefix from gpu's sanity test
StevenPuttemans [Wed, 17 Jul 2013 12:52:42 +0000 (14:52 +0200)]
Fixing bug #3131 adding breakpoints to featuretracker.cpp
Roman Donchenko [Thu, 18 Jul 2013 08:54:09 +0000 (12:54 +0400)]
Merge pull request #1146 from jet47:fix-gpu-without-cufft-cublas
Roman Donchenko [Thu, 18 Jul 2013 08:25:20 +0000 (12:25 +0400)]
Merge pull request #1145 from jet47:cuda-default-cc
Vladislav Vinogradov [Thu, 18 Jul 2013 07:24:34 +0000 (11:24 +0400)]
fixed compilation without CUBLAS and CUFFT