Skip to content

Commit

Permalink
try macos-12
Browse files Browse the repository at this point in the history
  • Loading branch information
tonsky committed Dec 4, 2024
1 parent b980c84 commit 74d49bd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:

jobs:
build_macos:
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@v3
with:
Expand Down
10 changes: 7 additions & 3 deletions shared/java/FontMgr.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,18 @@ public Typeface matchFamiliesStyleCharacter(String[] families, FontStyle style,
}

/**
* Create a typeface for the specified data and TTC index (pass 0 for none)
* or null if the data is not recognized. The caller must call {@link #close()} on
* the returned object if it is not null.
* Create a typeface for the specified data or null if the data is not recognized.
* The caller must call {@link #close()} on the returned object if it is not null.
*/
public Typeface makeFromData(Data data) {
return makeFromData(data, 0);
}

/**
* Create a typeface for the specified data and TTC index (pass 0 for none)
* or null if the data is not recognized. The caller must call {@link #close()} on
* the returned object if it is not null.
*/
public Typeface makeFromData(Data data, int ttcIndex) {
try {
Stats.onNativeCall();
Expand Down

0 comments on commit 74d49bd

Please sign in to comment.