From bbf1dbf0b3d1816a776bb343fe3d7053ded7edaa Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 29 Aug 2021 03:23:39 +0000 Subject: freetype 2.11.0 git-svn-id: svn://tug.org/texlive/trunk@60354 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/freetype2/freetype-src/src/lzw/ftlzw.c | 2 +- Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.c | 9 +++++++-- Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.h | 2 +- Build/source/libs/freetype2/freetype-src/src/lzw/rules.mk | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Build/source/libs/freetype2/freetype-src/src/lzw') diff --git a/Build/source/libs/freetype2/freetype-src/src/lzw/ftlzw.c b/Build/source/libs/freetype2/freetype-src/src/lzw/ftlzw.c index ddb81e6e973..93c8f597820 100644 --- a/Build/source/libs/freetype2/freetype-src/src/lzw/ftlzw.c +++ b/Build/source/libs/freetype2/freetype-src/src/lzw/ftlzw.c @@ -8,7 +8,7 @@ * be used to parse compressed PCF fonts, as found with many X11 server * distributions. * - * Copyright (C) 2004-2020 by + * Copyright (C) 2004-2021 by * Albert Chin-A-Young. * * based on code in `src/gzip/ftgzip.c' diff --git a/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.c b/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.c index 884d2ec74eb..8b5b357f369 100644 --- a/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.c +++ b/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.c @@ -8,7 +8,7 @@ * be used to parse compressed PCF fonts, as found with many X11 server * distributions. * - * Copyright (C) 2005-2020 by + * Copyright (C) 2005-2021 by * David Turner. * * This file is part of the FreeType project, and may only be used, @@ -127,6 +127,7 @@ new_size = new_size + ( new_size >> 1 ) + 4; + /* if relocating to heap */ if ( state->stack == state->stack_0 ) { state->stack = NULL; @@ -142,9 +143,13 @@ return -1; } - if ( FT_RENEW_ARRAY( state->stack, old_size, new_size ) ) + if ( FT_QRENEW_ARRAY( state->stack, old_size, new_size ) ) return -1; + /* if relocating to heap */ + if ( old_size == 0 ) + FT_MEM_COPY( state->stack, state->stack_0, FT_LZW_DEFAULT_STACK_SIZE ); + state->stack_size = new_size; } return 0; diff --git a/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.h b/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.h index d8768f7b47b..9ada742c73d 100644 --- a/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.h +++ b/Build/source/libs/freetype2/freetype-src/src/lzw/ftzopen.h @@ -8,7 +8,7 @@ * be used to parse compressed PCF fonts, as found with many X11 server * distributions. * - * Copyright (C) 2005-2020 by + * Copyright (C) 2005-2021 by * David Turner. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/lzw/rules.mk b/Build/source/libs/freetype2/freetype-src/src/lzw/rules.mk index 3468ee024de..747cbdcca89 100644 --- a/Build/source/libs/freetype2/freetype-src/src/lzw/rules.mk +++ b/Build/source/libs/freetype2/freetype-src/src/lzw/rules.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 2004-2020 by +# Copyright (C) 2004-2021 by # Albert Chin-A-Young. # # based on `src/lzw/rules.mk' -- cgit v1.2.3