platform/upstream/opencv.git
10 years agotest for DLS
edgarriba [Sat, 9 Aug 2014 19:26:38 +0000 (21:26 +0200)]
test for DLS

10 years agofixed white space
edgarriba [Sat, 9 Aug 2014 19:08:46 +0000 (21:08 +0200)]
fixed white space

10 years agowarning removed
edgarriba [Sat, 9 Aug 2014 18:55:18 +0000 (20:55 +0200)]
warning removed

10 years agoremove whitespaces
edgarriba [Sat, 9 Aug 2014 18:49:44 +0000 (20:49 +0200)]
remove whitespaces

10 years agoUpdate tutorial
edgarriba [Sat, 9 Aug 2014 17:47:42 +0000 (19:47 +0200)]
Update tutorial

10 years agobug fixed
edgarriba [Sat, 9 Aug 2014 17:15:46 +0000 (19:15 +0200)]
bug fixed

10 years agobug fixed
edgarriba [Sat, 9 Aug 2014 16:16:44 +0000 (18:16 +0200)]
bug fixed

10 years agotutorial update
edgarriba [Sat, 9 Aug 2014 15:32:52 +0000 (17:32 +0200)]
tutorial update

10 years agofixed warnings
edgarriba [Sat, 9 Aug 2014 15:18:47 +0000 (17:18 +0200)]
fixed warnings

10 years agofixed warnings
edgarriba [Sat, 9 Aug 2014 15:14:24 +0000 (17:14 +0200)]
fixed warnings

10 years agovideo opening path modified
edgarriba [Fri, 8 Aug 2014 13:36:27 +0000 (15:36 +0200)]
video opening path modified

10 years agomodified number test points
edgarriba [Fri, 8 Aug 2014 13:20:38 +0000 (15:20 +0200)]
modified number test points

10 years agoremove unused tutorials
edgarriba [Fri, 8 Aug 2014 12:45:43 +0000 (14:45 +0200)]
remove unused tutorials

10 years agoupdated ransanc model
edgarriba [Fri, 8 Aug 2014 11:52:15 +0000 (13:52 +0200)]
updated ransanc model

10 years agoMulti class tutorial compilation
edgarriba [Fri, 8 Aug 2014 09:46:26 +0000 (11:46 +0200)]
Multi class tutorial compilation

10 years agoModification Ransac model points
edgarriba [Thu, 7 Aug 2014 12:59:01 +0000 (14:59 +0200)]
Modification Ransac model points

10 years agomoved headers
edgarriba [Thu, 7 Aug 2014 11:06:24 +0000 (13:06 +0200)]
moved headers

10 years agofixed conflicts
edgarriba [Thu, 7 Aug 2014 10:41:47 +0000 (12:41 +0200)]
fixed conflicts

10 years agoupdate cmake
edgarriba [Thu, 7 Aug 2014 09:55:17 +0000 (11:55 +0200)]
update cmake

10 years agoModified cmake
edgarriba [Thu, 7 Aug 2014 09:33:32 +0000 (11:33 +0200)]
Modified cmake

10 years agoMerge pull request #3047 from prattmic:python2and3
Vadim Pisarevsky [Thu, 7 Aug 2014 06:38:37 +0000 (06:38 +0000)]
Merge pull request #3047 from prattmic:python2and3

10 years agoMerge pull request #3054 from zillatrooper:master
Vadim Pisarevsky [Thu, 7 Aug 2014 06:34:31 +0000 (06:34 +0000)]
Merge pull request #3054 from zillatrooper:master

10 years agoMerge branch 'master' into python2and3
arc [Thu, 7 Aug 2014 05:01:11 +0000 (01:01 -0400)]
Merge branch 'master' into python2and3

10 years agoSupport Python 2 and 3 in test script
Michael Pratt [Thu, 7 Aug 2014 04:51:48 +0000 (00:51 -0400)]
Support Python 2 and 3 in test script

Add Python 3 support to the Python test.py script.

The print function is used in place of the print statement.

The urlopen function has been moved to urllib.request in Python 3, so
attempt to import it from either location.

