Alexander Smorkalov
6b5eac328f
Android samples updated according onCameraFrame callback signature change.
...
FpsMeter class removed from Image Manipulations and Face Detection examples as unused code.
2013-02-04 17:43:46 +04:00
Alexander Smorkalov
3ef588b877
onCameraFrame callback signature changed. CvCameraFame interface added.
...
New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.
2013-02-04 17:43:45 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
f608df9640
Merge pull request #427 from vrabaud:brisk_fixes_2.4
2013-02-04 17:10:02 +04:00
Sergei Nosov
c0e3d48ebc
stricter eps for normed methods
2013-02-04 16:02:01 +04:00
Andrey Kamaev
7244fc1f6a
Merge pull request #404 from asmorkalov:android_opencvmk_fix
2013-02-04 15:49:48 +04:00
Andrey Kamaev
4d785fff99
Merge pull request #409 from asmorkalov:giganetix_cams_patch_master
2013-02-04 14:57:14 +04:00
Andrey Kamaev
727b6a7259
Merge pull request #408 from asmorkalov:giganetix_cams_patch
2013-02-04 14:56:54 +04:00
Andrey Kamaev
3c39e146a3
Make parallel video writer test pass if compiled without threading support
2013-02-04 14:34:44 +04:00
Vincent Rabaud
d235c3a678
define the default remapping in the right scope
2013-02-04 11:08:00 +01:00
Vincent Rabaud
0b1599d88a
write documentation for BRISK
2013-02-04 11:07:53 +01:00
yao
9711ef6dee
blend use vector to optimize
2013-02-04 17:29:20 +08:00
Sergei Nosov
15d0484485
matchTemplate perf tests added
2013-02-04 12:57:22 +04:00
Sergei Nosov
c768731e89
enable Tegra optimizations
2013-02-04 12:57:03 +04:00
Andrey Kamaev
9c939a8dcf
Merge pull request #420 from asmaloney:check-mem-alloc
2013-02-04 12:56:36 +04:00
Andrey Kamaev
5a767863bd
Merge pull request #413 from berak:master
2013-02-04 12:56:12 +04:00
Alexander Smorkalov
e58f4e44c8
Modules redifinition in case of multiple includes of OpenCV.mk in single Android.mk fixed.
2013-02-04 12:22:22 +04:00
Andrey Kamaev
650609aaeb
Merge pull request #429 from bitwangyaoyao:2.4_setdevEx
2013-02-04 12:03:24 +04:00
Andrey Kamaev
6dc3b662f6
Merge pull request #425 from asmaloney:vector_empty
2013-02-04 12:03:03 +04:00
Andrey Kamaev
58c4d5f4b4
Merge pull request #424 from asmaloney:additional-checks
2013-02-04 12:02:43 +04:00
Andrey Kamaev
fc4a2244fa
Merge pull request #421 from asmaloney:check-mem-alloc2
2013-02-04 12:02:28 +04:00
Andrey Kamaev
37460acb21
Merge pull request #410 from taka-no-me:fix_cap_dshow_setfps
2013-02-04 11:57:33 +04:00
Andrey Kamaev
e2536f1c35
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
2013-02-04 11:54:43 +04:00
yao
a639a1ae5c
add setDeviceEx interface
...
simplify the logic of save binary
2013-02-04 15:06:36 +08:00
yao
3c5cb4931e
simplify the kernel logic when using rect kernel or without ROI
2013-02-04 13:33:27 +08:00
marina.kolpakova
7c98735c0d
add compute capability check
2013-02-03 22:44:13 +04:00
Andy Maloney
ac8744af6a
No need to check vector size before clear()
2013-02-02 19:00:41 -05:00
Andy Maloney
c8cad0857e
Remove unused constructor
...
Add checks for valid values
Fix wording on some errors
2013-02-02 16:09:10 -05:00
Andy Maloney
b79e8053c1
Check memory allocation
...
Declare vars as locally as possible
2013-02-02 08:44:25 -05:00
Andy Maloney
b497380a68
Check memory allocation
...
Initialize local variables
2013-02-02 08:33:40 -05:00
Andrey Kamaev
2a669555de
Merge pull request #414 from asmaloney:remove-unused-vars2
2013-02-02 14:34:47 +04:00
Andrey Kamaev
7e06b4755b
Merge pull request #415 from asmaloney:cvCopyHist-fix
2013-02-02 14:34:33 +04:00
Andy Maloney
e7ea90f87f
Mat tutorial - grammar and spelling fixes
2013-02-01 23:39:40 -05:00
Andy Maloney
3154cdf8ac
Fix subtle bug when src & dst agree on sparsity but have different dimensions
...
Remove unused var "total"
Declare vars as locally as possible
2013-02-01 22:57:22 -05:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
berak
baf2b87a0d
Update modules/contrib/include/opencv2/contrib/contrib.hpp
...
class LevMarqSparse is not tagged CV_EXPORTS,
so the contrib module, built the on win using vs won't contain that symbol,
trying to create an instance of LevMarqSparse will lead to a 'undefined symbol' err, because it did not make it into the library.
2013-02-01 21:13:55 +01:00
cuda-geek
f52ce6529b
Merge pull request #322 from cuda-geek:training
2013-02-01 18:45:12 +04:00
Andrey Kamaev
0cd8684ade
Fix setting of FPS after frame width and height with DShow cameras
...
Issue #2114
2013-02-01 18:01:13 +04:00
cuda-geek
db9de43fa5
Merge pull request #407 from taka-no-me:fix_java_after_surf_change
2013-02-01 17:48:21 +04:00
marina.kolpakova
cc538ddfa6
changes related with code review
2013-02-01 17:47:05 +04:00
Andrey Kamaev
6f1961031c
Update regression checks in Java test
...
This follows SURF changes in 1f261c2
2013-02-01 17:16:28 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
LeonidBeynenson
87b0126e0d
Fixed dummy warning.
2013-02-01 16:16:43 +04:00
Alexander Smorkalov
25086ed257
Smartek Giganetix Cameras support (Patch #2192 ) integrated.
2013-02-01 16:07:32 +04:00
Andrey Kamaev
9e32c6993a
Merge pull request #405 from vpisarev:znah_patch
2013-02-01 16:06:54 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
LeonidBeynenson
013d54c230
Changed types of some variables from int64 back to int.
...
Also corrected some indexes to be size_t.
2013-02-01 14:41:14 +04:00
marina.kolpakova
f7ac73998a
code review fixes
2013-02-01 14:36:06 +04:00
marina.kolpakova
14ac8a528e
final refactoring and test for training
2013-02-01 14:36:06 +04:00
marina.kolpakova
d314c602d5
add documentation for new classes
2013-02-01 14:36:06 +04:00
