Andrey Pavlenko [Tue, 6 Aug 2013 17:01:40 +0000 (21:01 +0400)]
Merge pull request #1228 from vkocheganov:bug_3191
Andrey Pavlenko [Tue, 6 Aug 2013 16:54:29 +0000 (20:54 +0400)]
Merge pull request #1230 from SpecLad:merge-2.4
Roman Donchenko [Tue, 6 Aug 2013 13:06:13 +0000 (17:06 +0400)]
Fixed compilation errors.
Roman Donchenko [Tue, 6 Aug 2013 11:38:19 +0000 (15:38 +0400)]
Fixed documentation errors.
Roman Donchenko [Tue, 6 Aug 2013 11:22:46 +0000 (15:22 +0400)]
Fix whitespace errors.
Roman Donchenko [Tue, 6 Aug 2013 09:56:49 +0000 (13:56 +0400)]
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
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/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
kocheganovvm [Tue, 6 Aug 2013 04:08:13 +0000 (08:08 +0400)]
Fix unsequenced assignment (Bug #3191).
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:54:43 +0000 (10:54 +0400)]
Merge pull request #1079 from AlexeySpizhevoy:master
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:26:23 +0000 (10:26 +0400)]
Merge pull request #1221 from philippefoubert:branch_cmake_cmp0004
Andrey Pavlenko [Mon, 5 Aug 2013 06:20:24 +0000 (10:20 +0400)]
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
Andrey Pavlenko [Mon, 5 Aug 2013 06:19:59 +0000 (10:19 +0400)]
Merge pull request #1151 from jet47:gpubgsegm-refactoring
Philippe FOUBERT [Sun, 4 Aug 2013 18:52:49 +0000 (20:52 +0200)]
Solve the problem seen when using recent versions of CMake (such as 2.8.11): OpenCVConfig.cmake violates the policy CMP0004.
Symptoms:
CMake Error at CMakeLists.txt:10 (add_executable):
Target "my_app" links to item "C:/Program Files " which has leading
or trailing whitespace. This is now an error according to policy CMP0004.
This problem occurs when building on Windows when we depend on libraries located (for example) in "C:\Program Files (x86)..."
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.
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:50:12 +0000 (15:50 +0400)]
Merge pull request #1166 from StevenPuttemans:patch_2288
StevenPuttemans [Mon, 22 Jul 2013 11:00:54 +0000 (13:00 +0200)]
Added the sample from patch #2288 : reading in sequence of images
Added bugfixes
- Changed CV_WINDOW_NORMAL to 1
- Changed the help function to static
- Added extra help information on mask specifics
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
Andrey Pavlenko [Wed, 31 Jul 2013 10:29:21 +0000 (14:29 +0400)]
Merge pull request #1208 from berak:Bug_3094
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
berak [Tue, 30 Jul 2013 15:32:48 +0000 (17:32 +0200)]
expanded the CV_Assert in pyrdown_ to check for empty mats
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 14:22:08 +0000 (18:22 +0400)]
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
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:50:29 +0000 (17:50 +0400)]
Merge pull request #1108 from nailbiter:optimLP
Andrey Pavlenko [Tue, 30 Jul 2013 13:41:25 +0000 (17:41 +0400)]
Merge pull request #1194 from SpecLad:no-const-inputarray
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 12:14:23 +0000 (16:14 +0400)]
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
Andrey Pavlenko [Tue, 30 Jul 2013 12:13:02 +0000 (16:13 +0400)]
Merge pull request #1204 from berak:Bug_3170
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 [Tue, 30 Jul 2013 10:17:32 +0000 (14:17 +0400)]
Merge pull request #1198 from znah:py_flann_fix
Alex Leontiev [Tue, 30 Jul 2013 01:14:36 +0000 (04:14 +0300)]
Minor fixes
Request to comments on pull request for simplex method. In particular
*) while(1) is replaced with for(;;)
*) if(true){...} constructions in tests are replaced with #if 1 ...
#endif
Andrey Pavlenko [Mon, 29 Jul 2013 11:31:36 +0000 (15:31 +0400)]
Merge pull request #1200 from shervinemami:patch-1
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
berak [Mon, 29 Jul 2013 10:16:37 +0000 (12:16 +0200)]
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
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
Shervin Emami [Sat, 27 Jul 2013 02:13:25 +0000 (19:13 -0700)]
Changed cornerHarris description to say it finds corners, not edges
Alexander Mordvintsev [Fri, 26 Jul 2013 13:58:39 +0000 (17:58 +0400)]
fixed Bug #3143 - flann 'not implemented' error
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
Vladislav Vinogradov [Fri, 26 Jul 2013 12:13:37 +0000 (16:13 +0400)]
removed ffmpeg dependency from gpucodec module:
used implementation from highgui module
Roman Donchenko [Fri, 26 Jul 2013 10:52:56 +0000 (14:52 +0400)]
Replace "const InputArray" with "InputArray".
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
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
Alex Leontiev [Thu, 25 Jul 2013 11:30:20 +0000 (14:30 +0300)]
Minor fixes
Fixing failed build.
Roman Donchenko [Thu, 25 Jul 2013 08:13:47 +0000 (12:13 +0400)]
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
Roman Donchenko [Thu, 25 Jul 2013 08:05:36 +0000 (12:05 +0400)]
Merge pull request #1171 from SpecLad:drop-legacy-options
Roman Donchenko [Thu, 25 Jul 2013 08:04:09 +0000 (12:04 +0400)]
Merge pull request #1180 from nghiaho12:master
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
Nghia Ho [Wed, 24 Jul 2013 13:53:18 +0000 (23:53 +1000)]
missing fclose when returning early
Roman Donchenko [Wed, 24 Jul 2013 12:08:17 +0000 (16:08 +0400)]
Merge pull request #1169 from asmorkalov:winrt_tbb_dbg_wrn_fix
Roman Donchenko [Wed, 24 Jul 2013 09:50:10 +0000 (13:50 +0400)]
Merge pull request #1119 from 23pointsNorth:lsd
Roman Donchenko [Wed, 24 Jul 2013 09:45:32 +0000 (13:45 +0400)]
Merge pull request #1170 from SpecLad:merge-2.4
Alexander Smorkalov [Mon, 22 Jul 2013 14:02:04 +0000 (07:02 -0700)]
Warning suppresion for TBB on WinRT added.