platform/upstream/opencv.git
9 years agoFixed a typo, "requited" -> "required"
Samed Ozdemir [Tue, 28 Apr 2015 03:00:39 +0000 (23:00 -0400)]
Fixed a typo, "requited" -> "required"

9 years agoMerge tag '3.0.0-rc1'
Alexander Alekhin [Fri, 24 Apr 2015 11:56:47 +0000 (14:56 +0300)]
Merge tag '3.0.0-rc1'

9 years agoMerge pull request #3958 from ilya-lavrenov:cuda_aarch64
Vadim Pisarevsky [Thu, 23 Apr 2015 17:16:52 +0000 (17:16 +0000)]
Merge pull request #3958 from ilya-lavrenov:cuda_aarch64

9 years agoMerge pull request #3957 from dhood:fm-8pt-bug
Vadim Pisarevsky [Thu, 23 Apr 2015 17:16:25 +0000 (17:16 +0000)]
Merge pull request #3957 from dhood:fm-8pt-bug

9 years agoport of aarch64 cuda changes from 2.4
Ilya Lavrenov [Thu, 23 Apr 2015 14:57:29 +0000 (17:57 +0300)]
port of aarch64 cuda changes from 2.4

9 years agoSet status to rc
Alexander Alekhin [Thu, 23 Apr 2015 14:29:40 +0000 (17:29 +0300)]
Set status to rc

9 years agoMerge pull request #3955 from vpisarev:fixed_mjpeg_encoder
Vadim Pisarevsky [Thu, 23 Apr 2015 14:21:31 +0000 (14:21 +0000)]
Merge pull request #3955 from vpisarev:fixed_mjpeg_encoder

9 years agoFix Bug #3441, #4072, #4173: 8-point fundamental matrix calculation error
Deanna Hood [Thu, 23 Apr 2015 14:09:48 +0000 (10:09 -0400)]
Fix Bug #3441, #4072, #4173: 8-point fundamental matrix calculation error

9 years agoDon't relax error level for particular fundamental matrix calculation methods
Deanna Hood [Thu, 23 Apr 2015 14:08:42 +0000 (10:08 -0400)]
Don't relax error level for particular fundamental matrix calculation methods

9 years agofixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes...
Vadim Pisarevsky [Thu, 23 Apr 2015 11:40:44 +0000 (14:40 +0300)]
fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream

9 years agoMerge pull request #3952 from vpisarev:fix_libav_case
Vadim Pisarevsky [Thu, 23 Apr 2015 06:25:25 +0000 (06:25 +0000)]
Merge pull request #3952 from vpisarev:fix_libav_case

9 years agofixed compile warnings; hopefully fixed test failures
Vadim Pisarevsky [Wed, 22 Apr 2015 21:39:44 +0000 (00:39 +0300)]
fixed compile warnings; hopefully fixed test failures

9 years agoMerge pull request #3950 from paroj:fix-gftt_ocl
Vadim Pisarevsky [Wed, 22 Apr 2015 19:08:15 +0000 (19:08 +0000)]
Merge pull request #3950 from paroj:fix-gftt_ocl

9 years agoMerge pull request #3951 from kalistratovag:mjpeg_dec_uninitialized
Vadim Pisarevsky [Wed, 22 Apr 2015 19:03:20 +0000 (19:03 +0000)]
Merge pull request #3951 from kalistratovag:mjpeg_dec_uninitialized

9 years agomake sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu...
Vadim Pisarevsky [Wed, 22 Apr 2015 18:57:29 +0000 (21:57 +0300)]
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)

9 years agomjpec_decoder initialize m_movi_start variable
kalistratovag [Wed, 22 Apr 2015 16:49:11 +0000 (19:49 +0300)]
mjpec_decoder initialize m_movi_start variable

9 years agofix gftt opencv kernel when using mask
Pavel Rojtberg [Wed, 22 Apr 2015 14:13:50 +0000 (16:13 +0200)]
fix gftt opencv kernel when using mask

9 years agoMerge pull request #3939 from paroj:fmtfix
Vadim Pisarevsky [Wed, 22 Apr 2015 12:15:17 +0000 (12:15 +0000)]
Merge pull request #3939 from paroj:fmtfix

