From 37e731f0bd81249f8b43bada12adaa611b7a595b Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 5 Apr 2022 21:27:03 +0000 Subject: freetype2 : revert git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751 --- .../libs/freetype2/freetype-src/src/sfnt/ttkern.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'Build/source/libs/freetype2/freetype-src/src/sfnt/ttkern.c') diff --git a/Build/source/libs/freetype2/freetype-src/src/sfnt/ttkern.c b/Build/source/libs/freetype2/freetype-src/src/sfnt/ttkern.c index ca1c5094065..bb1922caf95 100644 --- a/Build/source/libs/freetype2/freetype-src/src/sfnt/ttkern.c +++ b/Build/source/libs/freetype2/freetype-src/src/sfnt/ttkern.c @@ -5,7 +5,7 @@ * Load the basic TrueType kerning table. This doesn't handle * kerning data within the GPOS table at the moment. * - * Copyright (C) 1996-2022 by + * Copyright (C) 1996-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -94,7 +94,7 @@ p_next = p; - p += 2; /* skip version */ + p += 2; /* skip version */ length = FT_NEXT_USHORT( p ); coverage = FT_NEXT_USHORT( p ); @@ -144,7 +144,7 @@ cur_pair = FT_NEXT_ULONG( p ); - if ( cur_pair < old_pair ) + if ( cur_pair <= old_pair ) break; p += 2; @@ -187,18 +187,11 @@ FT_UInt left_glyph, FT_UInt right_glyph ) { - FT_Int result = 0; - FT_UInt count, mask; + FT_Int result = 0; + FT_UInt count, mask; + FT_Byte* p = face->kern_table; + FT_Byte* p_limit = p + face->kern_table_size; - FT_Byte* p; - FT_Byte* p_limit; - - - if ( !face->kern_table ) - return result; - - p = face->kern_table; - p_limit = p + face->kern_table_size; p += 4; mask = 0x0001; -- cgit v1.2.3