Roman Donchenko [Wed, 28 Aug 2013 14:05:10 +0000 (18:05 +0400)]
Merge pull request #1356 from SpecLad:homography-uninit
Roman Donchenko [Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)]
Merge pull request #1348 from SpecLad:merge-2.4
Roman Donchenko [Wed, 28 Aug 2013 09:20:14 +0000 (13:20 +0400)]
Fixed incomplete matrix initialization in HomographyRefineCallback.
Roman Donchenko [Wed, 28 Aug 2013 09:13:15 +0000 (13:13 +0400)]
Removed a duplicate line.
Roman Donchenko [Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)]
Merge pull request #1342 from nevion:master
Roman Donchenko [Wed, 28 Aug 2013 07:44:40 +0000 (11:44 +0400)]
Merge pull request #1248 from vkocheganov:chi_square_alt
Roman Donchenko [Tue, 27 Aug 2013 15:15:47 +0000 (19:15 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
Roman Donchenko [Tue, 27 Aug 2013 13:47:55 +0000 (17:47 +0400)]
Merge pull request #1341 from roynos:master
Roman Donchenko [Tue, 27 Aug 2013 13:13:40 +0000 (17:13 +0400)]
War on Whitespace, master edition: tabs.
Roman Donchenko [Tue, 27 Aug 2013 10:23:26 +0000 (14:23 +0400)]
War on Whitespace, master edition: file endings.
Roman Donchenko [Tue, 27 Aug 2013 09:57:24 +0000 (13:57 +0400)]
War on Whitespace, master edition: trailing spaces.
Roman Donchenko [Tue, 27 Aug 2013 09:26:44 +0000 (13:26 +0400)]
Merge commit '
43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
Roman Donchenko [Tue, 27 Aug 2013 09:23:26 +0000 (13:23 +0400)]
Merge commit '
43aec5ad^' into merge-2.4
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
Roman Donchenko [Tue, 27 Aug 2013 08:43:34 +0000 (12:43 +0400)]
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
Roman Donchenko [Tue, 27 Aug 2013 08:37:32 +0000 (12:37 +0400)]
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
Jason Newton [Tue, 27 Aug 2013 07:34:22 +0000 (00:34 -0700)]
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
Roman Donchenko [Mon, 26 Aug 2013 12:59:44 +0000 (16:59 +0400)]
Merge pull request #1311 from leszekhanusz:png_palette_alpha
Roman Donchenko [Mon, 26 Aug 2013 12:54:59 +0000 (16:54 +0400)]
Merge pull request #1326 from ilya-lavrenov:perf_ocl
Roman Donchenko [Mon, 26 Aug 2013 12:44:37 +0000 (16:44 +0400)]
Merge pull request #1327 from alalek:ocl_master_tests_fix
Roman Donchenko [Mon, 26 Aug 2013 12:41:13 +0000 (16:41 +0400)]
Merge pull request #1340 from SpecLad:python-updates
Roman Donchenko [Mon, 26 Aug 2013 12:40:50 +0000 (16:40 +0400)]
Merge pull request #1336 from jet47:gpu-resize
ilya-lavrenov [Fri, 23 Aug 2013 14:38:31 +0000 (18:38 +0400)]
the code was refactored and old test system code was removed
ilya-lavrenov [Thu, 22 Aug 2013 14:03:05 +0000 (18:03 +0400)]
most of the performance tests was rewritten in google-test manner
Roy Reapor [Mon, 26 Aug 2013 02:55:00 +0000 (19:55 -0700)]
Ignore Windows' Thumbs.db
Roman Donchenko [Fri, 23 Aug 2013 14:43:06 +0000 (18:43 +0400)]
Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.
Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.
Roman Donchenko [Fri, 23 Aug 2013 14:41:13 +0000 (18:41 +0400)]
Refactored NumPy detection.
Most importantly, added support for multiple include directores,
but also did some general cleanup.
Roman Donchenko [Fri, 23 Aug 2013 14:31:51 +0000 (18:31 +0400)]
Bumped minimal Python version to 2.6.
Rationale: we already depend on it (e.g. some scripts use print_function).
Roman Donchenko [Fri, 23 Aug 2013 14:24:02 +0000 (18:24 +0400)]
Removed old Python detection cruft.
None of this should be relevant as of CMake 2.8.7.
Maria Dimashova [Fri, 23 Aug 2013 14:13:10 +0000 (18:13 +0400)]
fixed cpp wrappers of ML tree-based models
Vladislav Vinogradov [Fri, 23 Aug 2013 09:46:29 +0000 (13:46 +0400)]
used global memory access for up-scaling
Roman Donchenko [Fri, 23 Aug 2013 12:54:48 +0000 (16:54 +0400)]
Merge pull request #1335 from alekcac:ios-build-fix
Roman Donchenko [Fri, 23 Aug 2013 12:49:51 +0000 (16:49 +0400)]
Merge pull request #1334 from MarkBelmont:bugfix_1
Alexander Shishkov [Fri, 23 Aug 2013 12:09:41 +0000 (16:09 +0400)]
fix CMake changes
Roman Donchenko [Fri, 23 Aug 2013 11:56:10 +0000 (15:56 +0400)]
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231
Roman Donchenko [Fri, 23 Aug 2013 11:43:07 +0000 (15:43 +0400)]
Merge pull request #1234 from SpecLad:ios-plist
Roman Donchenko [Fri, 23 Aug 2013 11:18:05 +0000 (15:18 +0400)]
Merge pull request #1304 from berak:doc_tut_cascade
Roman Donchenko [Fri, 23 Aug 2013 10:48:21 +0000 (14:48 +0400)]
Merge pull request #1323 from SpecLad:find-git
Roman Donchenko [Fri, 23 Aug 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #1332 from pengx17:2.4_fix_parallel
Vladislav Vinogradov [Thu, 22 Aug 2013 08:50:30 +0000 (12:50 +0400)]
improved texture usage:
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
Vladislav Vinogradov [Thu, 22 Aug 2013 08:31:10 +0000 (12:31 +0400)]
added custom implementation for nearest and linear interpolation
Vladislav Vinogradov [Thu, 22 Aug 2013 08:03:17 +0000 (12:03 +0400)]
reorganize code for further modifiction
Alexander Shishkov [Fri, 23 Aug 2013 09:41:19 +0000 (13:41 +0400)]
fixed problems with building iOS version
Alexander Shishkov [Fri, 23 Aug 2013 08:51:50 +0000 (12:51 +0400)]
Update build_framework.py
MarkBelmont [Fri, 23 Aug 2013 08:39:39 +0000 (16:39 +0800)]
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
Kirill Kornyakov [Fri, 23 Aug 2013 08:34:35 +0000 (12:34 +0400)]
bugfix-for-3231
Vladislav Vinogradov [Thu, 22 Aug 2013 07:46:09 +0000 (11:46 +0400)]
removed NPP implementation
Roman Donchenko [Fri, 23 Aug 2013 08:11:41 +0000 (12:11 +0400)]
Merge pull request #1322 from SpecLad:terse
Roman Donchenko [Fri, 23 Aug 2013 08:06:56 +0000 (12:06 +0400)]
Merge pull request #1324 from SpecLad:try-compile
Roman Donchenko [Fri, 23 Aug 2013 08:06:16 +0000 (12:06 +0400)]
Merge pull request #1328 from SpecLad:zlib-update
Changlin Hsieh [Fri, 23 Aug 2013 08:05:35 +0000 (16:05 +0800)]
Update cmake files by using CUDA_CUDA_LIBRARIES
Roman Donchenko [Fri, 23 Aug 2013 08:04:32 +0000 (12:04 +0400)]
Merge pull request #1329 from SpecLad:msvc-werror
peng xiao [Fri, 23 Aug 2013 07:35:55 +0000 (15:35 +0800)]
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
Alexander Alekhin [Thu, 22 Aug 2013 19:33:11 +0000 (23:33 +0400)]
OCL: tests: repair moments implementation in master branch, enable tests
berak [Thu, 22 Aug 2013 16:16:54 +0000 (18:16 +0200)]
rebased commits
berak [Tue, 20 Aug 2013 08:56:57 +0000 (10:56 +0200)]
using VideoCapture instead of CvCapture* in cascade tutorial
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
Roman Donchenko [Thu, 22 Aug 2013 14:25:38 +0000 (18:25 +0400)]
Added warnings-as-errors support for MSVC.
Roman Donchenko [Thu, 22 Aug 2013 14:06:07 +0000 (18:06 +0400)]
Set minimal zlib version to 1.2.3.
Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.
Roman Donchenko [Thu, 22 Aug 2013 14:04:50 +0000 (18:04 +0400)]
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
Roman Donchenko [Thu, 22 Aug 2013 13:59:27 +0000 (17:59 +0400)]
Updated zlib to 1.2.8.
Ilya Lavrenov [Thu, 22 Aug 2013 13:38:55 +0000 (17:38 +0400)]
fixer error with incorrect condition
Ilya Lavrenov [Thu, 22 Aug 2013 13:37:48 +0000 (17:37 +0400)]
added a test for ocl::norm
Alexander Alekhin [Wed, 21 Aug 2013 13:12:55 +0000 (17:12 +0400)]
OCL: tests: repair/disable failed tests in ocl module
Roman Donchenko [Thu, 22 Aug 2013 11:46:13 +0000 (15:46 +0400)]
Fix errors in usages of try_compile
* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.
Roman Donchenko [Thu, 22 Aug 2013 09:28:17 +0000 (13:28 +0400)]
Don't search for Git ourselves - CMake can handle it now.
Roman Donchenko [Thu, 22 Aug 2013 08:46:00 +0000 (12:46 +0400)]
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix
Roman Donchenko [Thu, 22 Aug 2013 08:41:14 +0000 (12:41 +0400)]
Dropped the CMAKE_VERBOSE option.
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
Roman Donchenko [Thu, 22 Aug 2013 07:55:24 +0000 (11:55 +0400)]
Merge pull request #1317 from jet47:gpu-tvl1-optimization
Roman Donchenko [Thu, 22 Aug 2013 07:49:43 +0000 (11:49 +0400)]
Merge pull request #1318 from SpecLad:wow
Alexander Smorkalov [Thu, 22 Aug 2013 06:59:27 +0000 (23:59 -0700)]
WindowsRT mode build warning fix.
Roman Donchenko [Wed, 21 Aug 2013 15:24:25 +0000 (19:24 +0400)]
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
Roman Donchenko [Wed, 21 Aug 2013 14:52:15 +0000 (18:52 +0400)]
Converted tabs to spaces.
Roman Donchenko [Wed, 21 Aug 2013 13:26:54 +0000 (17:26 +0400)]
Normalized file endings.
Roman Donchenko [Wed, 21 Aug 2013 12:44:09 +0000 (16:44 +0400)]
Deleted all trailing whitespace.
Roman Donchenko [Tue, 20 Aug 2013 15:33:23 +0000 (19:33 +0400)]
Disabled whitespace checking for 3rdparty.
Roman Donchenko [Mon, 22 Jul 2013 13:14:08 +0000 (17:14 +0400)]
Added more text/binary/whitespace attributes for files we have.
Roman Donchenko [Wed, 21 Aug 2013 14:34:47 +0000 (18:34 +0400)]
Merge pull request #1305 from SpecLad:perf-precomp
Roman Donchenko [Wed, 21 Aug 2013 14:28:35 +0000 (18:28 +0400)]
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
Alexander Smorkalov [Wed, 21 Aug 2013 10:38:20 +0000 (03:38 -0700)]
C4447 warning about main function format suppressed.
Alexander Smorkalov [Mon, 19 Aug 2013 08:25:53 +0000 (01:25 -0700)]
Invalid usage of cv::Ptr for arrays fixed.
Vladislav Vinogradov [Wed, 21 Aug 2013 14:17:45 +0000 (18:17 +0400)]
minor gpu TVL1 optical flow optimization:
don't calc diff term if it is not used for epsilon criterion
Roman Donchenko [Wed, 21 Aug 2013 12:18:31 +0000 (16:18 +0400)]
Merge pull request #1306 from jet47:gpu-bitwize-fix
Roman Donchenko [Wed, 21 Aug 2013 12:06:27 +0000 (16:06 +0400)]
Merge pull request #942 from achalddave:patch-1
Hanusz Leszek [Wed, 21 Aug 2013 10:33:51 +0000 (12:33 +0200)]
using unsigned char instead of uint8_t to compile under windows
Roman Donchenko [Wed, 21 Aug 2013 09:32:27 +0000 (13:32 +0400)]
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
Roman Donchenko [Wed, 21 Aug 2013 09:25:26 +0000 (13:25 +0400)]
Merge pull request #1215 from jet47:cuda-5.5-sanity
kdrobnyh [Wed, 14 Aug 2013 09:33:17 +0000 (13:33 +0400)]
Add IPP 8.0 support in FindIPP script
Roman Donchenko [Wed, 21 Aug 2013 07:56:29 +0000 (11:56 +0400)]
Merge pull request #1314 from jet47:ts-gpu-fix
Vladislav Vinogradov [Wed, 21 Aug 2013 06:12:44 +0000 (10:12 +0400)]
record cuda gpu name to output report
Vladislav Vinogradov [Wed, 21 Aug 2013 06:00:40 +0000 (10:00 +0400)]
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
Hanusz Leszek [Mon, 19 Aug 2013 17:05:37 +0000 (19:05 +0200)]
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
Roman Donchenko [Tue, 20 Aug 2013 14:04:54 +0000 (18:04 +0400)]
Merge pull request #1298 from jet47:gpu-eliminate-doubles
Vladislav Vinogradov [Tue, 20 Aug 2013 12:28:45 +0000 (16:28 +0400)]
fixed gpu bitwize operation:
incorrect types for template instantiation
Roman Donchenko [Tue, 20 Aug 2013 08:51:33 +0000 (12:51 +0400)]
Fix the name of perf tests' precompiled header.
(cherry picked from commit
aa96d8d053c3d0c367da7c1c1f9c73ed376b3bfa)
Roman Donchenko [Tue, 20 Aug 2013 10:10:21 +0000 (14:10 +0400)]
Merge pull request #1297 from SpecLad:merge-2.4
Roman Donchenko [Tue, 20 Aug 2013 08:51:33 +0000 (12:51 +0400)]
Fix the name of perf tests' precompiled header.
Roman Donchenko [Tue, 20 Aug 2013 08:12:22 +0000 (12:12 +0400)]
Merge pull request #1301 from asmorkalov:java_video_capture_fix
Roman Donchenko [Mon, 19 Aug 2013 10:08:34 +0000 (14:08 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
Alexander Smorkalov [Mon, 19 Aug 2013 12:27:06 +0000 (16:27 +0400)]
Typo in Java generator fixed.
Typo breaks debug build for Android platform.
Vladislav Vinogradov [Thu, 30 May 2013 09:10:11 +0000 (13:10 +0400)]
eliminate unnecessary double arithmetics in CUDA
Roman Donchenko [Mon, 19 Aug 2013 11:00:36 +0000 (15:00 +0400)]
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.