Skip to content

Test: macos-15 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glx22 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test: macos-15 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa0198e
Test: macos-15
glx22 Jul 7, 2025
fc3cef2
Codefix: [macos] variable length array warnings with clang-17
glx22 Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
macos:
name: CI

runs-on: macos-latest
runs-on: macos-15
env:
MACOSX_DEPLOYMENT_TARGET: 10.13

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
macos:
name: MacOS

runs-on: macos-latest
runs-on: macos-15
env:
MACOSX_DEPLOYMENT_TARGET: 10.13

Expand Down
16 changes: 8 additions & 8 deletions src/os/macosx/string_osx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,22 +235,22 @@ CoreTextParagraphLayout::CoreTextVisualRun::CoreTextVisualRun(CTRunRef run, Font
this->glyphs.resize(CTRunGetGlyphCount(run));

/* Query map of glyphs to source string index. */
CFIndex map[this->glyphs.size()];
CTRunGetStringIndices(run, CFRangeMake(0, 0), map);
std::unique_ptr<CFIndex[]> map = std::make_unique<CFIndex[]>(this->glyphs.size());
CTRunGetStringIndices(run, CFRangeMake(0, 0), map.get());

this->glyph_to_char.resize(this->glyphs.size());
for (size_t i = 0; i < this->glyph_to_char.size(); i++) this->glyph_to_char[i] = (int)map[i];

CGPoint pts[this->glyphs.size()];
CTRunGetPositions(run, CFRangeMake(0, 0), pts);
CGSize advs[this->glyphs.size()];
CTRunGetAdvances(run, CFRangeMake(0, 0), advs);
std::unique_ptr<CGPoint[]> pts = std::make_unique<CGPoint[]>(this->glyphs.size());
CTRunGetPositions(run, CFRangeMake(0, 0), pts.get());
std::unique_ptr<CGSize[]> advs = std::make_unique<CGSize[]>(this->glyphs.size());
CTRunGetAdvances(run, CFRangeMake(0, 0), advs.get());
this->positions.reserve(this->glyphs.size());

/* Convert glyph array to our data type. At the same time, substitute
* the proper glyphs for our private sprite glyphs. */
CGGlyph gl[this->glyphs.size()];
CTRunGetGlyphs(run, CFRangeMake(0, 0), gl);
std::unique_ptr<CGGlyph[]> gl = std::make_unique<CGGlyph[]>(this->glyphs.size());
CTRunGetGlyphs(run, CFRangeMake(0, 0), gl.get());
for (size_t i = 0; i < this->glyphs.size(); i++) {
if (buff[this->glyph_to_char[i]] >= SCC_SPRITE_START && buff[this->glyph_to_char[i]] <= SCC_SPRITE_END && (gl[i] == 0 || gl[i] == 3)) {
/* A glyph of 0 indidicates not found, while apparently 3 is what char 0xFFFC maps to. */
Expand Down
Loading