Skip to content

Commit cdbe335

Browse files
committed
Merge pull request #291 from shahurik:master
2 parents 2b64abd + ab72b24 commit cdbe335

26 files changed

+1447
-1844
lines changed

modules/adas/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

modules/adas/README.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

modules/adas/src/adas.cpp

Whitespace-only changes.

modules/adas/tools/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

modules/adas/tools/fcw_detect/CMakeLists.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

modules/adas/tools/fcw_detect/fcw_detect.cpp

Lines changed: 0 additions & 132 deletions
This file was deleted.

modules/adas/tools/fcw_train/fcw_train.cpp

Lines changed: 0 additions & 187 deletions
This file was deleted.

modules/xobjdetect/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
set(the_description "Object detection algorithms")
2-
ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_highgui WRAP python)
2+
ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_highgui opencv_objdetect WRAP python)
3+
add_subdirectory(tools)

0 commit comments

Comments
 (0)