mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,688 Commits 6 Branches 126 Tags 3 GiB
94e0ac7d9f
Commit Graph

287 Commits

Author SHA1 Message Date
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
teng88
8562bb7092 Update cascadeclassifier.cpp 
minor fix since predict() returun int
 2015-12-02 11:50:22 +08:00
Maksim Shabunin
f49936a849 Fixed cmake and build issues when using Visual Studio 2015 2015-10-29 11:50:48 +03:00
StevenPuttemans
d0344cd308 add checks for valid input data given to parameters 
make the software system dependent
add LICENSE on top
 2015-08-06 10:24:33 +02:00
StevenPuttemans
ba7bf1ef68 add checks on input parameters for valid path and folder 
opening a folder is system specific - made system specific code
added license
 2015-08-06 10:23:41 +02:00
zenev
5cb70d34d7 fixed vector out of range exception in nextImg 2015-05-18 13:29:15 -07:00
Vadim Pisarevsky
5b3f89df0a Merge pull request #3911 from vpisarev:core_tweaks 2015-04-07 19:03:48 +00: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
Vadim Pisarevsky
bd2be9c79c Merge pull request #3890 from greensea:patch-1 2015-04-07 09:33:36 +00:00
Vadim Pisarevsky
a153948a19 Merge pull request #3898 from greensea:2.4 2015-04-07 09:31:36 +00:00
greensea
7274e2ff1a Fix a segment fault issue in cascade classfier 2015-04-07 10:38:58 +08: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
Vadim Pisarevsky
be9c6bdd67 Merge pull request #3901 from StevenPuttemans:add_breakrule_cascade_accuracy 2015-04-03 13:24:47 +00:00
StevenPuttemans
796c15d3e6 fixing wrong equation in accuracy break rule 2015-04-03 12:54:05 +02:00
StevenPuttemans
e30139edc3 add the possibility to add traincascade accuracy 2015-04-03 12:47:09 +02:00
Vadim Pisarevsky
240b52151d Merge pull request #3798 from StevenPuttemans:add_breakrule_cascade_accuracy 2015-04-03 10:19:03 +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
ba0a8dc723 Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives 2015-04-01 13:56:29 +00:00
Vadim Pisarevsky
7ea0239776 Merge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master 2015-03-24 15:19:56 +00:00
Vadim Pisarevsky
e12a04ac7e Merge pull request #3811 from StevenPuttemans:fix_traincascade_getNegatives_master 2015-03-17 11:22:10 +00:00
StevenPuttemans
d0ad599a24 update traincascade assigned memory buffers 2015-03-17 09:00:41 +01:00
Vadim Pisarevsky
4ab525c880 Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory 2015-03-16 10:02:07 +00:00
Vadim Pisarevsky
2594e5e384 Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation 2015-03-12 14:29:04 +00:00
StevenPuttemans
bf16f74618 fixing universal location execution 2015-03-09 13:11:29 +01:00
StevenPuttemans
9f0cd9ee10 upgrade traincascade default memory 2015-03-09 10:43:14 +01:00
StevenPuttemans
3419c704a9 adding usage information 2015-03-06 13:52:52 +01:00
StevenPuttemans
a58bfbf3c7 info on how to use the tool 2015-03-06 13:52:02 +01:00
StevenPuttemans
cdbb661eab update cmakelists of annotation tool 2015-03-06 12:51:28 +01:00
StevenPuttemans
217f628915 update cmakelists for annotation tool 2015-03-05 14:46:52 +01:00
StevenPuttemans
488babf3b3 fixing undesired behaviour 2015-03-04 12:03:33 +01:00
Vadim Pisarevsky
62b8895814 Merge pull request #3654 from StevenPuttemans:add_annotation_master 2015-03-03 12:53:07 +00:00
StevenPuttemans
0833352660 add annotation tool master branch 2015-02-25 11:31:50 +01:00
StevenPuttemans
387a0f26fb fix annotation tool, add auto make of tool 2015-02-25 11:27:59 +01:00
Vadim Pisarevsky
2d2ecbf3ee Merge pull request #3653 from StevenPuttemans:add_annotationtool 2015-02-24 13:50:39 +00:00
Vadim Pisarevsky
90fb43cd11 Merge pull request #3709 from StevenPuttemans:fix_traincascade_load_message_master 2015-02-24 12:50:38 +00:00
StevenPuttemans
2738939126 add same functionality as 2.4 2015-02-17 10:25:18 +01:00
StevenPuttemans
f5a14e5594 fix message of preloaded parameters 2015-02-17 10:21:31 +01:00
Maksim Shabunin
da383e65e2 Remove deprecated methods from cv::Algorithm 2015-02-16 15:28:54 +03:00
Maksim Shabunin
a5a510da4b Support for compound modules, support for contrib_world 2015-02-10 18:30:05 +03:00
VBystricky
f5987c258f Fix small error in traincascade application 2015-02-03 21:32:47 +04:00
StevenPuttemans
30d46313ec adding a universal OpenCV based annotation tool for cascade classifier training 2015-01-29 13:03:28 +01:00
vbystricky
c48f30d4ec Move createsamples application from 2.4 version 2014-12-10 12:17:58 +04:00
Alexander Smorkalov
6bb6039ebb Fixes for QNX 6.6 Neitrino support. 2014-10-23 17:17:35 +04:00
Stephen Mell
5947519ff4 Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples. 2014-09-18 16:54:22 +04:00
Grigory Serebryakov
18c0511d3c Warning on converting int to bool fixed 2014-09-05 11:27:43 +04:00
Grigory Serebryakov
06a1c90679 Include for cvSameImage corrected 2014-09-05 10:45:54 +04:00
Grigory Serebryakov
d1229efeec No output image resize in case of PNG dataset 2014-09-01 13:02:27 +04:00
Grigory Serebryakov
74d8527f8a Naming fixes and code beautification 2014-08-27 12:41:18 +04:00
Grigory Serebryakov
57cf3d1766 Class naming update 
Documentation improvement
Bug in output format for JPG set fixed
 2014-08-26 10:02:50 +04:00
Grigory Serebryakov
f81b3101e8 Typo in string fixed 2014-08-25 18:46:23 +04:00
Grigory Serebryakov
81aefed13a Can create training set in PNG format 
The format of the training set can be changed with the `-pngoutput` key.
Output image will be resized to a 640x480 size if greater.
 2014-08-25 18:14:27 +04:00
Adil Ibragimov
8a4a1bb018 Several type of formal refactoring: 
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
 2014-08-13 15:21:35 +04:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
Vadim Pisarevsky
c20ff6ce19 made everything compile and even run somehow 2014-08-03 01:41:09 +04:00
Joan Puigcerver
16a82b1747 Added an option to traincascade program to select the maximum number of threads to use during training 2014-07-23 22:47:51 +02:00
vbystricky
fd51c133df Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs 2014-07-21 15:10:41 +04:00
StevenPuttemans
03fe86f0a3 added extra warning about the automatic parameter loading for traincascade application when the param.xml file already exists 2014-07-11 11:42:13 +02:00
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Vadim Pisarevsky
3858f2291d removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps. 
some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.
 2014-06-24 19:18:51 +04:00
Roman Donchenko
bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
 2014-01-27 15:28:14 +04:00
Alexander Smorkalov
b75cbfde45 All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00