Commit Graph

248 Commits

Author SHA1 Message Date
Alexander Alekhin
006966e629 trace: initial support for code trace 2017-06-26 17:07:13 +03:00
Vladislav Sovrasov
a56bd1fbba Make aruco dependency optional for interactive calibration app 2017-03-22 16:20:19 +03:00
StevenPuttemans
db7922b9ee fix timing of traincascade 2017-03-03 10:06:35 +01:00
StevenPuttemans
46fa9a6bd4 fix some issues with skipping files and old redundant code 2017-01-06 12:35:56 +01:00
Kevin Hughes
0d32bec5c3
add the type_id to the old save format 2016-12-19 09:40:32 -05:00
StevenPuttemans
6d34d6b47e update samples: waitKey() usage
Original commit is a5f19f7dd6
2016-12-15 15:39:47 +03:00
mshabunin
695c518384 Updated TBB search script and code checks 2016-12-01 16:58:38 +03:00
Vadim Pisarevsky
4acda3f609 Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection 2016-10-12 19:38:25 +00:00
viodetools
114d378cfc Bugfix #7438 2016-10-11 19:42:50 -03:00
Alexander Alekhin
5da8d65371 eliminate compiler warnings 2016-10-08 02:19:43 +03:00
Alexander Alekhin
1c18b1d245 Merge pull request #7370 from souch55:Fixxn 2016-10-01 10:44:56 +00:00
sourin
a34fbf7bb1 Fixed identifiers warns 2016-09-30 15:16:29 +05:30
Vadim Pisarevsky
52535d3ef1 Merge pull request #7278 from alalek:opencv_version 2016-09-14 11:56:11 +00:00
Vladislav Sovrasov
ec40b85e75 Add license to interactive-calibration app sources 2016-09-14 12:52:06 +03:00
Alexander Alekhin
2935fcea62 apps: add opencv_version command line tool 2016-09-14 09:28:10 +03:00
Vladislav Sovrasov
d5603caa0b Delete direct lapack calls, minor fixes in UI 2016-09-08 13:00:36 +03:00
Alexander Alekhin
d4ae7f32e3 Merge pull request #7205 from souch55:Fixtrans 2016-08-31 09:51:45 +00:00
sourin
d2e23008ab Fixed traincascade read issue 2016-08-31 11:29:15 +05:30
Bleach
b4b83f2f29 casting to fix vs2010 compile error 2016-08-20 16:29:15 +03:00
Vladislav Sovrasov
5590421a5d Fix build interactive-calibration app 2016-08-09 15:29:57 +03:00
StevenPuttemans
d8698fc359 allow for screen size related resizing 2016-08-02 10:44:01 +02:00
Alexander Alekhin
6cff909bc8 Merge pull request #7004 from StevenPuttemans:cmd_parser_opencv_annotation 2016-07-27 18:24:17 +00:00
StevenPuttemans
e0f19ec48a change parameter input to the CommandLineParser interface 2016-07-27 14:02:28 +02:00
StevenPuttemans
6df12a0507 add limits of tool to help message 2016-07-27 11:42:22 +02:00
Vadim Pisarevsky
77f9bb7b76 Merge pull request #6831 from bobpaulin:master 2016-07-18 15:24:35 +00:00
Vadim Pisarevsky
4da91f9e6d Merge pull request #6861 from teng88:patch-1 2016-07-18 14:43:23 +00:00
berak
20b9ff4ff6 opencv_visualization: check cmdline args 2016-07-12 19:40:46 +02:00
StevenPuttemans
02fe93a399 add a cascade classifier model visualisation tool for master branch 2016-05-11 08:56:42 +02:00
Julien Nabet
a29c814bd8 cppcheck: fix some reports
All of these: (performance) Prefer prefix ++/-- operators for non-primitive types.
[modules/calib3d/src/fundam.cpp:1049] -> [modules/calib3d/src/fundam.cpp:1049]: (style) Same expression on both sides of '&&'.
2016-04-29 15:41:39 +02:00
Alexander Alekhin
6e5e5d87df Merge pull request #6448 from alalek:merge-2.4 2016-04-25 16:56:51 +00:00
Vladislav Sovrasov
5a0c04409b Add interactive calibration app 2016-04-25 11:58:19 +03:00
Alexander Alekhin
67a734ce73 Merge branch '2.4' into master
Commits:
67fe57a add fixed video
db0ae2c Restore 2.4 source branch for bug fix 6317.
97ac59c Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7 fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
Bob Paulin
bb8faec885 #6443 Cast maxscale from double to float for scale calculation. 2016-04-21 07:47:13 -05:00
Bob Paulin
b973b73ae7 Add -maxscale parameter to limit the amount sample images can scale in background images 2016-04-20 21:53:52 -05:00
StevenPuttemans
9d71c19939 add visualisation tool for 2.4 branch 2016-04-14 11:33:37 +02:00
StevenPuttemans
b922d49a28 vectorize process + enable early quitting/storage + enable delete annotion option 2016-04-13 10:20:18 +02:00
StevenPuttemans
5164c4ba31 vectorize process + enable early quitting/storage + enable delete annotation option 2016-04-13 09:10:24 +02:00
StevenPuttemans
2a0a27d3f2 add cascade classifier info - total number of unique features passed to boosting process 2016-03-17 13:34:01 +01:00
StevenPuttemans
b5fbb2b1c8 add cascade classifier info - total number of unique features passed to boosting process 2016-03-17 13:33:11 +01:00
StevenPuttemans
b47f2600cd missing break statement 2016-03-04 09:41:13 +01:00
Alexander Alekhin
c1f3c41bab apps: add missed 'break' 2016-03-03 14:23:59 +03:00
Pranav Ganorkar
4a5ed70175 removed dirname variable 2016-02-07 03:09:21 +05:30
Matt Leotta
912592de4c Remove "INSTALL_NAME_DIR lib" target property
The INSTALL_NAME_DIR property of a target specifies how a dynamic library should
be found on OS X.  If INSTALL_NAME_DIR is not specified the loader will search
relative to the standard search paths.  If specified it should either be
an absolute path or relative path prefixed with either @executable_path,
@load_path, or @rpath.  Specifying "lib" does not make sense here and
causes linking error as documented here:

