Vadim Pisarevsky
369a3d1426
Merge pull request #3907 from yxiong:python-dependencies
2015-04-10 05:34:14 +00:00
Maksim Shabunin
728bd0ba84
Merge pull request #3905 from mshabunin:fix-android-mk
2015-04-09 12:08:05 +00:00
Alexander Alekhin
c436cac797
Merge pull request #3913 from mshabunin:fix-world-build
2015-04-09 09:24:21 +00:00
Maksim Shabunin
e7c02f376f
Fixed world build with HAL
2015-04-08 19:56:17 +03:00
Maksim Shabunin
f803c2a7bb
Generators: updated the library gathering loop
2015-04-08 14:15:20 +03:00
Сергей Нужный
e630375fd6
Merge branch 'master' of https://github.com/Nuzhny007/opencv
2015-04-08 12:53:04 +03:00
Сергей Нужный
4a65f3cee2
Squashed commit of the following:
...
commit 5c379aa1b8e8008003646967https://github.com/Nuzhny007/opencv
commit e800800bec3646967deb0c24ccf538225da0226e225da0226e3646967deb0c24ccf538225da0226e225da0226e
2015-04-08 12:51:57 +03:00
Сергей Нужный
5c379aa1b8
Merge branch 'master' of https://github.com/Nuzhny007/opencv
2015-04-08 12:44:46 +03:00
Сергей Нужный
e800800bec
Squashed commit of the following:
...
commit 3646967deb0c24ccf538225da0226e225da0226e
2015-04-08 12:43:38 +03:00
Vadim Pisarevsky
5b3f89df0a
Merge pull request #3911 from vpisarev:core_tweaks
2015-04-07 19:03:48 +00:00
Vadim Pisarevsky
edb4a7ad03
Merge pull request #3879 from mshabunin:add-hal
2015-04-07 17:06:58 +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
Сергей Нужный
3646967deb
Fix bug in SVM::trainAuto
2015-04-07 15:48:30 +03:00
Сергей Нужный
0c24ccf538
Revert "Fix bug in SVM::trainAuto"
...
This reverts commit 225da0226e
2015-04-07 15:43:59 +03:00
Сергей Нужный
225da0226e
Fix bug in SVM::trainAuto
2015-04-07 15:09:47 +03:00
Vadim Pisarevsky
44f112a9de
Merge pull request #3906 from yxiong:policy-0042
2015-04-07 09:35:07 +00:00
Vadim Pisarevsky
bd2be9c79c
Merge pull request #3890 from greensea:patch-1
2015-04-07 09:33:36 +00:00
greensea
52c727f09a
Fix a segment fault issue in cascade classfier
...
work_var_count and sample_count are both 32bit integer, if the product of work_var_count and sample_count is bigger than 2^31, the compiler will treat (work_var_count*sample_count) as a negative number. Force work_var_count as an unsigned 64bit integer to avoid this issue.
2015-04-07 10:31:12 +08:00
Ying Xiong
2d8b4fea9f
Add #ifdef's such that python wrapper builds independent of other components
2015-04-06 19:57:10 -04:00
Ying Xiong
9cccd87e79
Silence cmake 3.0+ warnings about MACOSX_RPATH
2015-04-06 16:37:06 -04:00
Nuzhny007
581923fa57
Merge pull request #1 from Itseez/master
...
merge with itseez/opencv/master
2015-04-06 16:24:53 +03:00
Maksim Shabunin
979721c979
Fix generating of android.mk
2015-04-06 16:12:00 +03: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
Vadim Pisarevsky
caa03f72b7
Merge pull request #3694 from Ashod:jp2
2015-04-05 17:57:11 +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
54ab3137d5
Simplified temp filename generation.
2015-04-03 21:01:44 -04:00
Ashod Nakashian
6fd2fdc2e6
Jasper unit-tests and removed a superfluous assertion.
2015-04-03 21:01:43 -04:00
Ashod Nakashian
03ea24f298
Fix for decoding large Jp2 images on Windows.
...
On Windows, the tmpnam function returns a temp filename in the current directory, which has a prepended backslash '\\'.
This subsequently fails the open function.
This patch creates a proper temp filename in the temp folder and makes unlike work by opening the file as short-lived.
2015-04-03 21:01:42 -04:00
Andrew Senin
58f20a3b7f
Ximea camera fix (see issue #4235 )
2015-04-03 22:49:50 +03:00
Vadim Pisarevsky
085b4ca741
Merge pull request #3902 from apavlenko:doc_fix_imwrite_master
2015-04-03 13:26:22 +00:00
Vadim Pisarevsky
be9c6bdd67
Merge pull request #3901 from StevenPuttemans:add_breakrule_cascade_accuracy
2015-04-03 13:24:47 +00:00
Andrey Pavlenko
ed9f933d41
fixing confusing variable naming in a sample code
2015-04-03 14:03:09 +03:00
StevenPuttemans
796c15d3e6
fixing wrong equation in accuracy break rule
2015-04-03 12:54:05 +02:00
Vadim Pisarevsky
240b52151d
Merge pull request #3798 from StevenPuttemans:add_breakrule_cascade_accuracy
2015-04-03 10:19:03 +00:00
Vadim Pisarevsky
559dfa297d
Merge pull request #3813 from hahne:iss1915
2015-04-03 10:16:30 +00:00
StevenPuttemans
7e35f76d06
allowing people to manually define how sharp a cascade classifier model should be trained
2015-04-03 10:02:13 +02: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
da0e2c5bf3
Merge pull request #3889 from nitsch:fix-mingw-cmake
2015-04-02 11:45:20 +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
Vadim Pisarevsky
5ab26e3202
Merge pull request #3874 from paroj:calib_sample
2015-04-01 11:13:05 +00:00
Vadim Pisarevsky
6aaa6a50e3
Merge pull request #3887 from MSOpenTech:update_py_script
2015-04-01 11:05:56 +00:00
Vadim Pisarevsky
80c79d4021
Merge pull request #3891 from mshabunin:fix-v4l2-link
2015-04-01 10:49:52 +00:00
