From a8113b5ecbde991b6b5ceaf458f43e531c17aeed Mon Sep 17 00:00:00 2001 From: Kwanghoon Son Date: Tue, 2 Aug 2022 21:18:16 -0400 Subject: [PATCH] Add gcc -Wall -Wextra option [Issue type] : New feature To prevent unsued variable or miss-type casting Change-Id: Ia74af20014c136d84bfa1d80164e388c828b158b Signed-off-by: Kwanghoon Son --- mv_barcode/barcode_detector/CMakeLists.txt | 1 + mv_barcode/barcode_detector/src/mv_barcode_detect.c | 4 ++-- mv_barcode/barcode_generator/CMakeLists.txt | 1 + mv_common/CMakeLists.txt | 1 + mv_face/face/CMakeLists.txt | 1 + mv_face/face/src/mv_face.c | 7 ++++--- mv_image/image/CMakeLists.txt | 1 + mv_roi_tracker/roi_tracker/CMakeLists.txt | 1 + mv_roi_tracker/roi_tracker/src/mv_roi_tracker_open.cpp | 4 ++-- mv_surveillance/surveillance/CMakeLists.txt | 1 + mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp | 2 +- 11 files changed, 16 insertions(+), 8 deletions(-) diff --git a/mv_barcode/barcode_detector/CMakeLists.txt b/mv_barcode/barcode_detector/CMakeLists.txt index b67afb1..7a8a93c 100644 --- a/mv_barcode/barcode_detector/CMakeLists.txt +++ b/mv_barcode/barcode_detector/CMakeLists.txt @@ -18,4 +18,5 @@ endif() target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} zbar dlog) target_include_directories(${PROJECT_NAME} PRIVATE include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_barcode/barcode_detector/src/mv_barcode_detect.c b/mv_barcode/barcode_detector/src/mv_barcode_detect.c index 9b04636..c46d12a 100644 --- a/mv_barcode/barcode_detector/src/mv_barcode_detect.c +++ b/mv_barcode/barcode_detector/src/mv_barcode_detect.c @@ -57,8 +57,8 @@ int mv_barcode_detect( } if (roi.point.x < 0 || roi.point.y < 0 || - (roi.point.x + roi.width) > src_w || - (roi.point.y + roi.height) > src_h) { + (unsigned int)(roi.point.x + roi.width) > src_w || + (unsigned int)(roi.point.y + roi.height) > src_h) { LOGE("roi is out of area on source"); return MEDIA_VISION_ERROR_INVALID_PARAMETER; } diff --git a/mv_barcode/barcode_generator/CMakeLists.txt b/mv_barcode/barcode_generator/CMakeLists.txt index 099ae2c..3091ca9 100644 --- a/mv_barcode/barcode_generator/CMakeLists.txt +++ b/mv_barcode/barcode_generator/CMakeLists.txt @@ -14,4 +14,5 @@ endif() target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} zint dlog) target_include_directories(${PROJECT_NAME} PRIVATE include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt index b802adf..6434960 100644 --- a/mv_common/CMakeLists.txt +++ b/mv_common/CMakeLists.txt @@ -20,4 +20,5 @@ endif() target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES}) target_include_directories(${PROJECT_NAME} PUBLIC include ${${PROJECT_NAME}_DEP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_face/face/CMakeLists.txt b/mv_face/face/CMakeLists.txt index 3c30f7c..afad25a 100644 --- a/mv_face/face/CMakeLists.txt +++ b/mv_face/face/CMakeLists.txt @@ -17,4 +17,5 @@ endif() target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} dlog) target_include_directories(${PROJECT_NAME} PRIVATE include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_face/face/src/mv_face.c b/mv_face/face/src/mv_face.c index 99a809a..7624622 100644 --- a/mv_face/face/src/mv_face.c +++ b/mv_face/face/src/mv_face.c @@ -43,7 +43,8 @@ static int check_source_roi_quadrangle(mv_quadrangle_s *roi, mv_source_h source) } for (int idx = 0; idx < 4; idx++) { if (roi->points[idx].x < 0 || roi->points[idx].y < 0 || - roi->points[idx].x > src_w || roi->points[idx].y > src_h) { + (unsigned int) roi->points[idx].x > src_w || + (unsigned int) roi->points[idx].y > src_h) { LOGE("roi is out of area on source"); return MEDIA_VISION_ERROR_INVALID_PARAMETER; } @@ -74,8 +75,8 @@ static int check_source_roi(const mv_rectangle_s *roi, mv_source_h source) return ret; } if (roi->point.x < 0 || roi->point.y < 0 || - (roi->point.x + roi->width) > src_w || - (roi->point.y + roi->height) > src_h) { + (unsigned int) (roi->point.x + roi->width) > src_w || + (unsigned int) (roi->point.y + roi->height) > src_h) { LOGE("roi is out of area on source"); return MEDIA_VISION_ERROR_INVALID_PARAMETER; } diff --git a/mv_image/image/CMakeLists.txt b/mv_image/image/CMakeLists.txt index b0ff1c9..20c87e2 100644 --- a/mv_image/image/CMakeLists.txt +++ b/mv_image/image/CMakeLists.txt @@ -17,4 +17,5 @@ endif() target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS}) target_include_directories(${PROJECT_NAME} PUBLIC include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_roi_tracker/roi_tracker/CMakeLists.txt b/mv_roi_tracker/roi_tracker/CMakeLists.txt index 89eb790..da87d53 100644 --- a/mv_roi_tracker/roi_tracker/CMakeLists.txt +++ b/mv_roi_tracker/roi_tracker/CMakeLists.txt @@ -18,4 +18,5 @@ endif() target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES}) target_include_directories(${PROJECT_NAME} PRIVATE include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_roi_tracker/roi_tracker/src/mv_roi_tracker_open.cpp b/mv_roi_tracker/roi_tracker/src/mv_roi_tracker_open.cpp index 1f198f5..5fe8f0b 100644 --- a/mv_roi_tracker/roi_tracker/src/mv_roi_tracker_open.cpp +++ b/mv_roi_tracker/roi_tracker/src/mv_roi_tracker_open.cpp @@ -23,7 +23,7 @@ using namespace std; using namespace MediaVision::ROITracker; -static cv::Mat getTrackerFrame(mv_colorspace_e colorspace, unsigned int channels, unsigned int width, unsigned int height, unsigned char* buffer) +static cv::Mat getTrackerFrame(mv_colorspace_e colorspace, unsigned int width, unsigned int height, unsigned char* buffer) { switch (colorspace) { case MEDIA_VISION_COLORSPACE_Y800: @@ -146,7 +146,7 @@ int mv_roi_tracker_perform_open(mv_roi_tracker_h handle, mv_source_h source, mv_ LOGD(" w: %d, h: %d, c: %d", width, height, channels); try { - cv::Mat frame = getTrackerFrame(colorspace, channels, width, height, buffer); + cv::Mat frame = getTrackerFrame(colorspace, width, height, buffer); auto pTracker = static_cast(handle); pTracker->perform(frame); diff --git a/mv_surveillance/surveillance/CMakeLists.txt b/mv_surveillance/surveillance/CMakeLists.txt index 30c61f2..fd001b9 100644 --- a/mv_surveillance/surveillance/CMakeLists.txt +++ b/mv_surveillance/surveillance/CMakeLists.txt @@ -16,4 +16,5 @@ endif(ENABLE_NEON) target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${MV_FACE_LIB_NAME}) target_include_directories(${PROJECT_NAME} PRIVATE include) +target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp index 5fbf607..c367082 100644 --- a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp +++ b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp @@ -384,7 +384,7 @@ void EventTriggerPersonRecognition::faceRecognizedCB( double confidence, void *user_data) { - if (face_location == NULL || face_label == NULL) { + if (source == NULL || face_location == NULL || face_label == NULL) { LOGI("Face wasn't recognized"); return; } -- 2.7.4