9 years agoMerge pull request #3936 from dhood:fitEllipse-bug
Vadim Pisarevsky [Wed, 22 Apr 2015 11:22:35 +0000 (11:22 +0000)]
Merge pull request #3936 from dhood:fitEllipse-bug

9 years agoMerge pull request #3948 from PhilLab:markdownPatch
Vadim Pisarevsky [Wed, 22 Apr 2015 11:02:50 +0000 (11:02 +0000)]
Merge pull request #3948 from PhilLab:markdownPatch

9 years agoFixed markdown: **Note** -> @note
Philipp Hasper [Wed, 22 Apr 2015 06:08:10 +0000 (08:08 +0200)]
Fixed markdown: **Note** -> @note

9 years agoMerge pull request #3909 from Nuzhny007:master
Vadim Pisarevsky [Tue, 21 Apr 2015 14:02:59 +0000 (14:02 +0000)]
Merge pull request #3909 from Nuzhny007:master

9 years agoMerge pull request #3935 from vpisarev:extending_hal_part1
Vadim Pisarevsky [Tue, 21 Apr 2015 14:02:02 +0000 (14:02 +0000)]
Merge pull request #3935 from vpisarev:extending_hal_part1

9 years agoMerge pull request #3947 from tcavallari:patch-1
Vadim Pisarevsky [Tue, 21 Apr 2015 14:01:22 +0000 (14:01 +0000)]
Merge pull request #3947 from tcavallari:patch-1

9 years agoMerge pull request #3925 from ttagu99:findcontour_example2
Vadim Pisarevsky [Tue, 21 Apr 2015 12:21:36 +0000 (12:21 +0000)]
Merge pull request #3925 from ttagu99:findcontour_example2

9 years agoMerge pull request #3926 from stoneyang:stone
Vadim Pisarevsky [Tue, 21 Apr 2015 12:20:42 +0000 (12:20 +0000)]
Merge pull request #3926 from stoneyang:stone

9 years agoMerge pull request #3929 from daeyun:findEssentialMat_doc
Vadim Pisarevsky [Tue, 21 Apr 2015 12:20:02 +0000 (12:20 +0000)]
Merge pull request #3929 from daeyun:findEssentialMat_doc

9 years agoMerge pull request #3930 from berak:python_docs_stereobm
Vadim Pisarevsky [Tue, 21 Apr 2015 12:19:37 +0000 (12:19 +0000)]
Merge pull request #3930 from berak:python_docs_stereobm

9 years agoMerge pull request #3932 from nisargthakkar:Bug4243
Vadim Pisarevsky [Tue, 21 Apr 2015 12:18:37 +0000 (12:18 +0000)]
Merge pull request #3932 from nisargthakkar:Bug4243

9 years agoMerge pull request #3921 from sergarrido:master
Vadim Pisarevsky [Tue, 21 Apr 2015 12:11:56 +0000 (12:11 +0000)]
Merge pull request #3921 from sergarrido:master

9 years agoMerge pull request #3938 from paroj:triangulatecpp
Vadim Pisarevsky [Tue, 21 Apr 2015 12:02:26 +0000 (12:02 +0000)]
Merge pull request #3938 from paroj:triangulatecpp

9 years agoMerge pull request #3937 from mshabunin:android-engine3
Vadim Pisarevsky [Tue, 21 Apr 2015 11:47:26 +0000 (11:47 +0000)]
Merge pull request #3937 from mshabunin:android-engine3

9 years agoMerge pull request #3945 from nisargthakkar:DocBugFix4282
Vadim Pisarevsky [Tue, 21 Apr 2015 11:46:30 +0000 (11:46 +0000)]
Merge pull request #3945 from nisargthakkar:DocBugFix4282

9 years agoanother attempt to resolve ABI checker complains
Vadim Pisarevsky [Tue, 21 Apr 2015 09:42:46 +0000 (12:42 +0300)]
another attempt to resolve ABI checker complains

9 years agoclean up cvTriangulatePoints by using C++ primitives directly.
Pavel Rojtberg [Fri, 17 Apr 2015 15:01:17 +0000 (17:01 +0200)]
clean up cvTriangulatePoints by using C++ primitives directly.
- fixes the Calib3d_StereoCalibrate_C testcase.
update comment regarding cv::SVD::MODIFY_A