http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library-on-mac-osx/

and here

http://stackoverflow.com/questions/26978806/dyld-library-not-loaded-lib-libopencv-core-3-0-dylib-reason-image-not-found

This patch removes INSTALL_NAME_DIR everywhere it is set to "lib".
An alternate solution would be to set an absolute path like
"${CMAKE_INSTALL_PREFIX}/lib" or relative path like
"@executable_path/../lib".  However, if there is not specific need for
specifying a path, it is probably best left unset.
2016-01-21 16:07:56 -05:00
Teng Cao
25b044e6c3 fix a bug in updateTrainingSet
In case fillPassedSamples find zero passed negatives and leafFA is achieved, function updateTrainingSet will return false and print misleading information, this PR fix the case.
2015-12-24 10:26:42 +08:00
Vadim Pisarevsky
9c0a5523e4 Merge pull request #5757 from alalek:merge-2.4 2015-12-08 11:51:29 +00:00
Alexander Alekhin
d86d8ed909 Merge 2.4 into master
PR #2968: cce2d99 8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher

The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.

PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.

PR #3190
fix blobdetector

PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.

PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h

PR #3792: afdf319
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function

PR #5490: ec5244a
fixed memory leak in findHomography tests

PR #5491: 0d5b739
delete video readers

PR #5574

PR #5202
2015-12-08 10:24:54 +03:00
Teng Cao
efacf7b6de Update haarfeatures.cpp 2015-12-07 19:51:30 +08:00
Teng Cao
8a36402ec0 Update haarfeatures.cpp 2015-12-07 19:01:04 +08:00
Teng Cao
d68c392b42 calculate innTilted only for Haar::ALL mode
major time consuming part for training app is in function fillPassedSamples for negatives, 
this change make SetImage quicker, in a test of my own data, the total time for SetImage decrease from 9177666 to 5839263,
only help for Haar feature and non Haar::ALL mode which is the most commonly case
2015-12-07 18:50:54 +08:00
Teng Cao
07a58c47cb Update cascadeclassifier.cpp
minor fix since predict() returun int
2015-12-02 17:31:17 +08:00