mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,150 Commits 6 Branches 126 Tags 3 GiB
931a519969
Commit Graph

11940 Commits

Author SHA1 Message Date
Vadim Pisarevsky
99d0fcf49d Merge pull request #3938 from paroj:triangulatecpp 2015-04-21 12:02:26 +00:00
Vadim Pisarevsky
faf84e7100 Merge pull request #3937 from mshabunin:android-engine3 2015-04-21 11:47:26 +00:00
Pavel Rojtberg
78eac67a01 clean up cvTriangulatePoints by using C++ primitives directly. 
- fixes the Calib3d_StereoCalibrate_C testcase.
update comment regarding cv::SVD::MODIFY_A
 2015-04-21 11:29:26 +02:00
tcavallari
cca78e0601 Null Pointer check in vizimpl.cpp 
Should fix #4191 (http://code.opencv.org/issues/4191)
 2015-04-21 10:08:17 +02:00
Nisarg Thakkar
0fd1203b3b Fixed Doc Errors Bug#4282 2015-04-21 10:37:50 +05:30
Vadim Pisarevsky
b27467d9f9 Merge pull request #3931 from mshabunin:fix-svm-train 2015-04-20 20:00:36 +00:00
Vadim Pisarevsky
6916a1438f fixed some newly introduced compile errors and warnings 2015-04-20 21:34:37 +03:00
Vadim Pisarevsky
ca9a2887fc extended universal intrinsics: added 64-bit integers, improved shift operators, renamed "pack" operations; changed semantics of extended integer multiplication, added v_dotprod. 
also, split intrinsics into separate files. C implementation is compiled only when none of SSE2 or NEON is available.
 2015-04-20 20:27:03 +03:00
Deanna Hood
37f77e7397 Change condition on parallel ellipse case so can only calculate t if necessary 2015-04-18 13:51:32 -04:00
Deanna Hood
5a552b6d8d Regression test for Bug #3989: check fitEllipse with rotation angles of n*pi/2 2015-04-18 13:51:26 -04:00
Pavel Rojtberg
b02fc039cd fix python and numpy output formatters 2015-04-17 17:42:24 +02:00
Maksim Shabunin
a362aca783 Rename manager package to OpenCV3 Manager 2015-04-17 16:59:52 +03:00
Maksim Shabunin
316d76bdb6 Rename OpenCV Engine to org.opencv.engine3 for release candidate 2015-04-17 16:00:33 +03:00
Vadim Pisarevsky
92f2ad0a11 trying to fix test failures (take 2) 2015-04-17 11:32:20 +03:00
Vadim Pisarevsky
17675b4cb8 trying to fix test failures 2015-04-17 10:51:49 +03:00
Vadim Pisarevsky
ce7590bd24 continuing fixing universal intrinsics 2015-04-17 08:32:06 +03:00
Vadim Pisarevsky
bfbf864a73 fixed some more compile warnings (2) 2015-04-17 00:13:08 +03:00
Vadim Pisarevsky
1fcc83b84b fixed some more compile warnings 2015-04-16 23:52:23 +03:00
Vadim Pisarevsky
c7121e8772 fixed compile warnings 2015-04-16 23:42:00 +03:00
Vadim Pisarevsky
ee11a2d266 fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions 2015-04-16 23:00:26 +03:00
Deanna Hood
103336c76e Fix Bug #3989: correctly identify ellipse with its axes parallel to x-y axes during semi-major axis calculation 2015-04-16 11:59:05 -04:00
Ahmatnurov Dinar
2358c79db2 move 3265 to 3.0; 2015-04-16 14:36:46 +03:00
Nisarg Thakkar
00094a8792 Fix for Bug4243. Made changes relating to non OpenCL devices 2015-04-16 00:22:08 +05:30
Nisarg Thakkar
a0bc0ab7cb Fix for Bug4243 2015-04-15 23:49:01 +05:30
Maksim Shabunin
cb00c7036f Fix cache error during SVM train 2015-04-15 15:46:07 +03:00
Vadim Pisarevsky
a2bba1b9e6 HAL extensions: added initial version of universal intrinsics (C implementation and SSE2, NEON - TBD). added empty files where some functionality from core and imgproc will be moved to 2015-04-15 00:36:27 +03:00
Ilya Lavrenov
17bedd72f0 workaround for stange internal compiler error when cross-compiling with 4.6 2015-04-14 16:55:11 +03:00
Daeyun Shin
4686b935c1 Fix typo in documentation. F = K^-T * E * K^-1 2015-04-14 07:44:32 -05:00
Vadim Pisarevsky
b639353193 Merge pull request #3912 from kalistratovag:mjpeg_dec 2015-04-10 16:18:37 +00:00
kalistratovag
740ae3581c Initial commit of avi mjpeg decoder 
std::streams removed