9 years agotrying to avoid ABI checker failures
Vadim Pisarevsky [Tue, 21 Apr 2015 08:30:41 +0000 (11:30 +0300)]
trying to avoid ABI checker failures

9 years agoNull Pointer check in vizimpl.cpp
tcavallari [Tue, 21 Apr 2015 08:08:17 +0000 (10:08 +0200)]
Null Pointer check in vizimpl.cpp

Should fix #4191 (http://code.opencv.org/issues/4191)

9 years agoFixed Doc Errors Bug#4282
Nisarg Thakkar [Tue, 21 Apr 2015 05:07:50 +0000 (10:37 +0530)]
Fixed Doc Errors Bug#4282

9 years agoMerge pull request #3931 from mshabunin:fix-svm-train
Vadim Pisarevsky [Mon, 20 Apr 2015 20:00:36 +0000 (20:00 +0000)]
Merge pull request #3931 from mshabunin:fix-svm-train

9 years agoMerge pull request #3933 from BKNio:putText_3_0
Vadim Pisarevsky [Mon, 20 Apr 2015 20:00:11 +0000 (20:00 +0000)]
Merge pull request #3933 from BKNio:putText_3_0

9 years agofixed some newly introduced compile errors and warnings
Vadim Pisarevsky [Mon, 20 Apr 2015 18:34:37 +0000 (21:34 +0300)]
fixed some newly introduced compile errors and warnings

9 years agoextended universal intrinsics: added 64-bit integers, improved shift operators, renam...
Vadim Pisarevsky [Mon, 20 Apr 2015 17:27:03 +0000 (20:27 +0300)]
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.

9 years agoChange condition on parallel ellipse case so can only calculate t if necessary
Deanna Hood [Sat, 18 Apr 2015 16:27:41 +0000 (12:27 -0400)]
Change condition on parallel ellipse case so can only calculate t if necessary

9 years agoRegression test for Bug #3989: check fitEllipse with rotation angles of n*pi/2
Deanna Hood [Thu, 16 Apr 2015 23:54:53 +0000 (19:54 -0400)]
Regression test for Bug #3989: check fitEllipse with rotation angles of n*pi/2

9 years agofix python and numpy output formatters
Pavel Rojtberg [Fri, 17 Apr 2015 15:42:24 +0000 (17:42 +0200)]
fix python and numpy output formatters

9 years agoRename manager package to OpenCV3 Manager
Maksim Shabunin [Fri, 17 Apr 2015 13:59:52 +0000 (16:59 +0300)]
Rename manager package to OpenCV3 Manager

9 years agoMerge pull request #3934 from mshabunin:add-cpp-sample-project
Vadim Pisarevsky [Fri, 17 Apr 2015 13:40:34 +0000 (13:40 +0000)]
Merge pull request #3934 from mshabunin:add-cpp-sample-project

9 years agoRename OpenCV Engine to org.opencv.engine3 for release candidate
Maksim Shabunin [Fri, 17 Apr 2015 13:00:33 +0000 (16:00 +0300)]
Rename OpenCV Engine to org.opencv.engine3 for release candidate

9 years agotrying to fix test failures (take 2)
Vadim Pisarevsky [Fri, 17 Apr 2015 08:32:20 +0000 (11:32 +0300)]
trying to fix test failures (take 2)

9 years agotrying to fix test failures
Vadim Pisarevsky [Fri, 17 Apr 2015 07:51:49 +0000 (10:51 +0300)]
trying to fix test failures

9 years agocontinuing fixing universal intrinsics
Vadim Pisarevsky [Fri, 17 Apr 2015 05:32:06 +0000 (08:32 +0300)]
continuing fixing universal intrinsics

9 years agofixed some more compile warnings (2)
Vadim Pisarevsky [Thu, 16 Apr 2015 21:13:08 +0000 (00:13 +0300)]
fixed some more compile warnings (2)

9 years agofixed some more compile warnings
Vadim Pisarevsky [Thu, 16 Apr 2015 20:52:23 +0000 (23:52 +0300)]
fixed some more compile warnings

