Michael Pratt
|
976c727eec
|
Fix a few more PYTHON_NUMPY_INCLUDE_PATH
The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.
|
2014-08-06 02:30:35 -04:00 |
|
edgarriba
|
e14f91dd37
|
Update headers
|
2014-08-06 08:18:11 +02:00 |
|
edgarriba
|
ddf5c86f3a
|
Added code
|
2014-08-06 08:12:55 +02:00 |
|
edgarriba
|
57d2cb8962
|
deleted: src/CsvReader.cpp
deleted: src/CsvReader.h
deleted: src/CsvWriter.cpp
deleted: src/CsvWriter.h
deleted: src/Mesh.cpp
deleted: src/Mesh.h
deleted: src/Model.cpp
deleted: src/Model.h
deleted: src/ModelRegistration.cpp
deleted: src/ModelRegistration.h
deleted: src/PnPProblem.cpp
deleted: src/PnPProblem.h
deleted: src/RobustMatcher.cpp
deleted: src/RobustMatcher.h
deleted: src/Utils.cpp
deleted: src/Utils.h
deleted: src/main_detection.cpp
deleted: src/main_registration.cpp
deleted: src/main_verification.cpp
deleted: src/test_pnp.cpp
|
2014-08-06 08:11:03 +02:00 |
|
Michael Pratt
|
218b12c557
|
Merge branch 'master' into python2and3
|
2014-08-06 01:45:07 -04:00 |
|
edgarriba
|
43301096d3
|
Update tutorial
|
2014-08-05 20:06:47 +02:00 |
|
Alexander Alekhin
|
fc0f254f00
|
make distrib with world (shared libs)
|
2014-08-05 20:37:18 +04:00 |
|
Alexander Alekhin
|
55188fe991
|
world fix
|
2014-08-05 20:12:35 +04:00 |
|
edgarriba
|
7b0be9cf8f
|
Update code
|
2014-08-05 17:27:20 +02:00 |
|
edgarriba
|
0d2bc9b0a1
|
Removed whitespaces
|
2014-08-05 17:02:06 +02:00 |
|
edgarriba
|
2353436cb5
|
Removed whitespace
|
2014-08-05 16:53:30 +02:00 |
|
Alexander Alekhin
|
d2f1c00719
|
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
|
2014-08-05 14:52:22 +00:00 |
|
edgarriba
|
4447dbe265
|
Removed whitespace
|
2014-08-05 16:41:07 +02:00 |
|
Alexander Alekhin
|
06547120aa
|
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
|
2014-08-05 14:17:06 +00:00 |
|
Alexander Alekhin
|
74d2a6eed1
|
Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix
|
2014-08-05 14:16:16 +00:00 |
|
edgarriba
|
e3afc32693
|
Removed whitespace
|
2014-08-05 16:16:05 +02:00 |
|
edgarriba
|
55819ae464
|
Tutorial code restructure
|
2014-08-05 15:48:54 +02:00 |
|
vbystricky
|
774d277c1f
|
Fix error in OpenCl version of meanstddev for continues src and not continues mask
|
2014-08-05 17:30:06 +04:00 |
|
edgarriba
|
23785faf02
|
Update for NON BOOST libraries
|
2014-08-05 14:47:06 +02:00 |
|
vbystricky
|
2637b18b67
|
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
|
2014-08-05 16:34:23 +04:00 |
|
edgarriba
|
16e750dd37
|
Update for Boost libraries
|
2014-08-05 14:02:23 +02:00 |
|
edgarriba
|
1727e0acf6
|
Update for Boost libraries
|
2014-08-05 14:00:23 +02:00 |
|
edgarriba
|
dfa3ccdea9
|
Update for Boost libraries
|
2014-08-05 13:43:01 +02:00 |
|
edgarriba
|
a3e74ec521
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
|
2014-08-05 12:59:47 +02:00 |
|
Elena Gvozdeva
|
7999fbf765
|
fixed ocl_integral
|
2014-08-05 12:01:28 +04:00 |
|
Elena Gvozdeva
|
f32b52ea8d
|
fixed test for CvtColor RGB -> Luv
|
2014-08-05 11:54:26 +04:00 |
|
Elena Gvozdeva
|
8c2c3b54d9
|
fixed ocl tests for BlendLinear, BoxFilter, Integral
|
2014-08-05 11:41:08 +04:00 |
|
Adrian Stratulat
|
b2acd1f75a
|
Vectorize split & merge for NEON
|
2014-08-05 06:51:36 +00:00 |
|
Vadim Pisarevsky
|
a05ce00a65
|
Merge pull request #2879 from alalek:ocl_runtime_flags
|
2014-08-04 16:43:01 +00:00 |
|
Vadim Pisarevsky
|
a58767eff8
|
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
|
2014-08-04 14:54:12 +00:00 |
|
Vadim Pisarevsky
|
432b7cb235
|
Merge pull request #3032 from vpisarev:refactor_ml2
|
2014-08-04 14:51:38 +00:00 |
|
Yury Gorbachev
|
61423a2d47
|
ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions.
NOT verified on target platform, compilation passes with and without NEON.
|
2014-08-04 16:44:51 +04:00 |
|
unknown
|
3fe4980ce1
|
Double precision for solvePnPRansac()
|
2014-08-04 14:20:32 +02:00 |
|
vbystricky
|
2d587ad691
|
Prevent generating test case with mask filled 0 only
|
2014-08-04 15:12:36 +04:00 |
|
Vadim Pisarevsky
|
cb9b88e65b
|
fixed more compile warnings on Windows
|
2014-08-04 14:22:31 +04:00 |
|
Vadim Pisarevsky
|
dbedc63c55
|
Merge pull request #3034 from jet47:fix-compilation
|
2014-08-04 09:38:34 +00:00 |
|
Vladislav Vinogradov
|
a3da3a01e1
|
fix test_opencv_imgproc compilation
|
2014-08-04 12:13:33 +04:00 |
|
Vladislav Vinogradov
|
cdb7b83741
|
fix python module compilation with enabled CUDA support:
filterout all CUDA related headers from python module include headers
|
2014-08-04 12:12:51 +04:00 |
|
Alexander Alekhin
|
add9ce46c3
|
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
|
2014-08-04 08:09:38 +00:00 |
|
Vadim Pisarevsky
|
222f8a3d5e
|
hopefully fixed test failure on Linux
|
2014-08-04 01:16:45 +04:00 |
|
Vadim Pisarevsky
|
24b01a8e4f
|
continuing to debug boost and fix MSVC compile errors
|
2014-08-03 21:21:11 +04:00 |
|
Vadim Pisarevsky
|
98a1181240
|
fixed the condition
|
2014-08-03 13:15:43 +04:00 |
|
Vadim Pisarevsky
|
79b593d8d8
|
more fixes and more debugging code
|
2014-08-03 13:08:03 +04:00 |
|
Vadim Pisarevsky
|
eeb786fcfd
|
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code
|
2014-08-03 12:46:28 +04:00 |
|
Vadim Pisarevsky
|
9cb79b9abb
|
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
|
2014-08-03 04:28:31 +04:00 |
|
Vadim Pisarevsky
|
8e9d1d9fe6
|
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
|
2014-08-03 04:28:20 +04:00 |
|
Vadim Pisarevsky
|
2520e335d1
|
removed many extra whitespaces; fixed 1 warning
|
2014-08-03 03:08:25 +04:00 |
|
Vadim Pisarevsky
|
28ca6ac05e
|
fixed building html docs
|
2014-08-03 02:34:47 +04:00 |
|
Vadim Pisarevsky
|
d3cdfefa03
|
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
|
2014-08-02 21:52:24 +00:00 |
|
Vadim Pisarevsky
|
c6593d02a6
|
updated docs
|
2014-08-03 01:41:30 +04:00 |
|