From 121f3a3d312f1e487414f8d5365b9be21a31e927 Mon Sep 17 00:00:00 2001 From: Simon Schmeisser Date: Thu, 27 Apr 2023 15:42:58 +0200 Subject: [PATCH] Ogre::UTFString was removed in 13.0 --- src/rviz/ogre_helpers/movable_text.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rviz/ogre_helpers/movable_text.cpp b/src/rviz/ogre_helpers/movable_text.cpp index 6a516d4af0..b17c55eae2 100644 --- a/src/rviz/ogre_helpers/movable_text.cpp +++ b/src/rviz/ogre_helpers/movable_text.cpp @@ -51,7 +51,9 @@ #include #include #include +#if (OGRE_VERSION < OGRE_VERSION_CHECK(13, 0, 0)) #include +#endif #include @@ -215,7 +217,11 @@ void MovableText::showOnTop(bool show) void MovableText::_setupGeometry() { +#if (OGRE_VERSION >= OGRE_VERSION_CHECK(13, 0, 0)) + Ogre::String utfCaption(mCaption); +#else Ogre::UTFString::utf32string utfCaption(Ogre::UTFString(mCaption).asUTF32()); +#endif assert(mpFont); assert(!mpMaterial.isNull());