TestCase.assert_() has been deprecated in place of
TestCase.assertTrue().

The tests all pass in both Python 2 and 3.

10 years agoBuild Python 3 bindings in subdirectory
Michael Pratt [Thu, 7 Aug 2014 04:21:42 +0000 (00:21 -0400)]
Build Python 3 bindings in subdirectory

Build the Python 3 cv2 module in lib/python3/, to avoid potential naming
conflicts with the Python 2 bindings.

The Python 2 bindings are placed directly in lib/, where they are
required for the Buildbot to successfully execute the Python tests.

10 years agoAdd opencv_matlab to Python ignored modules
Michael Pratt [Thu, 7 Aug 2014 04:16:49 +0000 (00:16 -0400)]
Add opencv_matlab to Python ignored modules

Requested by @vpisarev in #3047.

10 years agoMerge pull request #3037 from PhilLab:pnpPatch
Vadim Pisarevsky [Wed, 6 Aug 2014 20:21:05 +0000 (20:21 +0000)]
Merge pull request #3037 from PhilLab:pnpPatch

10 years agofix misinterpretation of empty window name
Björn Wöldecke [Wed, 6 Aug 2014 17:02:48 +0000 (19:02 +0200)]
fix misinterpretation of empty window name

The documentation states, that a NULL or an empty window name can be used
to refer to the control panel. But the string parameters of the C++ frontend
methods cannot be NULL and converting an empty string to a const char* by
c_str() doesn't produce a NULL pointer, but an empty string. Unfortunately,
the const char* pointer is just passed on to the standard C functions in
the QT backend, which doesn't check for the empty string case.

There are two places where the empty string check could have been introduced:
inside the frontend or inside the backend. As long as the documentation only
mentions this as a special case for the QT backend, the best place seems to
be there.

10 years agoMerge pull request #3039 from alalek:ocv_world
Vadim Pisarevsky [Wed, 6 Aug 2014 14:52:52 +0000 (14:52 +0000)]
Merge pull request #3039 from alalek:ocv_world

10 years agoMerge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
Vadim Pisarevsky [Wed, 6 Aug 2014 11:26:07 +0000 (11:26 +0000)]
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate

10 years agoMerge pull request #3041 from adrians:optimize_split
Vadim Pisarevsky [Wed, 6 Aug 2014 09:22:38 +0000 (09:22 +0000)]
Merge pull request #3041 from adrians:optimize_split

10 years agoUpdated Utils functions
edgarriba [Wed, 6 Aug 2014 08:05:26 +0000 (10:05 +0200)]
Updated Utils functions

10 years agoFixed warnings
edgarriba [Wed, 6 Aug 2014 07:21:38 +0000 (09:21 +0200)]
Fixed warnings

10 years agoFixed warnings
edgarriba [Wed, 6 Aug 2014 06:41:14 +0000 (08:41 +0200)]
Fixed warnings

10 years agoPlace Python library out in dedicated folder
Michael Pratt [Wed, 6 Aug 2014 06:31:30 +0000 (02:31 -0400)]
Place Python library out in dedicated folder

Place the built Python module library in a dedicated folder inside of
lib/.  This ensures that even if the Python 2 and Python 3 module names
conflict, they will not overwrite one another.

10 years agoFix a few more PYTHON_NUMPY_INCLUDE_PATH
Michael Pratt [Wed, 6 Aug 2014 06:30:35 +0000 (02:30 -0400)]
Fix a few more PYTHON_NUMPY_INCLUDE_PATH

The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.

10 years agoUpdate headers
edgarriba [Wed, 6 Aug 2014 06:18:11 +0000 (08:18 +0200)]
Update headers

10 years agoAdded code
edgarriba [Wed, 6 Aug 2014 06:12:55 +0000 (08:12 +0200)]
Added code

10 years ago deleted: src/CsvReader.cpp
edgarriba [Wed, 6 Aug 2014 06:11:03 +0000 (08:11 +0200)]
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

