Vadim Pisarevsky
b27467d9f9
Merge pull request #3931 from mshabunin:fix-svm-train
2015-04-20 20:00:36 +00:00
Ahmatnurov Dinar
2358c79db2
move 3265 to 3.0;
2015-04-16 14:36:46 +03:00
Maksim Shabunin
cb00c7036f
Fix cache error during SVM train
2015-04-15 15:46:07 +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
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
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