9 years agofixed compile warnings
Vadim Pisarevsky [Thu, 16 Apr 2015 20:42:00 +0000 (23:42 +0300)]
fixed compile warnings

9 years agofully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic...
Vadim Pisarevsky [Thu, 16 Apr 2015 20:00:26 +0000 (23:00 +0300)]
fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions

9 years agoFix Bug #3989: correctly identify ellipse with its axes parallel to x-y axes during...
Deanna Hood [Thu, 16 Apr 2015 15:59:05 +0000 (11:59 -0400)]
Fix Bug #3989: correctly identify ellipse with its axes parallel to x-y axes during semi-major axis calculation

9 years agoFix an issue in cmake tutorial
Maksim Shabunin [Thu, 16 Apr 2015 14:34:15 +0000 (17:34 +0300)]
Fix an issue in cmake tutorial

9 years agoAdd sample cmake project
Maksim Shabunin [Thu, 16 Apr 2015 14:33:38 +0000 (17:33 +0300)]
Add sample cmake project

9 years agomove 3265 to 3.0;
Ahmatnurov Dinar [Thu, 16 Apr 2015 11:36:46 +0000 (14:36 +0300)]
move 3265 to 3.0;

9 years agoFix for Bug4243. Made changes relating to non OpenCL devices
Nisarg Thakkar [Wed, 15 Apr 2015 18:52:08 +0000 (00:22 +0530)]
Fix for Bug4243. Made changes relating to non OpenCL devices

9 years agoFix for Bug4243
Nisarg Thakkar [Wed, 15 Apr 2015 18:19:01 +0000 (23:49 +0530)]
Fix for Bug4243

9 years agoFix cache error during SVM train
Maksim Shabunin [Wed, 15 Apr 2015 12:46:07 +0000 (15:46 +0300)]
Fix cache error during SVM train

