diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:17:16 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:17:16 +0300 |
| commit | 86c62c8f6088ec148512457cb7e964661ba643b0 (patch) | |
| tree | 15f82dc1436a5dd229fed729e15afb18bfafde62 /src/3rdparty/freetype/src/base/ftglyph.c | |
| parent | 4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a (diff) | |
| parent | 5ca8cfaa56043163997be2a6188812a8cd1c289c (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15
Change-Id: Ibe29c3c6b47675d0a342bff3db91e79a3ea8a166
Diffstat (limited to 'src/3rdparty/freetype/src/base/ftglyph.c')
| -rw-r--r-- | src/3rdparty/freetype/src/base/ftglyph.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/src/base/ftglyph.c b/src/3rdparty/freetype/src/base/ftglyph.c index 571dca1a96..393d4949f8 100644 --- a/src/3rdparty/freetype/src/base/ftglyph.c +++ b/src/3rdparty/freetype/src/base/ftglyph.c @@ -4,7 +4,7 @@ * * FreeType convenience functions to handle glyphs (body). * - * Copyright (C) 1996-2022 by + * Copyright (C) 1996-2023 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -682,7 +682,10 @@ Exit2: /* if an error occurred, destroy the glyph */ if ( error ) + { FT_Done_Glyph( glyph ); + *aglyph = NULL; + } else *aglyph = glyph; |