games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-15 11:46:56 +02:00
Code Issues Releases Activity

Fix CI

Browse Source
This commit is contained in:
Ivan Savenko 2024-09-24 13:30:54 +00:00
parent ca3c6227c4
commit b624069f86
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/github.yml vendored
View File

@ -352,7 +352,7 @@ jobs:
run: | run: |
find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune -o -path ./test/googletest \ find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune -o -path ./test/googletest \
-o -path ./osx -prune -o -type f \ -o -path ./osx -prune -o -type f \
-not -name '*.png' -and -not -name '*.vcxproj*' -and -not -name '*.props' -and -not -name '*.wav' -and -not -name '*.webm' -and -not -name '*.ico' -and -not -name '*.bat' -print0 | \ -not -name '*.png' -and -not -name '*.ttf' -and -not -name '*.wav' -and -not -name '*.webm' -and -not -name '*.ico' -and -not -name '*.bat' -print0 | \
{ ! xargs -0 grep -l -z -P '\r\n'; } { ! xargs -0 grep -l -z -P '\r\n'; }
- name: Validate JSON - name: Validate JSON

11
client/renderSDL/CTrueTypeFont.cpp
View File

@ -94,7 +94,16 @@ size_t CTrueTypeFont::getGlyphWidthScaled(const char *data) const
bool CTrueTypeFont::canRepresentCharacter(const char * data) const bool CTrueTypeFont::canRepresentCharacter(const char * data) const
{ {
return TTF_GlyphIsProvided32(font.get(), TextOperations::getUnicodeCodepoint(data, TextOperations::getUnicodeCharacterSize(*data))); uint32_t codepoint = TextOperations::getUnicodeCodepoint(data, TextOperations::getUnicodeCharacterSize(*data));
#if SDL_TTF_VERSION_ATLEAST(2, 0, 18)
return TTF_GlyphIsProvided32(font.get(), codepoint);
#elif SDL_TTF_VERSION_ATLEAST(2, 0, 12)
if (codepoint <= 0xffff)
return TTF_GlyphIsProvided(font.get(), codepoint);
return true;
#else
return true;
#endif
} }
size_t CTrueTypeFont::getStringWidthScaled(const std::string & data) const size_t CTrueTypeFont::getStringWidthScaled(const std::string & data) const