Skip to content

Commit

Permalink
Merge pull request #540 from rdkcentral/release/2.13.2
Browse files Browse the repository at this point in the history
Release - v2.13.2
  • Loading branch information
uguraslan authored Jun 10, 2024
2 parents 688237d + 9e658f5 commit 4beb4d3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## v2.13.2
*04 June 2024*

- Fixes limiting behaviour that prevented using other system fonts. (#537)
- Fixes duplicated call for `_cleanupLookupMap()` in the garbage collection function. (#520)
- Fixes the issue causing double freeing of textures due to the garbage collection triggered during releasing memory. (#529)

## v2.13.1
*12 apr 2024*

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"author": "Metrological, Bas van Meurs <[email protected]>",
"name": "@lightningjs/core",
"version": "2.13.1",
"version": "2.13.2",
"license": "Apache-2.0",
"type": "module",
"types": "dist/src/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions src/textures/TextTextureRendererUtils.mts
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ export function getFontSetting(
let curFf = ff[i];
// Replace the default font face `null` with the actual default font face set
// on the stage.
if (curFf === null) {
if (curFf == null) {
curFf = defaultFontFace;
}
if (curFf === "serif" || curFf === "sans-serif") {
if (curFf.indexOf(' ') < 0) {
ffs.push(curFf);
} else {
ffs.push(`"${curFf}"`);
Expand Down
2 changes: 1 addition & 1 deletion src/tree/Stage.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ export default class Stage extends EventEmitter {

addMemoryUsage(delta) {
this._usedMemory += delta;
if (this._lastGcFrame !== this.frameCounter) {
if (delta > 0 && this._lastGcFrame !== this.frameCounter) {
if (this._usedMemory > this.getOption('memoryPressure')) {
this.gc(false);
if (this._usedMemory > this.getOption('memoryPressure') - 2e6) {
Expand Down
1 change: 0 additions & 1 deletion src/tree/TextureManager.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ export default class TextureManager {

gc() {
this.freeUnusedTextureSources();
this._cleanupLookupMap();
}

freeUnusedTextureSources() {
Expand Down

0 comments on commit 4beb4d3

Please sign in to comment.