hbristow [Sun, 15 Sep 2013 14:48:07 +0000 (00:48 +1000)]
Added TODO for the future of Matlab version sorting
hbristow [Sun, 15 Sep 2013 13:53:29 +0000 (23:53 +1000)]
Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process
hbristow [Sun, 15 Sep 2013 07:31:34 +0000 (17:31 +1000)]
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
hbristow [Sat, 14 Sep 2013 03:32:15 +0000 (13:32 +1000)]
Made changes to OpenCVFindMatlab suggested by SpecLad
hbristow [Fri, 13 Sep 2013 08:08:33 +0000 (18:08 +1000)]
Updated OpenCVFindMatlab with changes suggested by SpecLad
hbristow [Fri, 13 Sep 2013 07:22:12 +0000 (17:22 +1000)]
Added fixes to CMakeLists.txt
hbristow [Fri, 6 Sep 2013 06:42:32 +0000 (16:42 +1000)]
Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers
hbristow [Fri, 6 Sep 2013 05:26:05 +0000 (15:26 +1000)]
Removed unused Dynamic from matlab namespace - clashing with Eigen
hbristow [Mon, 2 Sep 2013 14:16:46 +0000 (00:16 +1000)]
Removing trailing whitespace and expanded tabs
hbristow [Mon, 2 Sep 2013 07:44:06 +0000 (17:44 +1000)]
Fixed regular expression for finding Matlab in Windows PATH
hbristow [Mon, 2 Sep 2013 06:43:58 +0000 (16:43 +1000)]
Made binding compilation less verbose
hbristow [Mon, 2 Sep 2013 04:29:46 +0000 (14:29 +1000)]
Added new OpenCV definitions to bridge
hbristow [Mon, 2 Sep 2013 04:25:18 +0000 (14:25 +1000)]
Removed GSOC-specific proposal.pdf from root
hbristow [Mon, 2 Sep 2013 04:23:11 +0000 (14:23 +1000)]
Merge branch 'matlab' into matlab_public
Conflicts:
CMakeLists.txt
README.md
samples/
hbristow [Sun, 1 Sep 2013 07:10:44 +0000 (17:10 +1000)]
manually added optical flow header to build
hbristow [Fri, 30 Aug 2013 06:48:41 +0000 (16:48 +1000)]
Updated cv help to include reference to named arguments
hbristow [Fri, 30 Aug 2013 06:10:32 +0000 (16:10 +1000)]
Fixed handling of optional arguments under ArgumentParser. Fixed default constructor error in MxArray
hbristow [Fri, 30 Aug 2013 05:48:20 +0000 (15:48 +1000)]
Improved error messages for incorrect arguments
hbristow [Fri, 30 Aug 2013 05:06:57 +0000 (15:06 +1000)]
Swapped out function assertions in favour of ArgumentParser
hbristow [Fri, 30 Aug 2013 02:39:01 +0000 (12:39 +1000)]
Brought matlab module into cv namespace
hbristow [Fri, 30 Aug 2013 01:18:08 +0000 (11:18 +1000)]
Removed all OpenCV-specific functionality from mxarray into bridge. mxarray is now standalone
hbristow [Thu, 29 Aug 2013 15:09:29 +0000 (01:09 +1000)]
Added LICENSE and Americanizations
hbristow [Thu, 29 Aug 2013 15:04:43 +0000 (01:04 +1000)]
complete rewrite of ArgumentParser
Roman Donchenko [Thu, 29 Aug 2013 12:35:38 +0000 (16:35 +0400)]
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
Roman Donchenko [Thu, 29 Aug 2013 12:26:55 +0000 (16:26 +0400)]
Merge pull request #1309 from pengx17:master_retina_ocl
Alexander Smorkalov [Sun, 25 Aug 2013 12:33:22 +0000 (16:33 +0400)]
AutoBuffer with initial zero size fixed.
hbristow [Thu, 29 Aug 2013 00:49:15 +0000 (10:49 +1000)]
untracked io for initial pull request
hbristow [Thu, 29 Aug 2013 00:44:27 +0000 (10:44 +1000)]
removed unused files from repo
hbristow [Thu, 29 Aug 2013 00:20:53 +0000 (10:20 +1000)]
Added LICENSE preamble to include files
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.
peng xiao [Wed, 28 Aug 2013 08:23:46 +0000 (16:23 +0800)]
Remove trailing whitespace.
Roman Donchenko [Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)]
Merge pull request #1342 from nevion:master
hbristow [Wed, 28 Aug 2013 07:58:08 +0000 (17:58 +1000)]
updated README.md formatting
hbristow [Wed, 28 Aug 2013 07:56:39 +0000 (17:56 +1000)]
updated syntax highlighting
hbristow [Wed, 28 Aug 2013 07:53:25 +0000 (17:53 +1000)]
updated syntax highlighting
hbristow [Wed, 28 Aug 2013 07:49:20 +0000 (17:49 +1000)]
Enabled syntax highlighting
Roman Donchenko [Wed, 28 Aug 2013 07:44:40 +0000 (11:44 +0400)]
Merge pull request #1248 from vkocheganov:chi_square_alt
hbristow [Wed, 28 Aug 2013 07:40:20 +0000 (17:40 +1000)]
Added tutorial for writing your own mex files
hbristow [Wed, 28 Aug 2013 07:06:19 +0000 (17:06 +1000)]
Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler
hbristow [Wed, 28 Aug 2013 02:01:34 +0000 (12:01 +1000)]
Added custom OpenCV mex compiler
peng xiao [Wed, 28 Aug 2013 01:17:05 +0000 (09:17 +0800)]
Let ocl::context only be initialized once in retina_ocl test.
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