debug code removed

whitespaces removed

stdint.h added and trailing whitespaces removed

trailing whitespaces removed

warnings on windows fix

warnings on windows fix pt 2

Refactoring performed: AviMjpegStream class introduced. CAP_PROP_FRAME_WIDTH and CAP_PROP_FRAME_HEIGHT properties support added.

Windows warnings & uninitialized variable fix

Windows warning fix

Win32 warning fix
 2015-04-10 14:16:43 +03:00
Maksim Shabunin
97c78838a4 Fixed windows build and one warning 2015-04-10 11:37:16 +03:00
Vadim Pisarevsky
369a3d1426 Merge pull request #3907 from yxiong:python-dependencies 2015-04-10 05:34:14 +00:00
Maksim Shabunin
e7c02f376f Fixed world build with HAL 2015-04-08 19:56:17 +03:00
Сергей Нужный
4a65f3cee2 Squashed commit of the following: 
commit 5c379aa1b8
Merge: e800800 3646967
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Wed Apr 8 12:44:46 2015 +0300

    Merge branch 'master' of https://github.com/Nuzhny007/opencv

commit e800800bec
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Wed Apr 8 12:43:38 2015 +0300

    Squashed commit of the following:

    commit 3646967deb
    Author: Сергей Нужный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:48:30 2015 +0300

        Fix bug in SVM::trainAuto

    commit 0c24ccf538
    Author: Сергей Нужный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:43:59 2015 +0300

        Revert "Fix bug in SVM::trainAuto"

        This reverts commit 225da0226e.

    commit 225da0226e
    Author: Сергей Нужный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:09:47 2015 +0300

        Fix bug in SVM::trainAuto

commit 3646967deb
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:48:30 2015 +0300

    Fix bug in SVM::trainAuto

commit 0c24ccf538
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:43:59 2015 +0300

    Revert "Fix bug in SVM::trainAuto"

    This reverts commit 225da0226e.

commit 225da0226e
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:09:47 2015 +0300

    Fix bug in SVM::trainAuto
 2015-04-08 12:51:57 +03:00
Vadim Pisarevsky
5b3f89df0a Merge pull request #3911 from vpisarev:core_tweaks 2015-04-07 19:03:48 +00:00
Vadim Pisarevsky
259e41da73 reverted "typedef _InputArray InputArray", fixed warning from doxygen 2015-04-07 19:34:51 +03:00
Maksim Shabunin
35b2139929 Basic HAL module 2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
052593c760 1. Input/OutputArray optimizations; 
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
 2015-04-07 16:44:26 +03:00
