From 24205a7e03528d413fe201b58096c245bd42091b Mon Sep 17 00:00:00 2001 From: Yaya-Cout <67095734+Yaya-Cout@users.noreply.github.com> Date: Mon, 24 Jan 2022 18:22:07 +0100 Subject: [PATCH] Fix CI and replacement character (#133) --- ion/test/events.cpp | 2 +- kandinsky/include/kandinsky/font.h | 2 +- kandinsky/src/font.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ion/test/events.cpp b/ion/test/events.cpp index 0c3fd3298..8dbe9bde9 100644 --- a/ion/test/events.cpp +++ b/ion/test/events.cpp @@ -18,7 +18,7 @@ QUIZ_CASE(ion_events_from_keyboard) { // Test some fallbacks quiz_assert(Event(Key::EXE, false, false, false) == EXE); - quiz_assert(Event(Key::EXE, true, false, false) == EXE); + quiz_assert(Event(Key::EXE, true, false, false) == ShiftEXE); quiz_assert(Event(Key::EXE, false, true, false) == EXE); quiz_assert(Event(Key::EXE, true, true, false) == EXE); quiz_assert(Event(Key::EXE, false, true, true) == EXE); diff --git a/kandinsky/include/kandinsky/font.h b/kandinsky/include/kandinsky/font.h index 3195d0180..2b7921cce 100644 --- a/kandinsky/include/kandinsky/font.h +++ b/kandinsky/include/kandinsky/font.h @@ -61,7 +61,7 @@ public: CodePoint m_codePoint; GlyphIndex m_glyphIndex; }; - static constexpr GlyphIndex IndexForReplacementCharacterCodePoint = 134; + static constexpr GlyphIndex IndexForReplacementCharacterCodePoint = 190; GlyphIndex indexForCodePoint(CodePoint c) const; void setGlyphGrayscalesForCodePoint(CodePoint codePoint, GlyphBuffer * glyphBuffer) const; diff --git a/kandinsky/src/font.cpp b/kandinsky/src/font.cpp index a1d217521..67d39383b 100644 --- a/kandinsky/src/font.cpp +++ b/kandinsky/src/font.cpp @@ -155,7 +155,7 @@ KDFont::GlyphIndex KDFont::indexForCodePoint(CodePoint c) const { return endPair->glyphIndex(); } NoMatchingGlyph: - assert(SimpleCodePoints[IndexForReplacementCharacterCodePoint] == 0xFFFD); + assert(ExtendedCodePoints[IndexForReplacementCharacterCodePoint] == 0xFFFD); return IndexForReplacementCharacterCodePoint; #endif }