Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Andrey Kamaev
afe85e7e51
Fix some warnings from -O0 build
2013-02-06 20:57:36 +04:00
LeonidBeynenson
203849d5e4
The next attempt to fix a build error on Mac.
2013-02-06 18:07:02 +04:00
Andrey Kamaev
93d4abecf8
Merge pull request #443 from taka-no-me:fix_cascade_test
2013-02-06 16:40:38 +04:00
LeonidBeynenson
50cd5d9ce7
Try to fix Mac compilation issue.
2013-02-06 15:31:51 +04:00
Andrey Kamaev
37d695a62e
Use gtest assertions in cascade test
...
This simplifies test debugging a lot
2013-02-06 15:07:31 +04:00
Vladislav Vinogradov
bb3b1441c5
added 8u type support to filterSpeckles function
2013-02-06 14:14:45 +04:00
Andrey Kamaev
bf575ba7fb
Merge pull request #434 from taka-no-me:fix_parallel_writer_test
2013-02-06 14:04:59 +04:00
Andrey Kamaev
7cdede0c55
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
2013-02-06 14:04:28 +04:00
yao
e31e924cf7
remove the warnings in accuracy test
2013-02-06 09:12:40 +08:00
Andrey Kamaev
fe0516c877
Merge pull request #432 from bitwangyaoyao:2.4_blend
2013-02-05 14:53:49 +04:00
Andrey Kamaev
53e77ed468
Merge pull request #431 from snosov1:matchTemplate-tegra
2013-02-05 14:50:15 +04:00
yao
568b935246
remove a warning on Linux
...
fix a error in doc
2013-02-05 17:16:40 +08:00
LeonidBeynenson
b85a098d9c
Added float, uint64, and uchar params to Algorithm
...
Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get.
2013-02-04 20:25:18 +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
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
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
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
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
marina.kolpakova
1613aa45bc
fix python bindings
2013-02-01 14:36:06 +04:00
marina.kolpakova
fa15fcc53e
move feature pool to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
0b039f3c6b
refactor feature pool
2013-02-01 14:36:06 +04:00
marina.kolpakova
b4aa33b6d3
move ICF -> ChannelFeature
2013-02-01 14:36:06 +04:00
marina.kolpakova
a01f596474
update documentation for softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
7f80054dfd
move miscellaneous python scripts to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
4ba8b53152
split public interface and realization for SoftCascadeOctave
2013-02-01 14:36:06 +04:00
marina.kolpakova
f3227c3f1a
merged ICFPreprocessor and Channels -> ChannelFeatureBuilder
2013-02-01 14:36:06 +04:00
marina.kolpakova
49ec664238
add IntegralChannelComputer
2013-02-01 14:36:05 +04:00
marina.kolpakova
716a9ccb71
move training to softcascade module
...
rename Octave -> SoftCascadeOctave
2013-02-01 14:36:05 +04:00
marina.kolpakova
61441a1014
rename SCascade -> SoftCascadeDetector
2013-02-01 14:36:05 +04:00
marina.kolpakova
1b43b0e2df
move soft cascade functionality into dedicated module
2013-02-01 14:36:05 +04:00
marina.kolpakova
decb137185
use long seeds only for 64 bit systems
2013-02-01 14:35:29 +04:00
marina.kolpakova
b0905c67ba
minor
2013-02-01 14:35:28 +04:00
marina.kolpakova
16aacf1780
use long seeds
2013-02-01 14:35:27 +04:00
marina.kolpakova
e903ce10ce
fix wartings for 32bit build
2013-02-01 14:35:27 +04:00
marina.kolpakova
a28f5a89b3
move preprocessor to objdetect
2013-02-01 14:35:27 +04:00
marina.kolpakova
8672ae58e2
fix globbing under win
2013-02-01 14:34:40 +04:00
marina.kolpakova
e2de3b0b81
fix build inder mac
2013-02-01 14:34:40 +04:00
marina.kolpakova
dc12b4476a
suppress debug out for soft cascade Octave
2013-02-01 14:34:40 +04:00
marina.kolpakova
e35eebd4d4
fix android build
2013-02-01 14:34:40 +04:00
marina.kolpakova
e47f58f4ce
replace Mats to Input/OutputArrays for Octave's public interface
2013-02-01 14:34:40 +04:00
marina.kolpakova
e7bab669fa
replace cv::Mat to Input/Output arrays
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0f2203f22
raplase error output on CV_Error
2013-02-01 14:34:40 +04:00
marina.kolpakova
dd8de0c41f
move soft cascade octave to ml module
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0e93d0482
move image extraction logic from Octave to Dataset class
2013-02-01 14:34:40 +04:00
marina.kolpakova
a3600b94db
created abstract FeaturePool class
2013-02-01 14:34:40 +04:00
marina.kolpakova
d4d47b1e58
restore backword compatibility
2013-02-01 14:34:39 +04:00
marina.kolpakova
a8d0e04912
amplement weidhting according to L. Bourdev and J. Brandt paper "Robust Object Detection Via Soft Cascade"
2013-02-01 14:34:39 +04:00
Vadim Pisarevsky
51eba617a8
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev
2013-02-01 14:01:44 +04:00
Andrey Kamaev
b179e2dd2d
Merge pull request #396 from vpisarev:facedetect_fixes
2013-02-01 12:49:48 +04:00
Andrey Kamaev
992d47e9dc
Merge pull request #400 from ilysenkov:bugfix_2560
2013-02-01 12:05:48 +04:00
Andrey Kamaev
5ef58a474a
Merge pull request #397 from ilysenkov:bugfix_2677
2013-02-01 12:04:38 +04:00
Andrey Kamaev
0b6677f6d3
Merge pull request #398 from ilysenkov:bugfix_2330
2013-02-01 11:19:33 +04:00
Vadim Pisarevsky
638c0d1bf4
fixed compile warnings
2013-02-01 10:47:27 +04:00
Andrey Kamaev
57aa089ad6
Merge pull request #392 from vpisarev:python_fixes2
2013-02-01 10:20:52 +04:00
Ilya Lysenkov
b24e4bddb1
Documented the TermCriteria class ( #2560 )
2013-02-01 10:16:30 +04:00
Ilya Lysenkov
7745c8806c
Added info() method in descriptor matchers ( #2330 )
2013-02-01 02:23:40 +04:00
Ilya Lysenkov
098ea6fcb7
Checked key_size in LSH table for validness ( #2677 )
2013-01-31 23:19:19 +04:00
Ilya Lysenkov
1becbd9fcc
Added a test for invalid key sizes in LSH tables
2013-01-31 23:17:07 +04:00
Vadim Pisarevsky
50299c1d5e
disabled the use of SSE4 instructions as well to make the code compatible with the old Intel and AMD chips
2013-01-31 22:57:46 +04:00
Vadim Pisarevsky
18039d7829
added test for the old cvHaarDetectObjects. disabled AVX optimization in haar.cpp. it should cover tickets #2534 , #2591 , #2669
2013-01-31 22:55:04 +04:00
Andrey Kamaev
39b4bf1828
Merge pull request #390 from taka-no-me:fix_relative_error_check
2013-01-31 21:32:45 +04:00
Andrey Kamaev
a8c014de33
Merge pull request #318 from AnnaKogan8:fixed-perf-tests
2013-01-31 21:01:44 +04:00
Andrey Kamaev
13d2412d24
Merge pull request #394 from taka-no-me:fix_tiff_test
2013-01-31 20:52:35 +04:00
Andrey Kamaev
34ef209940
Merge pull request #393 from Daniil-Osokin:bugfix_doc_multi_issues
2013-01-31 20:30:33 +04:00
Vadim Pisarevsky
54e0765d80
yet another minor fix in cv::transpose()
2013-01-31 20:26:16 +04:00
cuda-geek
d874d93e24
Merge pull request #372 from cuda-geek:gpu-cascade-fixes
2013-01-31 20:13:31 +04:00
Vadim Pisarevsky
7ca38d63d9
fixed failure of the C++ test for estimateAffine3D
2013-01-31 19:44:16 +04:00
LeonidBeynenson
6de422701a
Made changes to allow ml module to work with big data.
2013-01-31 19:37:20 +04:00
Andrey Kamaev
55b90d7bae
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test
2013-01-31 18:51:24 +04:00
Daniil Osokin
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
Vadim Pisarevsky
79e278c008
applied patch #2587
2013-01-31 16:19:20 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Vadim Pisarevsky
82b6419d12
added tests for fast (ticket #2613 ) and estimateAffine3D ( #2375 )
2013-01-31 16:15:40 +04:00
Andrey Kamaev
e3b45910aa
Temporary disable unstable Features2d_RotationInvariance_Detector_SIFT test
2013-01-31 16:06:22 +04:00
Andrey Kamaev
e63b4591ff
Suppress clang build warning
2013-01-31 16:01:04 +04:00
Andrey Kamaev
4f1913ed26
Correct tolerance value for sanity checks with ERROR_RELATIVE
...
Use min/max bounds instead of local value to calculate acceptance threshold.
Threshold based on local values somethimes does not work because cancellation
of big values may produce error bigger than local value.
2013-01-31 15:47:14 +04:00
Vadim Pisarevsky
abd9675a99
fixed bugs #1718 , #2375 ; attached the new tests to test.py.
2013-01-31 15:34:09 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
cuda-geek
53b0df87f1
Merge pull request #385 from etalanin:bug2607
2013-01-31 13:46:01 +04:00
cuda-geek
bf53ebd590
Merge pull request #381 from vpisarev:surf_fixes
2013-01-31 13:36:10 +04:00
cuda-geek
fe30da6e2c
Merge pull request #387 from taka-no-me:fix_dshow_fourcc_conversion
2013-01-31 13:26:26 +04:00
Andrey Kamaev
fda32d3d8d
Merge pull request #382 from cuda-geek:fix-broken-links-bug-2689
2013-01-31 13:08:01 +04:00
Evgeny Talanin
50c2f87add
Fix and test for #2607
2013-01-31 12:23:08 +04:00
cuda-geek
f3ae185fd0
Merge pull request #383 from cuda-geek:apply-opencv-macosx-patch
2013-01-31 12:04:13 +04:00
Andrey Kamaev
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
Andrey Kamaev
e0426148ba
Merge pull request #374 from ivan-korolev:fix_estimateRigidTransform
2013-01-30 20:26:54 +04:00
marina.kolpakova
8b3c717e8f
apply patch #2686
2013-01-30 20:20:06 +04:00
cuda-geek
e72c7736e7
Merge pull request #375 from taka-no-me:fix_opticalflow_2075
2013-01-30 20:18:53 +04:00
Andrey Kamaev
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Andrey Kamaev
33c26a93c6
Merge pull request #376 from taka-no-me:solve_tiff_conflict
2013-01-30 19:36:09 +04:00
marina.kolpakova
5b03d47fb8
fix broken links in cascade classification documentation
2013-01-30 19:28:16 +04:00
cuda-geek
bc53a054f2
Merge pull request #380 from asmorkalov:java_test_fix2
2013-01-30 19:03:35 +04:00
cuda-geek
31d3c508db
Merge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build
2013-01-30 18:59:56 +04:00
Vadim Pisarevsky
1f261c2f9d
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.
2013-01-30 18:07:37 +04:00
Alexander Smorkalov
5bc6365ba5
TestCheckVector java test fixed. Warning fixed.
2013-01-30 17:28:22 +04:00
Andrey Kamaev
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Ivan Korolev
eaa5012163
fix v4l yes-yes build
2013-01-30 17:04:33 +04:00
Andrey Kamaev
11871528ce
Solve conflict between tiff.h and opencv2/core/types_c.h
...
Сonflict exists between some versions of libtiff and opencv headers
2013-01-30 16:36:50 +04:00
Andrey Kamaev
c9d8e9900f
Allow input of calcOpticalFlowPyrLK be submats of different size images
...
This fixes bug #2075
2013-01-30 16:07:55 +04:00
Andrey Kamaev
6a29b13c45
Add test for issue #2075
2013-01-30 16:07:38 +04:00
marina.kolpakova
cb329400df
fix tests
2013-01-30 15:55:04 +04:00
marina.kolpakova
8d9c9c2690
integrate new cascade format to GPU soft cascade implementation
2013-01-30 15:55:04 +04:00
Ivan Korolev
b362affd13
Fixed bug in the cv::estimateRigidTransform ( #1949 )
2013-01-30 15:27:23 +04:00
Ilya Lysenkov
3c8787980c
Fixed cvDestroyAllWindows() without windows in QT ( #2440 )
2013-01-30 15:26:49 +04:00
Ilya Lysenkov
56fbcc541f
Tested cvDestroyAllWindows() without windows
2013-01-30 15:25:10 +04:00
Andrey Kamaev
3a55fb9d1b
Merge pull request #365 from ivan-korolev:fix_HoughLines_segfault
2013-01-30 15:16:30 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
52b32ba8f0
Merge pull request #371 from taka-no-me:fix_build
2013-01-30 15:06:19 +04:00
Andrey Kamaev
b6de1fccc3
Merge pull request #370 from ilysenkov:bugfix_1747
2013-01-30 14:42:10 +04:00
Andrey Kamaev
62b9180c50
Merge pull request #368 from ilysenkov:checkSubset-fix
2013-01-30 14:41:37 +04:00
Andrey Kamaev
81f5e72630
Merge pull request #366 from asmorkalov:gstreamer_codec_list
2013-01-30 14:41:22 +04:00
Andrey Kamaev
8d9af7de61
Merge pull request #362 from Daniil-Osokin:bugfix_doc_StereoSGBM
2013-01-30 14:41:06 +04:00
Andrey Kamaev
ae7460440e
Merge pull request #361 from taka-no-me:tiff_big_tile
2013-01-30 14:40:51 +04:00
Andrey Kamaev
86b4b30a6d
Merge pull request #358 from taka-no-me:objc_exceptions
2013-01-30 14:40:32 +04:00
Andrey Kamaev
e79e81c6cd
Fix Windows build warnings
2013-01-30 13:24:49 +04:00
Ilya Lysenkov
6feade3110
Added support of different resolution in rectify3Collinear
2013-01-30 13:19:12 +04:00
Andrey Kamaev
eeb865ee8a
Fix Android build warnings
2013-01-30 13:11:33 +04:00
Ilya Lysenkov
9ce2197e9d
Added processing of trivial subsets
2013-01-30 13:03:03 +04:00
Alexander Smorkalov
82e325cbfa
Patch #2721 More FourCC for gstreamer applied.
2013-01-30 11:44:14 +04:00
Ivan Korolev
9908ff33de
Added regression test for HoughLines algorithm
2013-01-30 11:27:19 +04:00
Daniil Osokin
f9de98ec64
Fixed proposed values for speckleRange in StereoSGBM docs (bug #1937 )
2013-01-30 09:02:17 +04:00
Andrey Kamaev
62ce815197
Fix rollover when computing buffer size in tiff decoder (bug #2161 )
2013-01-30 00:07:33 +04:00
Andrey Kamaev
b4d0dff4c5
Added minimal support for tiff encoder parameters and test for issue #2161
2013-01-30 00:07:30 +04:00
Andrey Kamaev
daa02aaa98
Merge pull request #360 from vpisarev:sift_fixes
2013-01-29 20:39:13 +04:00
Vadim Pisarevsky
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
0b1fe53a46
Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657 )
2013-01-29 17:09:23 +04:00
Andrey Kamaev
ab8d92e1b8
Rebase and merge pull request #342 from ilysenkov/bugfix_2470
2013-01-29 15:53:42 +04:00
Ilya Lysenkov
5021a792b1
Fixed #2470
2013-01-29 15:53:28 +04:00
Ilya Lysenkov
fe86f31f44
Added a test of CvModelEstimator2::checkSubset(...)
2013-01-29 15:53:28 +04:00
Andrey Kamaev
98fdd70466
Merge pull request #339 from vpisarev:core_fixes
2013-01-29 15:51:22 +04:00
Andrey Kamaev
287fb2c611
Fix build warning
2013-01-29 14:52:03 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Andrey Kamaev
63873a8393
Merge pull request #355 from asmaloney:copy_paste_cond
2013-01-29 14:13:01 +04:00
Andrey Kamaev
519e23bf0b
Merge pull request #354 from asmaloney:fix_mem_dealloc
2013-01-29 14:12:12 +04:00
Andrey Kamaev
da884b4e1d
Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic
2013-01-29 14:00:10 +04:00
Vadim Pisarevsky
e7cbf65280
Merge pull request #351 from vpisarev:python_fixes
2013-01-29 13:34:50 +04:00
Alexander Smorkalov
8c45b9d03d
Video IO perf tests guarded.
2013-01-29 11:09:49 +04:00
cuda-geek
04f01ed21d
Merge pull request #353 from asmaloney:arg_checks
2013-01-29 11:04:33 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andy Maloney
bdf189faac
{calib3d} Fix copy-paste error in conditional
2013-01-28 18:09:10 -05:00
Andy Maloney
5bd56e7464
Fix mem leak and mismatched new/delete
2013-01-28 17:57:19 -05:00
Andy Maloney
7a6475c3f9
Check pointers before using them in var init
2013-01-28 16:51:28 -05:00
Andrey Kamaev
2b4ffd1161
Merge pull request #350 from asmorkalov:android_java_warnings
2013-01-28 23:57:14 +04:00
Andrey Kamaev
3a9c978b5e
Merge pull request #348 from Daniil-Osokin:bugfix_YCrCb_formula
2013-01-28 23:56:42 +04:00
Andrey Kamaev
17130477c9
Merge pull request #344 from taka-no-me:improve_jpeg_encoder_errors
2013-01-28 23:56:01 +04:00
Vadim Pisarevsky
4044fbcb33
hopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193 ). added the corresponding test
2013-01-28 21:03:59 +04:00
Vadim Pisarevsky
2320ec76b4
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658 . Added tests for #2611 , #2505 , #2658
2013-01-28 20:45:00 +04:00
Vadim Pisarevsky
a519bbc617
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658 . Added tests for #2611 , #2505 , #2658
2013-01-28 20:44:47 +04:00
Alexander Smorkalov
ca98710640
Resolve warning in OpenCV Library project in Eclipse (Bug #2714 )
...
Warning in auto generated code was suppressed by project settings.
2013-01-28 19:44:58 +04:00
Vadim Pisarevsky
cd46a674d1
applied patch #2611 that also likely fixes #2505
2013-01-28 18:30:20 +04:00
Daniil Osokin
4c9c27b244
Fixed formula of YCrCb to RGB conversion (bug #2725 )
2013-01-28 18:29:01 +04:00
Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Vadim Pisarevsky
146ca61a27
added tests for #1373 , #2629 , #2719 ; fixed another bug in determinant(Matx<T,n,n>)
2013-01-28 17:27:08 +04:00
Patrick Welche
1a84bcc565
NetBSD video(4) support, patch 3 of 3
...
xioctl() assumes that ioctl takes int request. Cope with
int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".
2013-01-28 17:11:44 +04:00
Patrick Welche
681ffd9a21
NetBSD video(4) support, patch 2 of 3
...
* Decouple Video4Linux2 support from Video4Linux as existence of
v4l2 on a system does not imply support for v4l.
* Don't use V4L's struct video_window in V4L2 code.
* Removed __USE_GNU as comment says:
/* support for MJPEG is only available with libjpeg and gcc,
because it's use libjepg and fmemopen()
so replace with test for fmemopen() if found necessary.
2013-01-28 17:11:41 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
255cd61a8c
Improve error reporting of JPEG image encoder
...
OpenCV issue #2604
After this patch applied an attempt to encode empty images produces exception
saying "Raw image encoder error: Empty JPEG image (DNL not supported)"
2013-01-28 16:55:00 +04:00
Andrey Kamaev
7374445398
Fix integer overflow in NL-Means denoising on white input
...
Issues #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
7e92826efc
Add test for issue #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
d83914d478
Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module
2013-01-28 14:01:22 +04:00
Andrey Kamaev
8521ac5d21
Merge branch 'fix_jpg2000' into 2.4
2013-01-28 12:41:35 +04:00
Andy Maloney
e87355463f
{highgui} Fix copy-paste error in conditional
2013-01-26 16:38:01 -05:00
Vadim Pisarevsky
1df10553bb
fixed bugs #1373 , #2629 , #2719
2013-01-25 23:45:41 +04:00
Andrey Kamaev
d3aef0d378
Fix OpenCL build warnings
2013-01-25 18:41:06 +04:00
Andrey Kamaev
2e02654004
Fix build of Java tests
2013-01-25 17:08:36 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
d8f749da52
Merge pull request #337 from taka-no-me:ocl_appsdk
2013-01-25 16:23:36 +04:00
Andrey Kamaev
9509dfd1de
Fix OpenCL build warnings
2013-01-25 16:19:59 +04:00
Andrey Kamaev
dc11acf041
Merge pull request #336 from ivan-korolev:fix_relative_error_formula
2013-01-25 14:10:06 +04:00
Ivan Korolev
6385b0f7ed
Fixed a formula to calculate the relative error
2013-01-25 11:19:38 +04:00
Andrey Kamaev
ed949bc211
Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor
2013-01-25 00:53:42 +04:00
Andrey Kamaev
20de2f35f9
Merge pull request #325 from bitwangyaoyao:2.4_fixcanny
2013-01-25 00:46:35 +04:00
Andrey Kamaev
f9ed0037b3
Merge pull request #327 from bitwangyaoyao:2.4_vs2012
2013-01-25 00:46:20 +04:00
Andrey Kamaev
94e2b5c140
Merge pull request #305 from stephenfalken:2.4
2013-01-24 18:24:36 +04:00
Andrey Kamaev
d5b15d6523
Fix ocl build warnings
2013-01-24 17:08:30 +04:00
Siegfried Hochdorfer
195d501b43
fixed broken indentation
2013-01-24 11:40:35 +01:00
Andrey Kamaev
a441980d68
Fix debug build of Java warppers
2013-01-24 13:25:12 +04:00
Andrey Kamaev
3c4cfccc88
Merge pull request #321 from apavlenko:warp_sanity_check
2013-01-24 13:05:54 +04:00
Andrey Kamaev
0487067964
Merge pull request #317 from vpisarev:c2cpp_refactor_imgproc
2013-01-24 13:03:34 +04:00
yao
2aae501234
make ocl module compile on VS2012
2013-01-24 15:45:29 +08:00
yao
d574e6dc09
fix canny crash in bug #2279
2013-01-24 14:58:41 +08:00
yao
4f778436b5
ocl::cvtColor support YUV and YCbCr formats
2013-01-24 14:33:28 +08:00
Vadim Pisarevsky
efd00238e2
fixed warnings; restored fixed_size parameter in AutoBuffer
2013-01-23 21:47:58 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
9cb4292d5c
implemented Luv/Lab <-> RGB conversion
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
e446903aac
added more types support for gpu separable filters
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
281d036fcf
optimizations:
...
- new reduce implementation (with kepler optimizations)
- saturate_cast via asm command
- video SIMD instructions in element operations
- float arithmetics instead of double
- new deviceSupports function
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Vladislav Vinogradov
b7e6b5af1b
fixed tests (call resetDevice, if there was a gpu failure)
2013-01-23 21:05:04 +04:00
Andrey Kamaev
0773ab4d07
Merge pull request #315 from taka-no-me:java_on
2013-01-23 19:02:27 +04:00
Andrey Pavlenko
e287dea91b
fixing build warnings
2013-01-23 18:45:06 +04:00
Andrey Kamaev
2c32536bf4
Enable Java bindings on all platforms by default
2013-01-23 18:08:09 +04:00
Andrey Kamaev
caa2c06e50
Quiet output of cv::error in Java tests
...
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
2013-01-23 18:08:09 +04:00
Andrey Kamaev
5eabcf8e4f
Java tests: print summary for tests run
2013-01-23 18:08:09 +04:00
Andrey Kamaev
4668a133f0
Java API: fix build warning on OS X
...
Common part of all source files is extracted to special header
2013-01-23 18:08:09 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Pavlenko
81721d0dce
enabling sanity checks for warp and resize functions on Android
...
- add syntetic images generation function to ts
- use generated syntetic images
2013-01-23 17:25:30 +04:00
Andrey Kamaev
311d799344
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
2013-01-23 14:50:29 +04:00
yao
e05112a364
some host side optimizations to ocl::GaussianBlur
2013-01-23 14:48:04 +04:00
yao
9060365f5e
use format on filtering.cpp
2013-01-23 14:48:04 +04:00
yao
56c1a7fab6
make oclHaarDetectObjects running on more ocl platforms
2013-01-23 14:48:04 +04:00
yao
b5bd2cde9e
A few optimizations to ocl::pyrLK::sparse, make it running on more OCL platforms
2013-01-23 14:48:04 +04:00
yao
f6d82773f9
fix bug #2674
2013-01-23 14:48:04 +04:00
Andrey Kamaev
78dc44a7fd
Merge pull request #295 from apavlenko:test_surf_keypoints_invariance
2013-01-23 14:40:05 +04:00
Anna Kogan
608fab60fd
Added cleanup of keypoints vector
2013-01-22 18:05:18 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
c92743d124
Eliminate intermediate build target "opencv_java_api"
2013-01-22 17:59:00 +04:00
Vadim Pisarevsky
dc4d0398f3
converted few more comp. geometry functions to C++
2013-01-22 16:54:31 +04:00
mdim
93f8e7ba74
check of keypoint index range in drawMatches
2013-01-22 00:37:27 +04:00
cuda-geek
a8a842332b
Merge pull request #311 from cuda-geek:soft-cascade-refactoring-and-fixes
2013-01-22 00:27:02 +04:00
Andrey Kamaev
a45eb275e3
Merge pull request #306 from AnnaKogan8:perf_tests_timing.py-improvement
2013-01-21 18:10:08 +04:00
Vadim Pisarevsky
f14b7af5ac
changed diagnostic from "warning" to "note" in the python wrapper generator, to suppress some noise in opencv utilities
2013-01-21 15:00:32 +04:00
Andrey Kamaev
dda337bdf2
Merge pull request #303 from taka-no-me:fix_split_merge_test
2013-01-21 14:14:17 +04:00
Vadim Pisarevsky
c2241dccc5
converted fitline to C++, fixed Mat::checkVector().
2013-01-21 01:07:47 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Andrey Kamaev
d169f62d28
Merge pull request #307 from taka-no-me:lena.png
2013-01-19 12:02:33 +04:00
Andrey Kamaev
f3f55b30b0
Merge pull request #267 from pclove1:ocl_hough
2013-01-19 12:02:14 +04:00
Vadim Pisarevsky
457fa52111
convex hull converted to C++; other 2 functions in convhull.cpp are yet to be finished.
2013-01-19 00:26:01 +04:00
marina.kolpakova
e15bdea663
fix test for new cascade
2013-01-18 17:14:11 +04:00
marina.kolpakova
53433884ee
fix python wrapping
2013-01-18 15:58:48 +04:00
marina.kolpakova
f9649a029b
fix typo
2013-01-18 15:58:47 +04:00
marina.kolpakova
0a40bbd0d0
add two types of feature boxes support:
...
- (left, top, width, height)
- (left, top, right, bottom)
2013-01-18 15:58:47 +04:00
marina.kolpakova
913faf2ef4
fix test for a new test data
2013-01-18 15:58:47 +04:00
marina.kolpakova
9efd668a57
a bit refactored soft cascade
2013-01-18 15:58:47 +04:00
marina.kolpakova
f1b4b13e64
perf test
2013-01-18 15:58:47 +04:00
marina.kolpakova
0c6c78d149
integrate 128x256 scale; remove log
2013-01-18 15:58:47 +04:00
marina.kolpakova
e09694bde8
integrated 128x256 scale
2013-01-18 15:58:47 +04:00
marina.kolpakova
3e7965a5a5
first debug integration of newly trained cascade
2013-01-18 15:58:46 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
90ff4e6fc8
Convert test image to losless format
...
This fixes java tests failing with new jpeg versions
2013-01-17 20:43:57 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Siegfried Hochdorfer
82a9f9a5a9
MeanshiftGrouping Bugfix (Bug #2685 )
2013-01-17 11:46:24 +01:00
Vadim Pisarevsky
e3941d0965
refactored approxpoly
2013-01-17 00:11:08 +04:00
Andrey Pavlenko
a8c0f1d962
fixing test failure on some systems
2013-01-16 18:33:35 +04:00
Andrey Kamaev
ae5661d5dc
Fix random failures of Split and Merge tests
2013-01-16 17:55:27 +04:00
Andrey Kamaev
867ddebe07
Merge pull request #289 from jmbuena:master
2013-01-16 17:01:00 +04:00
Andrey Kamaev
7341eaa654
Merge pull request #296 from asmorkalov:html_docs_warning_fix
2013-01-16 16:44:13 +04:00
Suenghoon Park
06da75ffe0
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2013-01-15 12:21:25 -05:00
Andrey Kamaev
bf3c2b0bbb
Fix incorrect Mat address reconstruction on 64-bit platforms
...
This fixes random failures in Java wrappers.
2013-01-15 19:23:49 +04:00
Anna Kogan
0587bef667
Switched time from seconds to minutes
2013-01-15 15:32:22 +04:00
Anna Kogan
3cdfa654ae
Added 'Num of tests' col, changed headers, added 'overall time' row
2013-01-15 15:26:43 +04:00
Andrey Pavlenko
9f0d5f60b5
fixinf warning on non-Windows systems
2013-01-14 18:15:51 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Pavlenko
8e42ca1764
SURF keypoints rotation invariance test.
...
It calcs kpts for a cross and checks that 4 kpts at the edges have equal responce.
2013-01-14 14:06:00 +04:00
Andrey Kamaev
c49b23d4dd
Merge pull request #240 from emchristiansen:javatest2.4
2013-01-14 11:06:44 +04:00
jmbuena
28a7be69ea
Fixed compile warnings on CvHomographyEstimator
2013-01-12 12:32:51 +01:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Pavlenko
b0e1cb473a
more tests fixes
2013-01-11 09:13:25 +04:00
jmbuena
6d738f6a3f
Changed RANSAC Homography estimation for speed. Each minimal set is checked for consistency before actually fit a candidate homography.
2013-01-11 01:55:56 +01:00
Vadim Pisarevsky
19229f2fa0
Merge pull request #253 from Nerei:smart_operators_for_smart_ptr
2013-01-10 20:35:22 +04:00
Andrey Kamaev
a99799caa3
Merge pull request #286 from taka-no-me:tweak_phase_test_threshold
2013-01-10 19:57:23 +04:00
Andrey Kamaev
b1384a6da8
Fix cvCalcOpticalFlow when the status parameter is NULL
...
issue 2526
2013-01-10 18:14:08 +04:00
Andrey Kamaev
20c5a8788d
Weaken acceptance criteria in phase test
2013-01-10 17:12:14 +04:00
Andrey Kamaev
dff59ec960
Merge pull request #284 from taka-no-me:fix_equalize_hist_2678
2013-01-10 16:58:36 +04:00
Andrey Kamaev
59c6e2cc44
Merge pull request #283 from AnnaKogan8:perf_tests_timing.py-improved-console-output
2013-01-10 16:58:22 +04:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
Andrey Kamaev
6131a847a2
Fix histogram calculation in equalizeHist
...
issue #2678
2013-01-10 14:48:31 +04:00
Andrey Kamaev
b81d1b25c7
Merge pull request #280 from vpisarev:bug_fixes_jan9
2013-01-10 13:31:04 +04:00
Anna Kogan
3271e395c8
Improved console output
2013-01-10 13:19:59 +04:00
Anna Kogan
0d7ce141aa
Cleaned code
2013-01-10 13:18:26 +04:00
Anna Kogan
0334cf11cc
Fixed last testsuit disregarding
2013-01-10 13:16:46 +04:00
Vadim Pisarevsky
e383d39598
fixed bug #2679
2013-01-09 17:53:19 +04:00
Andrey Kamaev
399c20a928
Merge pull request #272 from 5kg:fix_haar
2013-01-09 16:53:11 +04:00
Andrey Kamaev
e34aba60d9
Merge pull request #278 from taka-no-me:fix_build_jpeg9
2013-01-09 16:52:56 +04:00
Andrey Kamaev
873aefae19
Merge pull request #279 from taka-no-me:mingw_java
2013-01-09 16:52:41 +04:00
Vadim Pisarevsky
46cf2e96b5
Merge pull request #265 from taka-no-me:doc_signatures
2013-01-09 15:40:39 +04:00
Andrey Kamaev
4e1ba6f02f
Fix build with libjpeg release 9
2013-01-08 19:55:29 +04:00
Anatoly Baksheev
a09b973c2e
Smart operators for smart Ptr (feature #2637 )
2013-01-07 22:33:12 +04:00
Suenghoon Park
269ccaa431
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2013-01-02 14:59:59 -05:00
Ilya Lavrenov
1bc76813f3
fixed bug connected with SSE2 version of resize with AREA interpolation
2012-12-31 15:35:40 +04:00
Andrey Kamaev
da9089612a
Fix build of java bindings on mingw
2012-12-30 23:24:39 +04:00
marina.kolpakova
e53d57664d
fix precompiled headers usage in gpu module
2012-12-30 16:58:41 +04:00
cuda-geek
47df8f4c2a
Merge pull request #275 from mdim:bug_fix_cvboost
2012-12-30 00:31:03 +04:00
Vladislav Vinogradov
bb07e2710e
decreased source size in NCV.VectorOperations test
2012-12-29 20:07:29 +04:00
marina.kolpakova
45191dd6a5
merge CUDA dev branch
2012-12-29 19:44:38 +04:00
Suenghoon Park
4f965296fc
modified performance test for ocl::HoughCircles
2012-12-28 16:32:10 -05:00
Maria Dimashova
0e2958e888
fixed CvBoost::predict
...
(Sometimes sample_data became bad because the buffer with its values was deallocated early).
2012-12-29 00:30:52 +04:00
Suenghoon Park
0afa9cede5
removed personal info from the license header
2012-12-28 10:08:28 -05:00
Zifei Tong
260bdc057c
Changed parallel_for to parallel_for_ in haar.cpp
2012-12-28 22:56:47 +08:00
Andrey Pavlenko
c49b1bc6d5
partial fix for failing tests; fix for Windows launcher script; more quiet output
2012-12-28 17:03:35 +04:00
Zifei Tong
e331787645
Fix race condition for Cascade Classifier when TBB enabled.
2012-12-28 20:51:02 +08:00
Andrey Kamaev
3759476b38
Merge pull request #266 from prclibo:master
2012-12-28 12:51:34 +04:00
Suenghoon Park
2124de80a5
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2012-12-26 17:40:38 -05:00
Suenghoon Park
8a1d6a1bb2
added documentation for ocl::HoughCircles
2012-12-26 17:40:26 -05:00
Suenghoon Park
b1faa46d3a
added performance test
2012-12-26 16:49:58 -05:00
Bo Li
956a029ede
added code, test and doc for five-point algorithm
2012-12-26 18:58:50 +01:00
Andrey Kamaev
b401c6a0c3
Fix discrepancies between function signatures in headers and documentation
2012-12-26 18:24:50 +04:00
Andrey Kamaev
aabbe11e64
Improve function arguments parsing and checking
...
* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors
2012-12-26 17:55:03 +04:00
Kirill Kornyakov
5023afffc7
Removed hack from perf test on HoughLines, since I hope it is fixed by pr263
2012-12-26 10:33:02 +04:00
Anatoly Baksheev
389ecbe96d
warnings, renamed Marina's GPU_PERF_TEST_P
2012-12-25 22:00:20 +04:00
Anatoly Baksheev
be22891f71
added GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app)
2012-12-25 21:23:15 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Kamaev
16687a2655
Explicitly use double precision sin & cos in hough implementation
...
On some platforms sin and cos are calculated in single precision resulting in
diversity of results.
2012-12-25 18:05:05 +04:00
Suenghoon Park
78202100df
added unit test for HoughCircles
2012-12-24 22:53:27 -05:00
Suenghoon Park
ecb6c20915
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2012-12-24 18:42:22 -05:00
Suenghoon Park
e1c6564d5e
fixed a typo in ocl.hpp
2012-12-24 18:41:51 -05:00
Andrey Kamaev
02d1e68c64
Merge pull request #257 from AnnaKogan8:perf-tests-timing-script
2012-12-24 19:38:49 +04:00
Alexander Smorkalov
9ca65ceef8
OpenCV example-tutorial1 does not work on Android emulator (Bug #2656 )
...
Problems with Android 2.3.3 (API level 10) fixed;
Android 2.2 does not work due to unsupported camera frame format (known android-2.2 emulator issue).
2012-12-24 17:49:49 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Anna Kogan
f57d692cd7
Improved code
2012-12-24 17:09:04 +04:00
Anna Kogan
e1331b44f5
Wrote script generating timing table
2012-12-24 17:09:04 +04:00
Andrey Kamaev
014a500f79
Merge pull request #256 from znah:2.4
2012-12-24 16:11:19 +04:00
marina.kolpakova
2128bd25e4
fix warnings under win
2012-12-24 15:28:05 +04:00
marina.kolpakova
3882bbbf35
improve carma build
...
- exclude system paths from library search paths
- remove hardcoded paths to compiler
- enable compiling with 3d-parties
- enable build as shared libraries
2012-12-24 14:54:57 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
524bde2aeb
Merge pull request #255 from taka-no-me:fix_batchdist_test
2012-12-24 13:29:32 +04:00
Alexander Mordvintsev
20838b6f6e
fix #2643 : use SVD to solve least squares in cvStereoRectifyUncalibrated
2012-12-24 12:59:39 +04:00
Andrey Kamaev
02c7e221a3
Merge pull request #252 from taka-no-me:fix_stlport_build
2012-12-24 12:44:13 +04:00