diff options
| author | Łukasz Mariański | 2022-07-07 20:41:32 +0200 |
|---|---|---|
| committer | Łukasz Mariański | 2022-07-07 20:41:32 +0200 |
| commit | 92b200a2f4ed1bec7d0b90b4f2246dad59ff5d4d (patch) | |
| tree | c220909b9484663e6de7105e61e0c322f8a79dc8 /apriltag-trackers.patch | |
| parent | be200a9d0728e9410ec8bcd2fe8e4edfa141d680 (diff) | |
| download | aur-apriltag-trackers-git.tar.gz | |
remove dep on wxgtk3-dev
Diffstat (limited to 'apriltag-trackers.patch')
| -rw-r--r-- | apriltag-trackers.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/apriltag-trackers.patch b/apriltag-trackers.patch index c43801e3d102..eb22c5691856 100644 --- a/apriltag-trackers.patch +++ b/apriltag-trackers.patch @@ -29,6 +29,50 @@ index 0b56197..da15ab0 100644 common::semver) # Ensure compiler with c++17 language features +diff --git a/AprilTagTrackers/GUI/U8String.cpp b/AprilTagTrackers/GUI/U8String.cpp +index 55d6be3..7f617da 100644 +--- a/AprilTagTrackers/GUI/U8String.cpp ++++ b/AprilTagTrackers/GUI/U8String.cpp +@@ -4,7 +4,7 @@ + + U8String::operator wxString() const + { +- return wxString::FromUTF8Unchecked(str); ++ return wxString::FromUTF8Unchecked(str.c_str()); + } + + U8StringView::operator wxString() const +diff --git a/AprilTagTrackers/GUI/wxHelpers.h b/AprilTagTrackers/GUI/wxHelpers.h +index 937cda1..9a8ef19 100644 +--- a/AprilTagTrackers/GUI/wxHelpers.h ++++ b/AprilTagTrackers/GUI/wxHelpers.h +@@ -145,7 +145,7 @@ inline bool FromWXString(const wxString& str, double& out_val) + } + inline bool FromWXString(const wxString& str, std::string& out_val) + { +- out_val = str.utf8_string(); ++ out_val = str.utf8_str(); + return true; + } + inline bool FromWXString(const wxString& str, wxString& out_val) +@@ -169,7 +169,7 @@ inline bool FromWXString(const wxString& str, FS::Valid<T>& out_val) + /// Must be inverse of FromString. + inline wxString ToWXString(const std::string& val) + { +- return wxString::FromUTF8Unchecked(val); ++ return wxString::FromUTF8Unchecked(val.c_str()); + } + inline wxString ToWXString(const wxString& val) + { +@@ -180,7 +180,7 @@ inline wxString ToWXString(const T& val) + { + std::ostringstream ss; + ss << val; +- return wxString::FromUTF8(ss.str()); ++ return wxString::FromUTF8(ss.str().c_str()); + } + template <typename T> + inline wxString ToWXString(const FS::Valid<T>& val) diff --git a/AprilTagTrackers/Serializable.h b/AprilTagTrackers/Serializable.h index 6e143ed..98d80e9 100644 --- a/AprilTagTrackers/Serializable.h |