Skip to content

Commit c20ff6c

Browse files
vpisarevvpisarev
committed
made everything compile and even run somehow
1 parent 10b60f8 commit c20ff6c

31 files changed

Lines changed: 11907 additions & 9058 deletions

‎apps/traincascade/CMakeLists.txt‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(OPENCV_TRAINCASCADE_DEPS opencv_core opencv_ml opencv_imgproc opencv_photo opencv_objdetect opencv_imgcodecs opencv_videoio opencv_highgui opencv_calib3d opencv_video opencv_features2d)
1+
set(OPENCV_TRAINCASCADE_DEPS opencv_core opencv_imgproc opencv_objdetect opencv_imgcodecs opencv_highgui opencv_calib3d opencv_features2d)
22
ocv_check_dependencies(${OPENCV_TRAINCASCADE_DEPS})
33

44
if(NOT OCV_DEPENDENCIES_FOUND)
@@ -10,13 +10,10 @@ project(traincascade)
1010
ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
1111
ocv_include_modules(${OPENCV_TRAINCASCADE_DEPS})
1212

13-
set(traincascade_files traincascade.cpp
14-
cascadeclassifier.cpp cascadeclassifier.h
15-
boost.cpp boost.h features.cpp traincascade_features.h
16-
haarfeatures.cpp haarfeatures.h
17-
lbpfeatures.cpp lbpfeatures.h
18-
HOGfeatures.cpp HOGfeatures.h
19-
imagestorage.cpp imagestorage.h)
13+
file(GLOB SRCS *.cpp)
14+
file(GLOB HDRS *.h*)
15+
16+
set(traincascade_files ${SRCS} ${HDRS})
2017

2118
set(the_target opencv_traincascade)
2219
add_executable(${the_target} ${traincascade_files})

‎apps/traincascade/boost.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _OPENCV_BOOST_H_
33

44
#include "traincascade_features.h"
5-
#include "ml.h"
5+
#include "old_ml.hpp"
66

77
struct CvCascadeBoostParams : CvBoostParams
88
{

‎apps/traincascade/cascadeclassifier.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#include "lbpfeatures.h"
88
#include "HOGfeatures.h" //new
99
#include "boost.h"
10-
#include "cv.h"
11-
#include "cxcore.h"
1210

1311
#define CC_CASCADE_FILENAME "cascade.xml"
1412
#define CC_PARAMS_FILENAME "params.xml"

0 commit comments

Comments
 (0)