Skip to content

Commit

Permalink
Ogre::UTFString was removed in 13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
simonschmeisser committed Dec 17, 2023
1 parent 25380ce commit ea2ca2c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/rviz/ogre_helpers/movable_text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
#include <OgreHardwareBufferManager.h>
#include <Overlay/OgreFontManager.h>
#include <Overlay/OgreFont.h>
#if (OGRE_VERSION < OGRE_VERSION_CHECK(13, 0, 0))
#include <OgreUTFString.h>
#endif

#include <sstream>

Expand Down Expand Up @@ -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());
Expand Down

0 comments on commit ea2ca2c

Please sign in to comment.