10 years agoMerge branch 'master' into python2and3
Michael Pratt [Wed, 6 Aug 2014 05:45:07 +0000 (01:45 -0400)]
Merge branch 'master' into python2and3

10 years agoUpdate tutorial
edgarriba [Tue, 5 Aug 2014 18:06:47 +0000 (20:06 +0200)]
Update tutorial

10 years agomake distrib with world (shared libs)
Alexander Alekhin [Tue, 5 Aug 2014 16:37:18 +0000 (20:37 +0400)]
make distrib with world (shared libs)

10 years agoworld fix
Alexander Alekhin [Fri, 1 Aug 2014 14:11:20 +0000 (18:11 +0400)]
world fix

10 years agoUpdate code
edgarriba [Tue, 5 Aug 2014 15:27:20 +0000 (17:27 +0200)]
Update code

10 years agoRemoved whitespaces
edgarriba [Tue, 5 Aug 2014 15:02:06 +0000 (17:02 +0200)]
Removed whitespaces

10 years agoRemoved whitespace
edgarriba [Tue, 5 Aug 2014 14:53:30 +0000 (16:53 +0200)]
Removed whitespace

10 years agoMerge pull request #3045 from vbystricky:ocl_MeanStdDevFix
Alexander Alekhin [Tue, 5 Aug 2014 14:52:22 +0000 (14:52 +0000)]
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix

10 years agoRemoved whitespace
edgarriba [Tue, 5 Aug 2014 14:41:07 +0000 (16:41 +0200)]
Removed whitespace

10 years agoMerge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
Alexander Alekhin [Tue, 5 Aug 2014 14:17:06 +0000 (14:17 +0000)]
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix

10 years agoMerge pull request #3035 from ElenaGvozdeva:ocl_test_fix
Alexander Alekhin [Tue, 5 Aug 2014 14:16:16 +0000 (14:16 +0000)]
Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix

10 years agoRemoved whitespace
edgarriba [Tue, 5 Aug 2014 14:16:05 +0000 (16:16 +0200)]
Removed whitespace

10 years agoTutorial code restructure
edgarriba [Tue, 5 Aug 2014 13:48:54 +0000 (15:48 +0200)]
Tutorial code restructure

10 years agoFix error in OpenCl version of meanstddev for continues src and not continues mask
vbystricky [Tue, 5 Aug 2014 13:30:06 +0000 (17:30 +0400)]
Fix error in OpenCl version of meanstddev for continues src and not continues mask

10 years agoUpdate for NON BOOST libraries
edgarriba [Tue, 5 Aug 2014 12:47:06 +0000 (14:47 +0200)]
Update for NON BOOST libraries

10 years agoFix epsilon for OpenCL function ConverTo, for convertation from float to integer...
vbystricky [Tue, 5 Aug 2014 12:34:23 +0000 (16:34 +0400)]
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types

10 years agoUpdate for Boost libraries
edgarriba [Tue, 5 Aug 2014 12:02:23 +0000 (14:02 +0200)]
Update for Boost libraries

10 years agoUpdate for Boost libraries
edgarriba [Tue, 5 Aug 2014 12:00:23 +0000 (14:00 +0200)]
Update for Boost libraries

10 years agoUpdate for Boost libraries
edgarriba [Tue, 5 Aug 2014 11:43:01 +0000 (13:43 +0200)]
Update for Boost libraries