Ying Xiong
2d8b4fea9f Add #ifdef's such that python wrapper builds independent of other components 2015-04-06 19:57:10 -04:00
Vadim Pisarevsky
ac22c524fc Merge pull request #3903 from SeninAndrew:master 2015-04-05 18:01:18 +00:00
Vadim Pisarevsky
08c84e0c34 Merge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix 2015-04-05 17:57:53 +00:00
Ashod Nakashian
f75f2ffd48 Jpeg2k color to greyscale conversion on non-Windows is done post decoding because system libjasper segfaults when decoding color images as greyscale. 2015-04-03 21:01:45 -04:00
Ashod Nakashian
6fd2fdc2e6 Jasper unit-tests and removed a superfluous assertion. 2015-04-03 21:01:43 -04:00
Andrew Senin
58f20a3b7f Ximea camera fix (see issue #4235) 2015-04-03 22:49:50 +03:00
Andrey Pavlenko
ed9f933d41 fixing confusing variable naming in a sample code 2015-04-03 14:03:09 +03:00
Vadim Pisarevsky
559dfa297d Merge pull request #3813 from hahne:iss1915 2015-04-03 10:16:30 +00:00
Vadim Pisarevsky
a035d39158 Merge pull request #3892 from MSOpenTech:imgcodecs-contrib 2015-04-02 11:53:55 +00:00
Vadim Pisarevsky
246b7abe7e Merge pull request #3869 from Dikay900:remove_unused_variable 2015-04-02 11:48:43 +00:00
Vadim Pisarevsky
38ce0fe954 Merge pull request #3897 from sanchom:bugfix_4030 2015-04-02 11:44:32 +00:00
Simon Heinen
d2dc7f4c27 Update android+AsyncServiceHelper.java 
small formatting fixes
 2015-04-02 09:05:56 +02:00
Simon Heinen
0df9dc8fb9 Update android+AsyncServiceHelper.java 
changed tabs in last commit to spaces
 2015-04-02 08:42:19 +02:00
Sancho McCann
6593422c05 Bugfix: #4030 SVM auto-training. 2015-04-01 20:44:51 +00:00
Dikay900
952f9dbe62 initialize tiltedOffset variable at correct location 
do not use this variable if it is not an tilted feature
 2015-04-01 20:32:30 +02:00
Evgeny Agafonchikov
ae090fe10d Functionality for relocation of tests 
This allows to start run.py with --move_tests parameter to place tests

to another location and keep them runnable from there
 2015-04-01 11:50:05 +03:00
Evgeny Agafonchikov
1f04f9d63b Fixing help messages 
--help message and starting run.py w/o parameters generate different messages

E. g. w/ and w/o build_path in the end

build_path is required, removing square brackets
 2015-03-31 17:58:25 +03:00
Maxim Kostin
412a2aa4ab Added support for 'imgcodecs' module: 
- Resolved GET_ENV and input type incompatibility
 - Made libjpeg compile for WINRT. So does imgcodecs module.
 - Updated .gitignore (log, tlog)
 2015-03-31 16:31:37 +03:00
Vadim Pisarevsky
864b4e3b26 Merge pull request #3873 from Dmitry-Me:reduceVariableScope10 2015-03-30 17:20:39 +00:00
Alexander Alekhin
d326c77007 fix build (related to PR #3814) 2015-03-30 16:32:00 +03:00
Vadim Pisarevsky
fa9c9e791b Merge pull request #3876 from vpisarev:mjpeg_codec 2015-03-30 09:27:10 +00:00
Vadim Pisarevsky
602d2c33c0 added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder 2015-03-27 15:15:59 +03:00
Maksim Shabunin
56b02331f7 Commented unused constants in the RHO algorithm 2015-03-27 14:36:27 +03:00
Maksim Shabunin
fab2a947ca Fix build for VC10 2015-03-27 12:15:26 +03:00
Vadim Pisarevsky
77cbddf715 Merge pull request #3847 from mshabunin:android-build 2015-03-26 16:56:49 +00:00
Vadim Pisarevsky
1381564a84 Merge pull request #3880 from vpisarev:fix_emd 2015-03-26 16:40:17 +00:00
Vadim Pisarevsky
b123870871 Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc 2015-03-26 13:35:12 +00:00
Vadim Pisarevsky
b91313a84e initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report) 2015-03-26 16:26:41 +03:00
Vadim Pisarevsky
eff302a231 Merge pull request #3875 from alalek:fix_build 2015-03-26 13:09:01 +00:00
Vadim Pisarevsky
8d1232cc7a fixed warnings; transpose qtab to make it compatible with neon branch 2015-03-26 15:59:49 +03:00
Maksim Shabunin
e94dfcee0d Add python test for inheritance structure generation 2015-03-26 11:43:49 +03:00
Maksim Shabunin
82adf7955f Fix python submodules inheritance detection 2015-03-26 11:22:56 +03:00
Vadim Pisarevsky
3df6b6fdcf added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG" 2015-03-26 00:39:29 +03:00
Alexander Alekhin
32da602bf7 fix build (related to PR #3814) 2015-03-25 19:12:36 +03:00
Dmitry-Me
75a65542ba Reduce variables scope 2015-03-25 17:17:06 +03:00
Vadim Pisarevsky
97bdc92d1b Merge pull request #3870 from Dmitry-Me:reduceVariableScope9 2015-03-25 13:32:33 +00:00
Dikay900
3465cef689 disable cuda::OpticalFlowNeedleMap if configured without cudaimgproc 
disable cuda::FastOpticalFlowBM if configured without cudaarithm
 2015-03-25 13:47:53 +01:00
Vadim Pisarevsky
0545aeb11b Merge pull request #3670 from obilaniu:master 2015-03-25 10:10:05 +00:00
Vadim Pisarevsky
bd7c78ffd5 Merge pull request #3866 from tdsmith:python-linkage 2015-03-25 09:51:20 +00:00
Dmitry-Me
6318409a5d Reduce variable scope 2015-03-25 10:35:11 +03:00
Vadim Pisarevsky
5501cfd809 Merge pull request #3814 from erikrk:denoising-16bit-master 2015-03-24 15:23:58 +00:00
Vadim Pisarevsky
3c51fdffac Merge pull request #3849 from Dikay900:fix_tilted_features_crash 2015-03-24 15:19:13 +00:00
Vadim Pisarevsky
f7f10a7d2c Merge pull request #3854 from Dmitry-Me:reduceVariableScope8 2015-03-24 15:13:34 +00:00
Vadim Pisarevsky
d7cb99254e Merge pull request #3858 from MSOpenTech:fix-ml-test 2015-03-24 15:09:53 +00:00
Vadim Pisarevsky
70ff448067 Merge pull request #3859 from NewProggie:fix-doc-typo 2015-03-24 15:08:03 +00:00
Vadim Pisarevsky
54deb5ed5a Merge pull request #3860 from theodr:document_hconcat_vconcat 2015-03-24 15:07:34 +00:00
theodore
02c3d8d792 documentation for the hconcat and vconcat functions 2015-03-24 13:59:09 +01:00
Tim D. Smith
b9b743bbe3 Don't explicitly link Python on OS X 
Explicitly linking to a Python framework on OS X prevents modules from
being built against one Python (i.e. system python) and imported from
another (i.e. Homebrew python); the interpreter segfaults if there's a
linkage to a foreign Python. Building the module with `-undefined
dynamic_lookup` instead of an explicit link allows the symbols to be
resolved at load time from a compatible python.
 2015-03-23 23:36:46 -07:00
Erik Karlsson
01d3df0d00 Added normType parameter to fastNlMeansDenoisingMulti 2015-03-24 02:01:31 +01:00
Erik Karlsson
70a64ebe72 Added test cases 2015-03-24 01:16:17 +01:00
Erik Karlsson
5f8d688664 Added parameter normType to fastNlMeansDenoising 2015-03-24 00:47:11 +01:00
Erik Karlsson
9fff7896c5 Removed fastNlMeansDenoisingColored[Multi]Abs 2015-03-23 23:23:35 +01:00
Yan Wang
433c3da7cf Optimize the performance of cascade OpenCL kernel. 
1. Use built-in mad() instead of += and *.
2. For stump stages, if weight.z == 0, avoid unnecessary calculation
because some features only have 2 rectangles..

It could improve
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*
about 10% mean values.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
 2015-03-23 17:47:40 +08:00
Vadim Pisarevsky
5a0c7a1330 Merge pull request #3853 from alalek:ocl_fix_bufferpool_cleanup 2015-03-23 08:10:22 +00:00
Vadim Pisarevsky
7ab7322915 Merge pull request #3848 from yxiong:fix-4125 2015-03-23 08:04:41 +00:00
Vadim Pisarevsky
daa99514fa Merge pull request #3846 from mshabunin:fix-headers 2015-03-23 08:01:25 +00:00
Kai Wolf
f815bbab24 Fix typo in types_c.h 2015-03-22 10:55:54 +01:00
Evgeny Agafonchikov
91bd7df8c1 Fixing invalid opencv_test_ml calls 2015-03-20 17:49:03 +03:00
Dikay900
fb8478eb7b add resetting the offset variable after setting a new image 2015-03-20 13:26:13 +01:00
Dmitry-Me
ce167e233b Reduce variable scope 2015-03-20 13:27:08 +03:00
Alexander Alekhin
b5529aef9c ocl/bufferpool: fix cleanup 2015-03-20 13:21:10 +03:00
Vadim Pisarevsky
8616cd875b Merge pull request #3836 from Dmitry-Me:uninitializedMember 2015-03-20 10:03:11 +00:00