9 years agoHAL extensions: added initial version of universal intrinsics (C implementation and...
Vadim Pisarevsky [Tue, 14 Apr 2015 21:36:27 +0000 (00:36 +0300)]
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

9 years agoMerge pull request #3928 from ilya-lavrenov:android_4.6
Alexander Alekhin [Tue, 14 Apr 2015 18:12:24 +0000 (18:12 +0000)]
Merge pull request #3928 from ilya-lavrenov:android_4.6

9 years agochanged create function in tutorial
berak [Tue, 14 Apr 2015 17:01:48 +0000 (19:01 +0200)]
changed create function in tutorial

9 years agoworkaround for stange internal compiler error when cross-compiling with 4.6
Ilya Lavrenov [Tue, 14 Apr 2015 13:55:11 +0000 (16:55 +0300)]
workaround for stange internal compiler error when cross-compiling with 4.6

9 years agoFix typo in documentation. F = K^-T * E * K^-1
Daeyun Shin [Tue, 14 Apr 2015 12:44:32 +0000 (07:44 -0500)]
Fix typo in documentation. F = K^-T * E * K^-1

9 years agoENH: explicitly declared outputFilename to surpress error C2668
Yang Fan [Tue, 14 Apr 2015 05:39:00 +0000 (13:39 +0800)]
ENH: explicitly declared outputFilename to surpress error C2668

9 years agofindcontour_example check image empty
ttagu99 [Tue, 14 Apr 2015 01:01:53 +0000 (10:01 +0900)]
findcontour_example check image empty

9 years agocompleting and fixing gen_pattern.py
S. Garrido [Sat, 11 Apr 2015 17:03:17 +0000 (19:03 +0200)]
completing and fixing gen_pattern.py

9 years agoMerge pull request #3912 from kalistratovag:mjpeg_dec
Vadim Pisarevsky [Fri, 10 Apr 2015 16:18:37 +0000 (16:18 +0000)]
Merge pull request #3912 from kalistratovag:mjpeg_dec

9 years agoMerge pull request #3916 from mshabunin:fix-winpack-test
Vadim Pisarevsky [Fri, 10 Apr 2015 12:48:31 +0000 (12:48 +0000)]
Merge pull request #3916 from mshabunin:fix-winpack-test

9 years agoInitial commit of avi mjpeg decoder
kalistratovag [Mon, 6 Apr 2015 15:19:22 +0000 (18:19 +0300)]
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

9 years agoFixed windows build and one warning
Maksim Shabunin [Fri, 10 Apr 2015 08:37:16 +0000 (11:37 +0300)]
Fixed windows build and one warning

9 years agoMerge pull request #3907 from yxiong:python-dependencies
Vadim Pisarevsky [Fri, 10 Apr 2015 05:34:14 +0000 (05:34 +0000)]
Merge pull request #3907 from yxiong:python-dependencies

9 years agoMerge pull request #3905 from mshabunin:fix-android-mk
Maksim Shabunin [Thu, 9 Apr 2015 12:08:05 +0000 (12:08 +0000)]
Merge pull request #3905 from mshabunin:fix-android-mk

9 years agoMerge pull request #3913 from mshabunin:fix-world-build
Alexander Alekhin [Thu, 9 Apr 2015 09:24:21 +0000 (09:24 +0000)]
Merge pull request #3913 from mshabunin:fix-world-build

9 years agoFixed world build with HAL
Maksim Shabunin [Wed, 8 Apr 2015 16:16:06 +0000 (19:16 +0300)]
Fixed world build with HAL

9 years agoGenerators: updated the library gathering loop
Maksim Shabunin [Wed, 8 Apr 2015 11:15:20 +0000 (14:15 +0300)]
Generators: updated the library gathering loop

9 years agoMerge branch 'master' of https://github.com/Nuzhny007/opencv
Сергей Нужный [Wed, 8 Apr 2015 09:53:04 +0000 (12:53 +0300)]
Merge branch 'master' of https://github.com/Nuzhny007/opencv

9 years agoSquashed commit of the following:
Сергей Нужный [Wed, 8 Apr 2015 09:51:57 +0000 (12:51 +0300)]
Squashed commit of the following:

commit 5c379aa1b83ddd66f67b1a9c2ccd00e5bac8576e
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 e800800bec8596127274f359e744723a7371b5b7
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Wed Apr 8 12:43:38 2015 +0300

    Squashed commit of the following:

    commit 3646967deb9b48f45c44203e5c96836a8a180218
    Author: Р РЋР ВµРЎР‚гей Р СњРЎС“жный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:48:30 2015 +0300

        Fix bug in SVM::trainAuto

    commit 0c24ccf53897c60dff19193623a97fc4713ce14e
    Author: Р РЋР ВµРЎР‚гей Р СњРЎС“жный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:43:59 2015 +0300

        Revert "Fix bug in SVM::trainAuto"

        This reverts commit 225da0226e4e9d54e97aee488ac2b5ed4e813443.

    commit 225da0226e4e9d54e97aee488ac2b5ed4e813443
    Author: Р РЋР ВµРЎР‚гей Р СњРЎС“жный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:09:47 2015 +0300

        Fix bug in SVM::trainAuto

commit 3646967deb9b48f45c44203e5c96836a8a180218
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:48:30 2015 +0300

    Fix bug in SVM::trainAuto

commit 0c24ccf53897c60dff19193623a97fc4713ce14e
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:43:59 2015 +0300

    Revert "Fix bug in SVM::trainAuto"

    This reverts commit 225da0226e4e9d54e97aee488ac2b5ed4e813443.

commit 225da0226e4e9d54e97aee488ac2b5ed4e813443
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:09:47 2015 +0300

    Fix bug in SVM::trainAuto

9 years agoMerge branch 'master' of https://github.com/Nuzhny007/opencv
Сергей Нужный [Wed, 8 Apr 2015 09:44:46 +0000 (12:44 +0300)]
Merge branch 'master' of https://github.com/Nuzhny007/opencv

9 years agoSquashed commit of the following:
Сергей Нужный [Wed, 8 Apr 2015 09:43:38 +0000 (12:43 +0300)]
Squashed commit of the following:

commit 3646967deb9b48f45c44203e5c96836a8a180218
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:48:30 2015 +0300

    Fix bug in SVM::trainAuto

commit 0c24ccf53897c60dff19193623a97fc4713ce14e
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:43:59 2015 +0300

    Revert "Fix bug in SVM::trainAuto"

    This reverts commit 225da0226e4e9d54e97aee488ac2b5ed4e813443.

commit 225da0226e4e9d54e97aee488ac2b5ed4e813443
Author: РЎРµСЂРіРµР№ РќСѓР¶РЅС‹Р№ <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:09:47 2015 +0300

    Fix bug in SVM::trainAuto

9 years agoMerge pull request #3911 from vpisarev:core_tweaks
Vadim Pisarevsky [Tue, 7 Apr 2015 19:03:48 +0000 (19:03 +0000)]
Merge pull request #3911 from vpisarev:core_tweaks

9 years agoMerge pull request #3879 from mshabunin:add-hal
Vadim Pisarevsky [Tue, 7 Apr 2015 17:06:58 +0000 (17:06 +0000)]
Merge pull request #3879 from mshabunin:add-hal

9 years agoreverted "typedef _InputArray InputArray", fixed warning from doxygen
Vadim Pisarevsky [Tue, 7 Apr 2015 16:34:51 +0000 (19:34 +0300)]
reverted "typedef _InputArray InputArray", fixed warning from doxygen

9 years agoBasic HAL module
Maksim Shabunin [Thu, 26 Mar 2015 12:25:42 +0000 (15:25 +0300)]
Basic HAL module

9 years ago1. Input/OutputArray optimizations;
Vadim Pisarevsky [Tue, 7 Apr 2015 13:44:26 +0000 (16:44 +0300)]
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

9 years agoFix bug in SVM::trainAuto
Сергей Нужный [Tue, 7 Apr 2015 12:48:30 +0000 (15:48 +0300)]
Fix bug in SVM::trainAuto

9 years agoRevert "Fix bug in SVM::trainAuto"
Сергей Нужный [Tue, 7 Apr 2015 12:43:59 +0000 (15:43 +0300)]
Revert "Fix bug in SVM::trainAuto"

This reverts commit 225da0226e4e9d54e97aee488ac2b5ed4e813443.

9 years agoFix bug in SVM::trainAuto
Сергей Нужный [Tue, 7 Apr 2015 12:09:47 +0000 (15:09 +0300)]
Fix bug in SVM::trainAuto

9 years agoMerge pull request #3906 from yxiong:policy-0042
Vadim Pisarevsky [Tue, 7 Apr 2015 09:35:07 +0000 (09:35 +0000)]
Merge pull request #3906 from yxiong:policy-0042

9 years agoMerge pull request #3890 from greensea:patch-1
Vadim Pisarevsky [Tue, 7 Apr 2015 09:33:36 +0000 (09:33 +0000)]
Merge pull request #3890 from greensea:patch-1

9 years agoFix a segment fault issue in cascade classfier
greensea [Tue, 31 Mar 2015 09:28:40 +0000 (17:28 +0800)]
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.

9 years agoAdd #ifdef's such that python wrapper builds independent of other components
Ying Xiong [Mon, 6 Apr 2015 23:57:10 +0000 (19:57 -0400)]
Add #ifdef's such that python wrapper builds independent of other components

9 years agoSilence cmake 3.0+ warnings about MACOSX_RPATH
Ying Xiong [Mon, 6 Apr 2015 20:37:06 +0000 (16:37 -0400)]
Silence cmake 3.0+ warnings about MACOSX_RPATH

9 years agoMerge pull request #1 from Itseez/master
Nuzhny007 [Mon, 6 Apr 2015 13:24:53 +0000 (16:24 +0300)]
Merge pull request #1 from Itseez/master

merge with itseez/opencv/master

9 years agoFix generating of android.mk
Maksim Shabunin [Mon, 6 Apr 2015 13:12:00 +0000 (16:12 +0300)]
Fix generating of android.mk

9 years agoMerge pull request #3903 from SeninAndrew:master
Vadim Pisarevsky [Sun, 5 Apr 2015 18:01:17 +0000 (18:01 +0000)]
Merge pull request #3903 from SeninAndrew:master

9 years agoMerge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix
Vadim Pisarevsky [Sun, 5 Apr 2015 17:57:51 +0000 (17:57 +0000)]
Merge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix