hbristow
|
86b7e3d15d
|
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
|
2013-09-15 17:36:13 +10:00 |
|
hbristow
|
224f44a255
|
Made changes to OpenCVFindMatlab suggested by SpecLad
|
2013-09-14 13:32:15 +10:00 |
|
hbristow
|
232f11e256
|
Updated OpenCVFindMatlab with changes suggested by SpecLad
|
2013-09-13 18:08:33 +10:00 |
|
hbristow
|
530ad447bc
|
Added fixes to CMakeLists.txt
|
2013-09-13 17:22:12 +10:00 |
|
hbristow
|
74accbd969
|
Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers
|
2013-09-06 16:42:32 +10:00 |
|
hbristow
|
6964f6aacc
|
Removed unused Dynamic from matlab namespace - clashing with Eigen
|
2013-09-06 15:26:05 +10:00 |
|
hbristow
|
7e5bbec895
|
Removing trailing whitespace and expanded tabs
|
2013-09-03 10:14:45 +10:00 |
|
hbristow
|
f57145dc64
|
Fixed regular expression for finding Matlab in Windows PATH
|
2013-09-02 20:43:33 +10:00 |
|
hbristow
|
c112c9aa00
|
Made binding compilation less verbose
|
2013-09-02 16:43:58 +10:00 |
|
hbristow
|
31c95ff7f8
|
Added new OpenCV definitions to bridge
|
2013-09-02 14:29:46 +10:00 |
|
hbristow
|
40227b78a5
|
Removed GSOC-specific proposal.pdf from root
|
2013-09-02 14:25:18 +10:00 |
|
hbristow
|
cf078be3d6
|
Merge branch 'matlab' into matlab_public
Conflicts:
CMakeLists.txt
README.md
samples/
|
2013-09-02 14:23:11 +10:00 |
|
hbristow
|
1d25e5f1ba
|
manually added optical flow header to build
|
2013-09-01 17:10:44 +10:00 |
|
hbristow
|
a64c34c3ec
|
Updated cv help to include reference to named arguments
|
2013-08-30 16:48:41 +10:00 |
|
hbristow
|
d16d637eb2
|
Fixed handling of optional arguments under ArgumentParser. Fixed default constructor error in MxArray
|
2013-08-30 16:10:32 +10:00 |
|
hbristow
|
25ee1f9099
|
Improved error messages for incorrect arguments
|
2013-08-30 15:48:20 +10:00 |
|
hbristow
|
a780c3a7d1
|
Swapped out function assertions in favour of ArgumentParser
|
2013-08-30 15:06:57 +10:00 |
|
hbristow
|
8f62a52b9b
|
Brought matlab module into cv namespace
|
2013-08-30 12:39:01 +10:00 |
|
hbristow
|
bc93edac34
|
Removed all OpenCV-specific functionality from mxarray into bridge. mxarray is now standalone
|
2013-08-30 11:18:08 +10:00 |
|
hbristow
|
153549c7f6
|
Added LICENSE and Americanizations
|
2013-08-30 01:09:29 +10:00 |
|
hbristow
|
33c377b305
|
complete rewrite of ArgumentParser
|
2013-08-30 01:04:43 +10:00 |
|
Roman Donchenko
|
fc37df05ec
|
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
|
2013-08-29 16:35:38 +04:00 |
|
Roman Donchenko
|
86f4cd253a
|
Merge pull request #1309 from pengx17:master_retina_ocl
|
2013-08-29 16:26:55 +04:00 |
|
Alexander Smorkalov
|
5af2cc6223
|
AutoBuffer with initial zero size fixed.
|
2013-08-29 15:03:53 +04:00 |
|
hbristow
|
d5abe79f74
|
untracked io for initial pull request
|
2013-08-29 10:49:15 +10:00 |
|
hbristow
|
9726346bc9
|
removed unused files from repo
|
2013-08-29 10:44:27 +10:00 |
|
hbristow
|
57505b9af9
|
Added LICENSE preamble to include files
|
2013-08-29 10:20:53 +10:00 |
|
Roman Donchenko
|
11dcd4f4f3
|
Merge pull request #1356 from SpecLad:homography-uninit
|
2013-08-28 18:05:10 +04:00 |
|
Roman Donchenko
|
e59c74e1c7
|
Merge pull request #1348 from SpecLad:merge-2.4
|
2013-08-28 13:41:41 +04:00 |
|
Roman Donchenko
|
5e4ebf3403
|
Fixed incomplete matrix initialization in HomographyRefineCallback.
|
2013-08-28 13:20:14 +04:00 |
|
Roman Donchenko
|
7afc2677e6
|
Removed a duplicate line.
|
2013-08-28 13:13:15 +04:00 |
|
peng xiao
|
9f0a88c1d6
|
Remove trailing whitespace.
|
2013-08-28 16:23:46 +08:00 |
|
Roman Donchenko
|
10cb9a0c4a
|
Merge pull request #1342 from nevion:master
|
2013-08-28 12:00:39 +04:00 |
|
hbristow
|
569e8006e3
|
updated README.md formatting
|
2013-08-28 17:58:08 +10:00 |
|
hbristow
|
2a0e357cd0
|
updated syntax highlighting
|
2013-08-28 17:56:39 +10:00 |
|
hbristow
|
b87197dc37
|
updated syntax highlighting
|
2013-08-28 17:53:25 +10:00 |
|
hbristow
|
eb83a9ed9f
|
Enabled syntax highlighting
|
2013-08-28 17:49:20 +10:00 |
|
Roman Donchenko
|
1840fd5f00
|
Merge pull request #1248 from vkocheganov:chi_square_alt
|
2013-08-28 11:44:41 +04:00 |
|
hbristow
|
2ac31a87c9
|
Added tutorial for writing your own mex files
|
2013-08-28 17:40:20 +10:00 |
|
hbristow
|
78dc2c5423
|
Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler
|
2013-08-28 17:06:19 +10:00 |
|
hbristow
|
52dc51a62c
|
Added custom OpenCV mex compiler
|
2013-08-28 12:01:34 +10:00 |
|
peng xiao
|
287c8a3330
|
Let ocl::context only be initialized once in retina_ocl test.
|
2013-08-28 09:17:05 +08:00 |
|
Roman Donchenko
|
2d6f35d6ed
|
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
|
2013-08-27 19:15:47 +04:00 |
|
Roman Donchenko
|
d32b62a177
|
Merge pull request #1341 from roynos:master
|
2013-08-27 17:47:56 +04:00 |
|
Roman Donchenko
|
dd25f416a6
|
War on Whitespace, master edition: tabs.
|
2013-08-27 17:13:53 +04:00 |
|
Roman Donchenko
|
9ed475cf52
|
War on Whitespace, master edition: file endings.
|
2013-08-27 14:23:26 +04:00 |
|
Roman Donchenko
|
9b92545ce6
|
War on Whitespace, master edition: trailing spaces.
|
2013-08-27 13:57:24 +04:00 |
|
Roman Donchenko
|
2c4bbb313c
|
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
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
4d06c4c7b6
|
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
|
2013-08-27 13:23:26 +04:00 |
|
Roman Donchenko
|
657699a1da
|
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
|
2013-08-27 12:43:36 +04:00 |
|