From a2668263fe550e56032f1b4f6242c606569051f0 Mon Sep 17 00:00:00 2001 From: Ian Sherman Date: Wed, 3 Jan 2024 16:09:09 -0800 Subject: [PATCH] Fixes for compiler warnings, upgraded fmt and farm_ng_core --- components/pango_context/CMakeLists.txt | 2 +- components/pango_core/CMakeLists.txt | 2 +- components/pango_core/src/logging.cpp | 2 ++ components/pango_image/CMakeLists.txt | 2 +- .../include/pangolin/gl/glplatform.h | 3 ++- .../include/pangolin/gl/glsl_program.h | 2 +- components/pango_render/CMakeLists.txt | 2 +- .../pango_windowing/src/display_headless.cpp | 2 +- .../pango_windowing/src/display_wayland.cpp | 2 +- components/pango_windowing/src/display_x11.cpp | 18 +++++++++--------- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/components/pango_context/CMakeLists.txt b/components/pango_context/CMakeLists.txt index dbca54dfa..35a6068d8 100644 --- a/components/pango_context/CMakeLists.txt +++ b/components/pango_context/CMakeLists.txt @@ -29,7 +29,7 @@ if(BUILD_TESTS) catch_discover_tests(layer_group_test) endif() -target_link_libraries(${COMPONENT} PUBLIC pango_windowing pango_render pango_vars Sophus::sophus_image Sophus::sophus_sensor) +target_link_libraries(${COMPONENT} PUBLIC pango_windowing pango_render pango_vars farm_ng_core::sophus_image farm_ng_core::sophus_sensor) target_link_libraries(${COMPONENT} PUBLIC pango_opengl) find_package(assimp QUIET) diff --git a/components/pango_core/CMakeLists.txt b/components/pango_core/CMakeLists.txt index dc5771f97..84e76a341 100644 --- a/components/pango_core/CMakeLists.txt +++ b/components/pango_core/CMakeLists.txt @@ -45,7 +45,7 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include" DESTINATION ${CMAKE_INSTALL_PREFIX} ) -target_link_libraries(${COMPONENT} PUBLIC Sophus::sophus third_party) +target_link_libraries(${COMPONENT} PUBLIC farm_ng_core::sophus third_party) find_package(Threads QUIET) if(Threads_FOUND) diff --git a/components/pango_core/src/logging.cpp b/components/pango_core/src/logging.cpp index 87b4c5c71..f4133e070 100644 --- a/components/pango_core/src/logging.cpp +++ b/components/pango_core/src/logging.cpp @@ -118,3 +118,5 @@ Log& Log::instance() } } // namespace pangolin + +template <> struct fmt::formatter : ostream_formatter {}; \ No newline at end of file diff --git a/components/pango_image/CMakeLists.txt b/components/pango_image/CMakeLists.txt index aff216a7b..fbedc21d9 100644 --- a/components/pango_image/CMakeLists.txt +++ b/components/pango_image/CMakeLists.txt @@ -3,7 +3,7 @@ get_filename_component(COMPONENT ${CMAKE_CURRENT_LIST_DIR} NAME) find_package (Eigen3 REQUIRED QUIET) target_compile_definitions(${COMPONENT} PUBLIC HAVE_EIGEN) -target_link_libraries(${COMPONENT} PUBLIC Sophus::sophus_image) +target_link_libraries(${COMPONENT} PUBLIC farm_ng_core::sophus_image) option(BUILD_PANGOLIN_LIBPNG "Build support for libpng image input" ON) if(BUILD_PANGOLIN_LIBPNG) diff --git a/components/pango_opengl/include/pangolin/gl/glplatform.h b/components/pango_opengl/include/pangolin/gl/glplatform.h index 23d836721..cb95187be 100644 --- a/components/pango_opengl/include/pangolin/gl/glplatform.h +++ b/components/pango_opengl/include/pangolin/gl/glplatform.h @@ -73,7 +73,8 @@ const GLubyte* glErrorString(GLenum error); if (gl_error != GL_NO_ERROR) { \ pangolin::Log::instance().log( \ pangolin::Log::Kind::Error, __FILE__, PANGO_FUNCTION, __LINE__, "", \ - "GL Error ({}): {}", gl_error, pangolin::glErrorString(gl_error)); \ + "GL Error ({}): {}", gl_error, \ + reinterpret_cast(pangolin::glErrorString(gl_error))); \ return false; \ } \ return true; \ diff --git a/components/pango_opengl/include/pangolin/gl/glsl_program.h b/components/pango_opengl/include/pangolin/gl/glsl_program.h index 6d522da40..e099dc285 100644 --- a/components/pango_opengl/include/pangolin/gl/glsl_program.h +++ b/components/pango_opengl/include/pangolin/gl/glsl_program.h @@ -67,7 +67,7 @@ struct GlSlProgram { // for compile error messages only. struct Source { ShaderType shader_type = ShaderType::Annotated; - std::filesystem::path origin; + std::filesystem::path origin = {}; std::string glsl_code = ""; int origin_line = 0; }; diff --git a/components/pango_render/CMakeLists.txt b/components/pango_render/CMakeLists.txt index b3770bf08..7ddaa2c20 100644 --- a/components/pango_render/CMakeLists.txt +++ b/components/pango_render/CMakeLists.txt @@ -16,7 +16,7 @@ foreach(basename ${component_file_basenames}) endif() endforeach() -target_link_libraries(${COMPONENT} PUBLIC pango_core Sophus::sophus_image Sophus::sophus_sensor) +target_link_libraries(${COMPONENT} PUBLIC pango_core farm_ng_core::sophus_image farm_ng_core::sophus_sensor) target_include_directories(${COMPONENT} PUBLIC $ diff --git a/components/pango_windowing/src/display_headless.cpp b/components/pango_windowing/src/display_headless.cpp index fad59af2f..b63679821 100644 --- a/components/pango_windowing/src/display_headless.cpp +++ b/components/pango_windowing/src/display_headless.cpp @@ -172,7 +172,7 @@ PANGOLIN_REGISTER_FACTORY(HeadlessWindow) {"w", "640", "Requested buffer width"}, {"h", "480", "Requested buffer height"}, {"window_title", "main", "Title (Unused)"}, - {PARAM_GL_PROFILE, "Ignored for now"}, + {PARAM_GL_PROFILE, "Ignored for now", ""}, }}; } std::unique_ptr Open(const Uri& uri) override diff --git a/components/pango_windowing/src/display_wayland.cpp b/components/pango_windowing/src/display_wayland.cpp index 973407cce..3d5a98f6d 100644 --- a/components/pango_windowing/src/display_wayland.cpp +++ b/components/pango_windowing/src/display_wayland.cpp @@ -1227,7 +1227,7 @@ PANGOLIN_REGISTER_FACTORY(WaylandWindow) "Whether the window should be double buffered"}, {"sample_buffers", "1", ""}, {"samples", "1", ""}, - {PARAM_GL_PROFILE, "Ignored for now"}, + {PARAM_GL_PROFILE, "Ignored for now", ""}, }}; } diff --git a/components/pango_windowing/src/display_x11.cpp b/components/pango_windowing/src/display_x11.cpp index 40f8a98f4..fcbce02e6 100644 --- a/components/pango_windowing/src/display_x11.cpp +++ b/components/pango_windowing/src/display_x11.cpp @@ -426,8 +426,8 @@ void X11Window::ProcessEvents() case ButtonRelease: { const int button = ev.xbutton.button - 1; MouseSignal(MouseEvent{ - (float)ev.xbutton.x, (float)ev.xbutton.y, - GetEventFlagsFromXState(ev.xkey.state), 1 << button, + {(float)ev.xbutton.x, (float)ev.xbutton.y, + GetEventFlagsFromXState(ev.xkey.state)}, 1 << button, ev.xbutton.type == ButtonPress}); break; } @@ -435,15 +435,15 @@ void X11Window::ProcessEvents() break; case MotionNotify: if (ev.xmotion.state & (Button1Mask | Button2Mask | Button3Mask)) { - MouseMotionSignal(MouseMotionEvent{ + MouseMotionSignal(MouseMotionEvent{{ (float)ev.xbutton.x, (float)ev.xbutton.y, - GetEventFlagsFromXState(ev.xkey.state), + GetEventFlagsFromXState(ev.xkey.state)} }); } else { - PassiveMouseMotionSignal(MouseMotionEvent{ + PassiveMouseMotionSignal(MouseMotionEvent{{ (float)ev.xbutton.x, (float)ev.xbutton.y, - GetEventFlagsFromXState(ev.xkey.state)}); + GetEventFlagsFromXState(ev.xkey.state)}}); } break; case KeyPress: @@ -534,9 +534,9 @@ void X11Window::ProcessEvents() } if (key >= 0) { - KeyboardSignal(KeyboardEvent{ + KeyboardSignal(KeyboardEvent{{ (float)ev.xkey.x, (float)ev.xkey.y, - GetEventFlagsFromXState(ev.xkey.state), (unsigned char)key, + GetEventFlagsFromXState(ev.xkey.state)}, (unsigned char)key, ev.type == KeyPress}); } @@ -594,7 +594,7 @@ PANGOLIN_REGISTER_FACTORY(X11Window) "Whether the window should be double buffered"}, {"sample_buffers", "1", ""}, {"samples", "1", ""}, - {PARAM_GL_PROFILE, "Ignored for now"}, + {PARAM_GL_PROFILE, "Ignored for now", ""}, }}; }