10 years agoMerge remote-tracking branch 'upstream/master'
edgarriba [Tue, 5 Aug 2014 10:59:47 +0000 (12:59 +0200)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst

10 years agofixed ocl_integral
Elena Gvozdeva [Tue, 5 Aug 2014 07:55:18 +0000 (11:55 +0400)]
fixed ocl_integral

10 years agofixed test for CvtColor RGB -> Luv
Elena Gvozdeva [Mon, 4 Aug 2014 10:15:21 +0000 (14:15 +0400)]
fixed test for CvtColor RGB -> Luv

10 years agofixed ocl tests for BlendLinear, BoxFilter, Integral
Elena Gvozdeva [Mon, 4 Aug 2014 07:28:48 +0000 (11:28 +0400)]
fixed ocl tests for BlendLinear, BoxFilter, Integral

10 years agoVectorize split & merge for NEON
Adrian Stratulat [Sat, 19 Oct 2013 17:07:08 +0000 (17:07 +0000)]
Vectorize split & merge for NEON

10 years agoMerge pull request #2879 from alalek:ocl_runtime_flags
Vadim Pisarevsky [Mon, 4 Aug 2014 16:43:00 +0000 (16:43 +0000)]
Merge pull request #2879 from alalek:ocl_runtime_flags

10 years agoMerge pull request #3036 from vbystricky:ocl_NormAccurTestFix
Vadim Pisarevsky [Mon, 4 Aug 2014 14:54:12 +0000 (14:54 +0000)]
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix

10 years agoMerge pull request #3032 from vpisarev:refactor_ml2
Vadim Pisarevsky [Mon, 4 Aug 2014 14:51:37 +0000 (14:51 +0000)]
Merge pull request #3032 from vpisarev:refactor_ml2

10 years agoDouble precision for solvePnPRansac()
unknown [Mon, 4 Aug 2014 12:12:48 +0000 (14:12 +0200)]
Double precision for solvePnPRansac()

10 years agoPrevent generating test case with mask filled 0 only
vbystricky [Mon, 4 Aug 2014 11:12:36 +0000 (15:12 +0400)]
Prevent generating test case with mask filled 0 only

10 years agofixed more compile warnings on Windows
Vadim Pisarevsky [Mon, 4 Aug 2014 10:22:31 +0000 (14:22 +0400)]
fixed more compile warnings on Windows

10 years agoMerge pull request #3034 from jet47:fix-compilation
Vadim Pisarevsky [Mon, 4 Aug 2014 09:38:34 +0000 (09:38 +0000)]
Merge pull request #3034 from jet47:fix-compilation

10 years agofix test_opencv_imgproc compilation
Vladislav Vinogradov [Mon, 4 Aug 2014 08:13:33 +0000 (12:13 +0400)]
fix test_opencv_imgproc compilation

10 years agofix python module compilation with enabled CUDA support:
Vladislav Vinogradov [Mon, 4 Aug 2014 08:12:51 +0000 (12:12 +0400)]
fix python module compilation with enabled CUDA support:

filterout all CUDA related headers from python module include headers

10 years agoMerge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
Alexander Alekhin [Mon, 4 Aug 2014 08:09:38 +0000 (08:09 +0000)]
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix

10 years agohopefully fixed test failure on Linux
Vadim Pisarevsky [Sun, 3 Aug 2014 21:16:45 +0000 (01:16 +0400)]
hopefully fixed test failure on Linux

10 years agocontinuing to debug boost and fix MSVC compile errors
Vadim Pisarevsky [Sun, 3 Aug 2014 17:21:11 +0000 (21:21 +0400)]
continuing to debug boost and fix MSVC compile errors

10 years agofixed the condition
Vadim Pisarevsky [Sun, 3 Aug 2014 09:15:43 +0000 (13:15 +0400)]
fixed the condition

10 years agomore fixes and more debugging code
Vadim Pisarevsky [Sun, 3 Aug 2014 09:08:03 +0000 (13:08 +0400)]
more fixes and more debugging code

10 years agofixed compile warnings from MSVC; fixed warnings in Python bindings; added some debug...
Vadim Pisarevsky [Sun, 3 Aug 2014 08:46:28 +0000 (12:46 +0400)]
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code

10 years agotemporarily disabled java bindings for ml; hopefully fixed warnings etc.
Vadim Pisarevsky [Sun, 3 Aug 2014 00:28:31 +0000 (04:28 +0400)]
temporarily disabled java bindings for ml; hopefully fixed warnings etc.

10 years agotemporarily disabled java bindings for ml; hopefully fixed warnings etc.
Vadim Pisarevsky [Sun, 3 Aug 2014 00:28:20 +0000 (04:28 +0400)]
temporarily disabled java bindings for ml; hopefully fixed warnings etc.

10 years agoremoved many extra whitespaces; fixed 1 warning
Vadim Pisarevsky [Sat, 2 Aug 2014 23:08:25 +0000 (03:08 +0400)]
removed many extra whitespaces; fixed 1 warning

10 years agofixed building html docs
Vadim Pisarevsky [Sat, 2 Aug 2014 22:34:47 +0000 (02:34 +0400)]
fixed building html docs

10 years agoMerge pull request #3027 from vbystricky:cvtColorLuv2RGB
Vadim Pisarevsky [Sat, 2 Aug 2014 21:52:24 +0000 (21:52 +0000)]
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB

10 years agoupdated docs
Vadim Pisarevsky [Sat, 2 Aug 2014 21:41:30 +0000 (01:41 +0400)]
updated docs

10 years agomade everything compile and even run somehow
Vadim Pisarevsky [Sat, 2 Aug 2014 21:41:09 +0000 (01:41 +0400)]
made everything compile and even run somehow

10 years agoIncrease epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
VBystricky [Sat, 2 Aug 2014 09:21:34 +0000 (13:21 +0400)]
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests

10 years agoMerge pull request #3011 from vbystricky:oclopt_morthosmall
Alexander Alekhin [Fri, 1 Aug 2014 17:21:59 +0000 (17:21 +0000)]
Merge pull request #3011 from vbystricky:oclopt_morthosmall

10 years agoMerge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
Alexander Alekhin [Fri, 1 Aug 2014 17:15:53 +0000 (17:15 +0000)]
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix

10 years agoMerge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix
Alexander Alekhin [Fri, 1 Aug 2014 17:15:38 +0000 (17:15 +0000)]
Merge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix

10 years agoChange min-max to clamp
VBystricky [Fri, 1 Aug 2014 15:45:11 +0000 (19:45 +0400)]
Change min-max to clamp

10 years agoFix accurency test for OpenCL matrix operations
vbystricky [Fri, 1 Aug 2014 14:30:20 +0000 (18:30 +0400)]
Fix accurency test for OpenCL matrix operations

10 years agoFix accurency test of OpenCL merge function.
vbystricky [Fri, 1 Aug 2014 13:53:24 +0000 (17:53 +0400)]
Fix accurency test of OpenCL merge function.

10 years agoMerge pull request #2671 from syilma:HomographyDecomp
Vadim Pisarevsky [Fri, 1 Aug 2014 13:08:20 +0000 (13:08 +0000)]
Merge pull request #2671 from syilma:HomographyDecomp

10 years agoMerge pull request #3018 from fradelg:master
Vadim Pisarevsky [Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)]
Merge pull request #3018 from fradelg:master

