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
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Andrey Pavlenko
77d04a2622
Merge pull request #1844 from StevenPuttemans:bugfix_3370
2013-12-06 15:51:59 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Roman Donchenko
70c1b700d9
Merge pull request #1879 from LeszekSwirski:traincascade-2.4
2013-11-28 12:24:45 +04:00
Anatoly Baksheev
37a754621a
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
...
Conflicts:
apps/traincascade/boost.cpp
2013-11-27 14:53:21 +00:00
Andrey Kamaev
bef34093aa
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
(cherry picked from commit 2a6fb2867e2fc639e0675eed8abb1688de4539ec)
(only cherry picked "apps/trancascade")
2013-11-27 14:46:47 +00:00
StevenPuttemans
a4239f972b
Added extras to traincascade functionality
2013-11-27 12:54:11 +01:00
StevenPuttemans
e59912f803
Applied fix mentioned in bugreport 3370. Seems to solve the issue.
2013-11-22 14:25:47 +01:00
Anatoly Baksheev
0dad070473
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
2013-11-17 14:08:56 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Alexander Alekhin
09f0e1777e
cmake: fix linker deps for CUDA
2013-10-16 18:34:47 +04:00