Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upstream_utils] Update imgui and implot (#8762)

Browse Source 
Not updating GLFW yet due to a likely future move to SDL.
This commit is contained in:
Peter Johnson
2026-04-12 12:19:32 -07:00
committed by GitHub
parent d76486d885
commit 476b9641c1
47 changed files with 27710 additions and 12792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
upstream_utils/implot_patches/0001-Supress-compiler-warnings.patch
View File

@@ -1,42 +1,44 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Wed, 10 Jul 2024 03:16:19 -0400
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 11 Apr 2026 22:54:19 -0700
Subject: [PATCH] Supress compiler warnings
---
implot_internal.h | 8 ++++++++
implot_internal.h | 9 +++++++++
implot_items.cpp | 4 ++++
2 files changed, 12 insertions(+)
2 files changed, 13 insertions(+)
diff --git a/implot_internal.h b/implot_internal.h
index fb01204819348fde5477359e3b7b87055b944811..1333085423a88b9fefc8192d4b2e04db1cc1b10c 100644
index 9f6dfb23ff38c354928dc5be51e1884d6df4c9c7..5ce48ed8338bba24ad87af6870a23cdd1aa75a9b 100644
--- a/implot_internal.h
+++ b/implot_internal.h
@@ -38,6 +38,10 @@
#error Must include implot.h before implot_internal.h
@@ -37,6 +37,11 @@
#endif
#ifndef IMGUI_DISABLE
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
+
#include <time.h>
#include "imgui_internal.h"
// Support for pre-1.84 versions. ImPool's GetSize() -> GetBufSize()
#if (IMGUI_VERSION_NUM < 18303)
@@ -1665,3 +1669,7 @@ void Locator_Log10(ImPlotTicker& ticker, const ImPlotRange& range, float pixels,
void Locator_SymLog(ImPlotTicker& ticker, const ImPlotRange& range, float pixels, bool vertical, ImPlotFormatter formatter, void* formatter_data);
@@ -1710,4 +1715,8 @@ IMPLOT_API void Locator_SymLog(ImPlotTicker& ticker, const ImPlotRange& range, f
} // namespace ImPlot
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
#endif // #ifndef IMGUI_DISABLE
diff --git a/implot_items.cpp b/implot_items.cpp
index c57ca9d4d669501bd2d9a54ee39ac6cfb707e29a..a56f5b89912460008c4a108e26c1e764d21678f2 100644
index adea97ef7604cf092b00793989a21c147ff999e2..717386dc394b904a08918113efc7949e5dfe9dac 100644
--- a/implot_items.cpp
+++ b/implot_items.cpp
@@ -26,6 +26,10 @@
#include "implot.h"
@@ -30,6 +30,10 @@
#ifndef IMGUI_DISABLE
#include "implot_internal.h"
+#ifdef __GNUC__