Roman Donchenko [Fri, 16 Aug 2013 10:14:12 +0000 (14:14 +0400)]
Merge branch 'master' into merge-2.4
Conflicts:
modules/photo/doc/inpainting.rst
Roman Donchenko [Thu, 15 Aug 2013 07:54:54 +0000 (11:54 +0400)]
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
kamjagin [Wed, 14 Aug 2013 09:25:49 +0000 (11:25 +0200)]
adding std to cstdint typedef of uint32_t
Miroslav Kobetski [Mon, 12 Aug 2013 18:08:06 +0000 (20:08 +0200)]
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
Roman Donchenko [Wed, 14 Aug 2013 15:03:44 +0000 (19:03 +0400)]
Merge pull request #1265 from abidrahmank:misc_docs2
Roman Donchenko [Wed, 14 Aug 2013 13:25:01 +0000 (17:25 +0400)]
Merge pull request #1186 from SpecLad:dont-export-templates
Roman Donchenko [Wed, 14 Aug 2013 09:26:23 +0000 (13:26 +0400)]
Merge pull request #1149 from jet47:generalized-hough-refactoring
Roman Donchenko [Wed, 14 Aug 2013 08:00:33 +0000 (12:00 +0400)]
Merge pull request #1162 from jet47:cudev-integration
abidrahmank [Tue, 13 Aug 2013 16:37:44 +0000 (22:07 +0530)]
docs changes
abidrahmank [Tue, 13 Aug 2013 16:28:49 +0000 (21:58 +0530)]
docs changes
Roman Donchenko [Tue, 13 Aug 2013 12:00:20 +0000 (16:00 +0400)]
Merge pull request #1260 from SpecLad:no-cr-master
Roman Donchenko [Tue, 13 Aug 2013 10:55:27 +0000 (14:55 +0400)]
Adjusted the camera calibration sample to master API.
Roman Donchenko [Tue, 13 Aug 2013 09:29:09 +0000 (13:29 +0400)]
Fixed CR line endings in non_linear_svms.rst.
Roman Donchenko [Tue, 13 Aug 2013 08:56:39 +0000 (12:56 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
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/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
Roman Donchenko [Tue, 13 Aug 2013 07:57:22 +0000 (11:57 +0400)]
Merge pull request #1250 from denzp:opencl_detection_unix
Denis Zaryaev [Mon, 12 Aug 2013 15:25:01 +0000 (18:25 +0300)]
properly set OpenCL lib search path
Roman Donchenko [Mon, 12 Aug 2013 11:50:23 +0000 (15:50 +0400)]
Merge pull request #1238 from SpecLad:cmake-min-ver
Roman Donchenko [Mon, 12 Aug 2013 11:38:58 +0000 (15:38 +0400)]
Inlined the getMD5 macro, which no longer saves us anything.
Roman Donchenko [Mon, 12 Aug 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #1242 from asmorkalov:android_native_cam
Roman Donchenko [Mon, 12 Aug 2013 10:33:29 +0000 (14:33 +0400)]
Merge pull request #1235 from WonderRico:bugfix_dshow
WonderRico [Mon, 12 Aug 2013 09:19:53 +0000 (11:19 +0200)]
fix _index / index
Roman Donchenko [Mon, 12 Aug 2013 08:21:36 +0000 (12:21 +0400)]
Merge pull request #1247 from StevenPuttemans:bugfix_3205
Roman Donchenko [Mon, 12 Aug 2013 08:06:30 +0000 (12:06 +0400)]
Merge pull request #1163 from kdrobnyh:Morphology
StevenPuttemans [Fri, 9 Aug 2013 09:54:16 +0000 (11:54 +0200)]
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
Roman Donchenko [Mon, 12 Aug 2013 07:57:39 +0000 (11:57 +0400)]
Merge pull request #1246 from StevenPuttemans:bugfix_3206
StevenPuttemans [Fri, 9 Aug 2013 09:46:46 +0000 (11:46 +0200)]
Added fix mentioned in bug #3206
VideoWriter memory leak solved.
Denis Zaryaev [Sun, 11 Aug 2013 18:05:30 +0000 (21:05 +0300)]
bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140)
WonderRico [Fri, 9 Aug 2013 14:13:40 +0000 (16:13 +0200)]
fix formating
Roman Donchenko [Fri, 9 Aug 2013 13:45:21 +0000 (17:45 +0400)]
Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample
Alexander Smorkalov [Sun, 4 Aug 2013 16:19:33 +0000 (20:19 +0400)]
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.
Roman Donchenko [Fri, 9 Aug 2013 07:49:27 +0000 (11:49 +0400)]
Merge pull request #1244 from vkocheganov:bugfix_3179
kocheganovvm [Tue, 6 Aug 2013 06:38:04 +0000 (10:38 +0400)]
Fix unsequenced modifications (Bug #3179).
kdrobnyh [Thu, 8 Aug 2013 08:30:28 +0000 (12:30 +0400)]
Removed extra {} in erosion and dilation functions
Roman Donchenko [Wed, 7 Aug 2013 10:45:44 +0000 (14:45 +0400)]
Removed obsolete CMake workaround.
Roman Donchenko [Mon, 22 Jul 2013 10:39:56 +0000 (14:39 +0400)]
Removed CMakeParseArguments.cmake, which we don't use.
It's part of CMake nowadays, too.
Roman Donchenko [Mon, 22 Jul 2013 10:37:22 +0000 (14:37 +0400)]
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.
Roman Donchenko [Mon, 22 Jul 2013 09:58:39 +0000 (13:58 +0400)]
Dropped OpenCVConfig.cmake - we don't use it anymore.
Roman Donchenko [Mon, 22 Jul 2013 09:55:49 +0000 (13:55 +0400)]
Removed CMake version checks that we don't need anymore.
Roman Donchenko [Mon, 22 Jul 2013 09:29:07 +0000 (13:29 +0400)]
Bumped minimal CMake version to 2.8.7.
Roman Donchenko [Thu, 8 Aug 2013 08:00:52 +0000 (12:00 +0400)]
Merge pull request #1233 from vpisarev:24_ipp_78
Daniil Osokin [Thu, 8 Aug 2013 05:31:25 +0000 (09:31 +0400)]
Fixed build of camera calibration android sample
Vadim Pisarevsky [Wed, 7 Aug 2013 18:34:29 +0000 (22:34 +0400)]
polished the patch
Andrey Pavlenko [Wed, 7 Aug 2013 17:05:42 +0000 (21:05 +0400)]
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
StevenPuttemans [Tue, 6 Aug 2013 14:24:09 +0000 (16:24 +0200)]
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.
Roman Donchenko [Wed, 7 Aug 2013 11:21:34 +0000 (15:21 +0400)]
Merge pull request #1237 from SpecLad:xls-separate-wh
Roman Donchenko [Mon, 22 Jul 2013 08:59:56 +0000 (12:59 +0400)]
Added a new file for recording minimal dependency versions.
Roman Donchenko [Wed, 7 Aug 2013 09:43:03 +0000 (13:43 +0400)]
xls-report.py: separated image width and height for easier analysis.
Roman Donchenko [Wed, 7 Aug 2013 07:41:23 +0000 (11:41 +0400)]
Merge pull request #1189 from pengx17:2.4_sort_by_key
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:51 +0000 (20:54 +0400)]
Merge pull request #1187 from kdrobnyh:mean_and_sum
Andrey Pavlenko [Tue, 6 Aug 2013 16:54:29 +0000 (20:54 +0400)]
Merge pull request #1230 from SpecLad:merge-2.4
Andrey Pavlenko [Tue, 6 Aug 2013 16:53:43 +0000 (20:53 +0400)]
Merge pull request #1231 from SpecLad:static-ts
WonderRico [Tue, 6 Aug 2013 16:35:49 +0000 (18:35 +0200)]
Bug #3201 fix
Vadim Pisarevsky [Tue, 6 Aug 2013 14:31:06 +0000 (18:31 +0400)]
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
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 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 [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.
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: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
projects / platform / upstream / opencv.git / log