diff --git a/CMakeLists.txt b/CMakeLists.txt index 332577a..2a8d8a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,9 @@ #cmake_minimum_required(VERSION 2.8) -# cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.14.0) set(CMAKE_C_COMPILER "gcc-4.9") set(CMAKE_CXX_COMPILER "g++-4.9") -# set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") -# set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") - project(markup_tool) # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") # -stdlib=libc++ diff --git a/markup_backend/include/markup_backend/markup.h b/markup_backend/include/markup_backend/markup.h index 0af64d6..845cd63 100644 --- a/markup_backend/include/markup_backend/markup.h +++ b/markup_backend/include/markup_backend/markup.h @@ -17,7 +17,7 @@ struct PipelineRunParams { std::string tracker_model_path = ""; std::string weights_path = ""; std::string tmp_video_dir = "/tmp/markup_video"; - std::string debug_gt_tacks = "../markup_tool/data/test/MOT16-04/gt/gt.txt"; + std::string tracks_path = ""; std::string tmp_img_extention = ".png"; size_t tmp_img_path_pad2length = 10; std::string tracks_filename = "tracks.txt"; @@ -26,11 +26,7 @@ struct PipelineRunParams { class MarkUp { public: bool get_frame(size_t frame_idx, std::vector* detections) { - if (detections == nullptr) { - // TODO: Exceptions - std::cout << "No return container 'detections' provided!" << std::endl; - return false; - } + detections->clear(); detections->clear(); @@ -97,7 +93,25 @@ class MarkUp { video_ = std::make_unique