Skip to content
Snippets Groups Projects
Commit 4ac25818 authored by Joaquim Casals Buñuel's avatar Joaquim Casals Buñuel
Browse files

Merge branch 'small_fixes' into devel

parents 580c68a0 86798816
No related branches found
No related tags found
3 merge requests!30Release after RAL,!29After 2nd RAL submission,!4Small fixes
...@@ -33,3 +33,4 @@ src/examples/map_apriltag_save.yaml ...@@ -33,3 +33,4 @@ src/examples/map_apriltag_save.yaml
\.vscode/ \.vscode/
build_release/ build_release/
laser.found
...@@ -111,19 +111,19 @@ IF(Ceres_FOUND) ...@@ -111,19 +111,19 @@ IF(Ceres_FOUND)
ENDIF(Ceres_FOUND) ENDIF(Ceres_FOUND)
FIND_PATH( #FIND_PATH(
Suitesparse_INCLUDE_DIRS # Suitesparse_INCLUDE_DIRS
NAMES SuiteSparse_config.h # NAMES SuiteSparse_config.h
PATHS /usr/include/suitesparse /usr/local/include/suitesparse) # PATHS /usr/include/suitesparse /usr/local/include/suitesparse)
MESSAGE("Found suitesparse_INCLUDE_DIRS:" ${Suitesparse_INCLUDE_DIRS}) #MESSAGE("Found suitesparse_INCLUDE_DIRS:" ${Suitesparse_INCLUDE_DIRS})
#
IF(Suitesparse_INCLUDE_DIRS) #IF(Suitesparse_INCLUDE_DIRS)
SET(Suitesparse_FOUND TRUE) # SET(Suitesparse_FOUND TRUE)
MESSAGE("Suitesparse FOUND: wolf_solver will be built.") # MESSAGE("Suitesparse FOUND: wolf_solver will be built.")
ELSE (Suitesparse_INCLUDE_DIRS) #ELSE (Suitesparse_INCLUDE_DIRS)
SET(Suitesparse_FOUND FALSE) # SET(Suitesparse_FOUND FALSE)
MESSAGE(FATAL_ERROR "Suitesparse NOT FOUND") # MESSAGE(FATAL_ERROR "Suitesparse NOT FOUND")
ENDIF (Suitesparse_INCLUDE_DIRS) #ENDIF (Suitesparse_INCLUDE_DIRS)
# Define the directory where will be the configured config.h # Define the directory where will be the configured config.h
SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal) SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)
...@@ -269,12 +269,11 @@ ADD_LIBRARY(${PLUGIN_NAME} ...@@ -269,12 +269,11 @@ ADD_LIBRARY(${PLUGIN_NAME}
${SRCS_WRAPPER} ${SRCS_WRAPPER}
${SRCS_YAML} ${SRCS_YAML}
) )
#Link the created libraries
#===============EXAMPLE=========================
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARY} ${laser_scan_utils_LIBRARY}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARY} ${laser_scan_utils_LIBRARY})
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY})
#Link the created libraries
#===============EXAMPLE=========================
# IF (Ceres_FOUND) # IF (Ceres_FOUND)
# TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CERES_LIBRARIES}) # TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CERES_LIBRARIES})
# ENDIF(Ceres_FOUND) # ENDIF(Ceres_FOUND)
...@@ -320,8 +319,8 @@ INSTALL(FILES ${HDRS_LANDMARK} ...@@ -320,8 +319,8 @@ INSTALL(FILES ${HDRS_LANDMARK}
DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/landmark) DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/landmark)
INSTALL(FILES ${HDRS_WRAPPER} INSTALL(FILES ${HDRS_WRAPPER}
DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/ceres_wrapper) DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/ceres_wrapper)
INSTALL(FILES ${HDRS_SOLVER_SUITESPARSE} #INSTALL(FILES ${HDRS_SOLVER_SUITESPARSE}
DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver_suitesparse) # DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver_suitesparse)
INSTALL(FILES ${HDRS_SOLVER} INSTALL(FILES ${HDRS_SOLVER}
DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver) DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver)
INSTALL(FILES ${HDRS_SERIALIZATION} INSTALL(FILES ${HDRS_SERIALIZATION}
......
...@@ -105,7 +105,7 @@ class ProcessorTrackerFeaturePolyline2D : public ProcessorTrackerFeature ...@@ -105,7 +105,7 @@ class ProcessorTrackerFeaturePolyline2D : public ProcessorTrackerFeature
/**\brief Process new Features /**\brief Process new Features
* *
*/ */
virtual unsigned int processNew(const unsigned int& _max_features); virtual unsigned int processNew(const int& _max_features);
/** \brief Detect new Features /** \brief Detect new Features
* \param _max_features maximum number of features detected (-1: unlimited. 0: none) * \param _max_features maximum number of features detected (-1: unlimited. 0: none)
......
...@@ -161,7 +161,7 @@ bool ProcessorTrackerFeaturePolyline2D::voteForKeyFrame() ...@@ -161,7 +161,7 @@ bool ProcessorTrackerFeaturePolyline2D::voteForKeyFrame()
return false; return false;
} }
unsigned int ProcessorTrackerFeaturePolyline2D::processNew(const unsigned int& _max_features) unsigned int ProcessorTrackerFeaturePolyline2D::processNew(const int& _max_features)
{ {
WOLF_DEBUG("PTFP ", getName(), "::processNew: "); WOLF_DEBUG("PTFP ", getName(), "::processNew: ");
unsigned int n = ProcessorTrackerFeature::processNew(_max_features); unsigned int n = ProcessorTrackerFeature::processNew(_max_features);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment