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
2 changes: 1 addition & 1 deletion apps/manual_color/manual_color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ void display()
}
}
ImGui::SameLine();
ImGui::Text("%d: %.1f,%.1f,%.1f", index, p.x(), p.y(), p.z());
ImGui::Text("%ld: %.1f,%.1f,%.1f", index, p.x(), p.y(), p.z());
}
ImGui::EndChild();

Expand Down
3 changes: 2 additions & 1 deletion core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ set(CORE_INCLUDE_FILES_GUI
# GUI-independent target
add_library(core_no_gui STATIC ${CORE_SOURCE_FILES} ${CORE_INCLUDE_FILES})
target_compile_definitions(core_no_gui PRIVATE WITH_GUI=0)
target_compile_options(core_no_gui PRIVATE -fPIC)
set_target_properties(core_no_gui PROPERTIES
POSITION_INDEPENDENT_CODE ON)
target_link_libraries(core_no_gui PRIVATE ${PLATFORM_LASZIP_LIB} ${PLATFORM_MISCELLANEOUS_LIBS})
target_include_directories(core_no_gui PRIVATE
include
Expand Down
3 changes: 2 additions & 1 deletion core/src/control_points.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ void ControlPoints::imgui(PointClouds &point_clouds_container, Eigen::Vector3f &
int remove_gcp_index = -1;
for (int i = 0; i < cps.size(); i++)
{
ImGui::Text((std::string("CP_") + std::to_string(i) + " [" + cps[i].name + "]").c_str());
const auto gui_text = (std::string("CP_") + std::to_string(i) + " [" + cps[i].name + "]");
ImGui::Text("%s", gui_text.c_str());
ImGui::SameLine();
if (ImGui::Button(("Remove##" + std::to_string(i)).c_str()))
{
Expand Down
18 changes: 7 additions & 11 deletions shared/include/HDMapping/Version.hpp
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
#pragma once

#ifndef HDMAPPING_VERSION_MAJOR
#error \
"Major version not defined - define HDMAPPING_VERSION_MAJOR inside top-level CMakeLists.txt file."
#error "Major version not defined - define HDMAPPING_VERSION_MAJOR inside top-level CMakeLists.txt file."
#endif

#ifndef HDMAPPING_VERSION_MINOR
#error \
"Minor version not defined - define HDMAPPING_VERSION_MINOR inside top-level CMakeLists.txt file."
#error "Minor version not defined - define HDMAPPING_VERSION_MINOR inside top-level CMakeLists.txt file."
#endif

#ifndef HDMAPPING_VERSION_PATCH
#error \
"Minor version not defined - define HDMAPPING_VERSION_PATCH inside top-level CMakeLists.txt file."
#error "Minor version not defined - define HDMAPPING_VERSION_PATCH inside top-level CMakeLists.txt file."
#endif

#define HDMAPPING_DEFINITION_TO_STRING_X(definition) #definition
#define HDMAPPING_DEFINITION_TO_STRING(definition) \
HDMAPPING_DEFINITION_TO_STRING_X(definition)
#define HDMAPPING_DEFINITION_TO_STRING(definition) HDMAPPING_DEFINITION_TO_STRING_X(definition)

#define HDMAPPING_VERSION_STRING \
"v" HDMAPPING_DEFINITION_TO_STRING(HDMAPPING_VERSION_MAJOR) "." HDMAPPING_DEFINITION_TO_STRING( \
HDMAPPING_VERSION_MINOR) "." HDMAPPING_DEFINITION_TO_STRING(HDMAPPING_VERSION_PATCH)
#define HDMAPPING_VERSION_STRING \
"v" HDMAPPING_DEFINITION_TO_STRING(HDMAPPING_VERSION_MAJOR) "." HDMAPPING_DEFINITION_TO_STRING( \
HDMAPPING_VERSION_MINOR) "." HDMAPPING_DEFINITION_TO_STRING(HDMAPPING_VERSION_PATCH)