10 years agoFix Luv2RGB function
vbystricky [Fri, 1 Aug 2014 10:18:35 +0000 (14:18 +0400)]
Fix Luv2RGB function

10 years agoMerge pull request #3024 from jet47:fix-cudabgsegm-compilation
Vadim Pisarevsky [Fri, 1 Aug 2014 09:42:40 +0000 (09:42 +0000)]
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation

10 years agoMerge pull request #2608 from Siddharthk:master
Vadim Pisarevsky [Fri, 1 Aug 2014 09:13:32 +0000 (09:13 +0000)]
Merge pull request #2608 from Siddharthk:master

10 years agoMerge pull request #3023 from vbystricky:ocl_minMaxLoc
Alexander Alekhin [Fri, 1 Aug 2014 08:57:37 +0000 (08:57 +0000)]
Merge pull request #3023 from vbystricky:ocl_minMaxLoc

10 years agoUpdate for non Eigen users
edgarriba [Fri, 1 Aug 2014 08:48:39 +0000 (10:48 +0200)]
Update for non Eigen users

10 years agoRemoved OpticalFlowBM test from cudaoptflow module
Fco. Javier Delgado del Hoyo [Fri, 1 Aug 2014 07:28:19 +0000 (09:28 +0200)]
Removed OpticalFlowBM test from cudaoptflow module