Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v6

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand Down Expand Up @@ -81,4 +81,4 @@ jobs:
run: cmake --build . --config $BUILD_TYPE

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: macOS-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/static_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Install OpenCV
run: |
Expand All @@ -24,10 +24,10 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{github.workspace}}/build
run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
run: cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

- name: Upload Compile Commands
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: compile_commands
path: ${{github.workspace}}/build/compile_commands.json
Expand All @@ -46,7 +46,7 @@ jobs:
-export-fixes ${{github.workspace}}/clang-tidy-fixes.yaml

- name: Upload Clang Tidy Result
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: clang_tidy_fixes
path: ${{github.workspace}}/clang-tidy-fixes.yaml
Expand All @@ -58,10 +58,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: Download Compile Commands
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: compile_commands

Expand All @@ -78,7 +78,7 @@ jobs:
--output-file=${{github.workspace}}/cppcheck-report.txt .

- name: Upload CppCheck Result
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: cppcheck_report
path: ${{github.workspace}}/cppcheck-report.txt
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Install OpenCV
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build
Expand Down
10 changes: 9 additions & 1 deletion external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,17 @@ set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)

ExternalProject_Add(opencv
GIT_REPOSITORY https://github.com/opencv/opencv.git
GIT_TAG 4.5.0
GIT_TAG 4.6.0
INSTALL_DIR ${EXTERNAL_INSTALL_LOCATION}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
-DBUILD_ZLIB=OFF
-DBUILD_PNG=OFF
-DBUILD_JPEG=OFF
-DBUILD_TIFF=OFF
-DBUILD_WEBP=OFF
-DBUILD_OPENJPEG=OFF
-DBUILD_DOCS=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_PERF_TESTS=OFF
Expand All @@ -22,4 +29,5 @@ ExternalProject_Add(opencv
-DBUILD_opencv_python3=OFF
-DBUILD_PROTOBUF=OFF
-DBUILD_opencv_dnn=OFF
-DBUILD_JAVA=OFF
)
66 changes: 66 additions & 0 deletions traincascade/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,40 @@ target_compile_options(
${PROJECT_NAME}
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
$<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus /Zc:preprocessor /Zc:inline>
$<$<CXX_COMPILER_ID:MSVC>:/w14191 /w14242 /w14254 /w14263 /w14265 /w14266 /w14287>
$<$<CXX_COMPILER_ID:MSVC>:/w14289 /w14296 /w14311 /w14545 /w14546 /w14547 /w14549>
$<$<CXX_COMPILER_ID:MSVC>:/w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928>
# $<$<CXX_COMPILER_ID:MSVC>:/w14365> # Fix in code
$<$<CXX_COMPILER_ID:MSVC>:/w14062 /w14061 /w15262 /w14463 /w14146>
$<$<CXX_COMPILER_ID:MSVC>:/w14456 /w14457 /w14458 /w14459>
$<$<CXX_COMPILER_ID:MSVC>:/w14700 /w14701 /w14703 /w14774 /w14777>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
# $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wold-style-cast> # Fix in code
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wcast-qual>
# $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wsign-conversion> # Fix in code
# $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wconversion> # Fix in code
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wshadow -Wnull-dereference -Wmisleading-indentation>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wimplicit-fallthrough -Wswitch-enum>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wshift-negative-value>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wformat=2 -Wformat-security>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fstrict-aliasing>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wstack-protector -fstack-protector-strong>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wnon-virtual-dtor -Woverloaded-virtual>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wuninitialized>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Walloca -Wvla>
$<$<CXX_COMPILER_ID:GNU>:-Wcast-align=strict>
$<$<CXX_COMPILER_ID:GNU>:-Warith-conversion>
$<$<CXX_COMPILER_ID:GNU>:-Wduplicated-branches>
$<$<CXX_COMPILER_ID:GNU>:-Wduplicated-cond>
$<$<CXX_COMPILER_ID:GNU>:-Wlogical-op>
$<$<CXX_COMPILER_ID:GNU>:-Wshift-overflow=2>
$<$<CXX_COMPILER_ID:GNU>:-Wstrict-aliasing=3>
$<$<CXX_COMPILER_ID:GNU>:-Wmaybe-uninitialized>
$<$<CXX_COMPILER_ID:Clang>:-Wcast-align>
$<$<CXX_COMPILER_ID:Clang>:-Wlogical-op-parentheses>
$<$<CXX_COMPILER_ID:Clang>:-Wshift-overflow>
$<$<CXX_COMPILER_ID:Clang>:-Wconditional-uninitialized -Wsometimes-uninitialized>
)

target_include_directories(
Expand Down Expand Up @@ -127,7 +160,40 @@ target_compile_options(
test_traincascade
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
$<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus /Zc:preprocessor /Zc:inline>
$<$<CXX_COMPILER_ID:MSVC>:/w14191 /w14242 /w14254 /w14263 /w14265 /w14266 /w14287>
$<$<CXX_COMPILER_ID:MSVC>:/w14289 /w14296 /w14311 /w14545 /w14546 /w14547 /w14549>
$<$<CXX_COMPILER_ID:MSVC>:/w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928>
$<$<CXX_COMPILER_ID:MSVC>:/w14365>
$<$<CXX_COMPILER_ID:MSVC>:/w14062 /w14061 /w15262 /w14463 /w14146>
$<$<CXX_COMPILER_ID:MSVC>:/w14456 /w14457 /w14458 /w14459>
$<$<CXX_COMPILER_ID:MSVC>:/w14700 /w14701 /w14703 /w14774 /w14777>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wold-style-cast>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wcast-qual>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wsign-conversion>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wconversion>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wshadow -Wnull-dereference -Wmisleading-indentation>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wimplicit-fallthrough -Wswitch-enum>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wshift-negative-value>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wformat=2 -Wformat-security>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fstrict-aliasing>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wstack-protector -fstack-protector-strong>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wnon-virtual-dtor -Woverloaded-virtual>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wuninitialized>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Walloca -Wvla>
$<$<CXX_COMPILER_ID:GNU>:-Wcast-align=strict>
$<$<CXX_COMPILER_ID:GNU>:-Warith-conversion>
$<$<CXX_COMPILER_ID:GNU>:-Wduplicated-branches>
$<$<CXX_COMPILER_ID:GNU>:-Wduplicated-cond>
$<$<CXX_COMPILER_ID:GNU>:-Wlogical-op>
$<$<CXX_COMPILER_ID:GNU>:-Wshift-overflow=2>
$<$<CXX_COMPILER_ID:GNU>:-Wstrict-aliasing=3>
$<$<CXX_COMPILER_ID:GNU>:-Wmaybe-uninitialized>
$<$<CXX_COMPILER_ID:Clang>:-Wcast-align>
$<$<CXX_COMPILER_ID:Clang>:-Wlogical-op-parentheses>
$<$<CXX_COMPILER_ID:Clang>:-Wshift-overflow>
$<$<CXX_COMPILER_ID:Clang>:-Wconditional-uninitialized -Wsometimes-uninitialized>
)

target_include_directories(
Expand Down