diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-04-05 21:27:03 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-04-05 21:27:03 +0000 |
commit | 37e731f0bd81249f8b43bada12adaa611b7a595b (patch) | |
tree | 99e477a2cd57a94782ae182b8c5e2c0024751356 /Build/source/libs/freetype2/freetype-src/src/base | |
parent | 7c200a413ce80d2d09a0dda338e9407bba0d3855 (diff) |
freetype2 : revert
git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/base')
41 files changed, 63 insertions, 407 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftadvanc.c b/Build/source/libs/freetype2/freetype-src/src/base/ftadvanc.c index fc6b4288174..f20b9928aa1 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftadvanc.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftadvanc.c @@ -4,7 +4,7 @@ * * Quick computation of advance widths (body). * - * Copyright (C) 2008-2022 by + * Copyright (C) 2008-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftbase.c b/Build/source/libs/freetype2/freetype-src/src/base/ftbase.c index cd1056890f6..7366bc46db1 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftbase.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftbase.c @@ -4,7 +4,7 @@ * * Single object library component (body only). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftbase.h b/Build/source/libs/freetype2/freetype-src/src/base/ftbase.h index f873566f222..963ff93d681 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftbase.h +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftbase.h @@ -4,7 +4,7 @@ * * Private functions used in the `base' module (specification). * - * Copyright (C) 2008-2022 by + * Copyright (C) 2008-2021 by * David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya. * * This file is part of the FreeType project, and may only be used, @@ -28,7 +28,6 @@ FT_BEGIN_HEADER FT_DECLARE_GLYPH( ft_bitmap_glyph_class ) FT_DECLARE_GLYPH( ft_outline_glyph_class ) - FT_DECLARE_GLYPH( ft_svg_glyph_class ) #ifdef FT_CONFIG_OPTION_MAC_FONTS diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftbbox.c b/Build/source/libs/freetype2/freetype-src/src/base/ftbbox.c index 30aedf780cd..4db29cbf83c 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftbbox.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftbbox.c @@ -4,7 +4,7 @@ * * FreeType bbox computation (body). * - * 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 diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftbdf.c b/Build/source/libs/freetype2/freetype-src/src/base/ftbdf.c index 4f22113d7ef..f93ca8eb755 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftbdf.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftbdf.c @@ -4,7 +4,7 @@ * * FreeType API for accessing BDF-specific strings (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftbitmap.c b/Build/source/libs/freetype2/freetype-src/src/base/ftbitmap.c index 7825895ad6a..2146d3e3649 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftbitmap.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftbitmap.c @@ -4,7 +4,7 @@ * * FreeType utility functions for bitmaps (body). * - * Copyright (C) 2004-2022 by + * Copyright (C) 2004-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -480,7 +480,7 @@ * A gamma of 2.2 is fair to assume. And then, we need to * undo the premultiplication too. * - * http://www.brucelindbloom.com/index.html?WorkingSpaceInfo.html#SideNotes + * https://accessibility.kde.org/hsl-adjusted.php * * We do the computation with integers only, applying a gamma of 2.0. * We guarantee 32-bit arithmetic to avoid overflow but the resulting @@ -488,9 +488,9 @@ * */ - l = ( 4731UL /* 0.072186 * 65536 */ * bgra[0] * bgra[0] + - 46868UL /* 0.715158 * 65536 */ * bgra[1] * bgra[1] + - 13937UL /* 0.212656 * 65536 */ * bgra[2] * bgra[2] ) >> 16; + l = ( 4732UL /* 0.0722 * 65536 */ * bgra[0] * bgra[0] + + 46871UL /* 0.7152 * 65536 */ * bgra[1] * bgra[1] + + 13933UL /* 0.2126 * 65536 */ * bgra[2] * bgra[2] ) >> 16; /* * Final transparency can be determined as follows. diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftcalc.c b/Build/source/libs/freetype2/freetype-src/src/base/ftcalc.c index 6c1e7fbd45a..9df8e4010d1 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftcalc.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftcalc.c @@ -4,7 +4,7 @@ * * Arithmetic computations (body). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftcid.c b/Build/source/libs/freetype2/freetype-src/src/base/ftcid.c index b882ca3de0a..216ee2b3e49 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftcid.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftcid.c @@ -4,7 +4,7 @@ * * FreeType API for accessing CID font information. * - * Copyright (C) 2007-2022 by + * Copyright (C) 2007-2021 by * Derek Clegg and Michael Toftdal. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftcolor.c b/Build/source/libs/freetype2/freetype-src/src/base/ftcolor.c index 0edf379b437..3ef3256b202 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftcolor.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftcolor.c @@ -4,7 +4,7 @@ * * FreeType's glyph color management (body). * - * Copyright (C) 2018-2022 by + * Copyright (C) 2018-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftdbgmem.c b/Build/source/libs/freetype2/freetype-src/src/base/ftdbgmem.c index 1df83c404db..4f5c1e76971 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftdbgmem.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftdbgmem.c @@ -4,7 +4,7 @@ * * Memory debugger (body). * - * Copyright (C) 2001-2022 by + * Copyright (C) 2001-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-src/src/base/ftdebug.c index 648fff44edb..34857913065 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftdebug.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftdebug.c @@ -4,7 +4,7 @@ * * Debugging and logging component (body). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/fterrors.c b/Build/source/libs/freetype2/freetype-src/src/base/fterrors.c index 5846fefc911..14649268f85 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/fterrors.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/fterrors.c @@ -4,7 +4,7 @@ * * FreeType API for error code handling. * - * Copyright (C) 2018-2022 by + * Copyright (C) 2018-2021 by * Armin Hasitzka, David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftfntfmt.c b/Build/source/libs/freetype2/freetype-src/src/base/ftfntfmt.c index e69c1e06842..4e1b830190d 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftfntfmt.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftfntfmt.c @@ -4,7 +4,7 @@ * * FreeType utility file for font formats (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftfstype.c b/Build/source/libs/freetype2/freetype-src/src/base/ftfstype.c index 009d58c57d5..57e904d6f41 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftfstype.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftfstype.c @@ -4,7 +4,7 @@ * * FreeType utility file to access FSType data (body). * - * Copyright (C) 2008-2022 by + * Copyright (C) 2008-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftgasp.c b/Build/source/libs/freetype2/freetype-src/src/base/ftgasp.c index 7567e3077ae..b744f0a4652 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftgasp.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftgasp.c @@ -4,7 +4,7 @@ * * Access of TrueType's `gasp' table (body). * - * Copyright (C) 2007-2022 by + * Copyright (C) 2007-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftgloadr.c b/Build/source/libs/freetype2/freetype-src/src/base/ftgloadr.c index f05abdee818..83ce0660aeb 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftgloadr.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftgloadr.c @@ -4,7 +4,7 @@ * * The FreeType glyph loader (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftglyph.c b/Build/source/libs/freetype2/freetype-src/src/base/ftglyph.c index 571dca1a965..e2c6f73f80f 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftglyph.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftglyph.c @@ -4,7 +4,7 @@ * * FreeType convenience functions to handle glyphs (body). * - * 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, @@ -34,7 +34,6 @@ #include <freetype/ftoutln.h> #include <freetype/ftbitmap.h> #include <freetype/internal/ftobjs.h> -#include <freetype/otsvg.h> #include "ftbase.h" @@ -278,240 +277,6 @@ ) -#ifdef FT_CONFIG_OPTION_SVG - - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ - /**** FT_SvgGlyph support ****/ - /**** ****/ - /*************************************************************************/ - /*************************************************************************/ - - - FT_CALLBACK_DEF( FT_Error ) - ft_svg_glyph_init( FT_Glyph svg_glyph, - FT_GlyphSlot slot ) - { - FT_ULong doc_length; - FT_SVG_Document document; - FT_SvgGlyph glyph = (FT_SvgGlyph)svg_glyph; - - FT_Error error = FT_Err_Ok; - FT_Memory memory = FT_GLYPH( glyph )->library->memory; - - - if ( slot->format != FT_GLYPH_FORMAT_SVG ) - { - error = FT_THROW( Invalid_Glyph_Format ); - goto Exit; - } - - if ( slot->other == NULL ) - { - error = FT_THROW( Invalid_Slot_Handle ); - goto Exit; - } - - document = (FT_SVG_Document)slot->other; - - if ( document->svg_document_length == 0 ) - { - error = FT_THROW( Invalid_Slot_Handle ); - goto Exit; - } - - /* allocate a new document */ - doc_length = document->svg_document_length; - if ( FT_QALLOC( glyph->svg_document, doc_length ) ) - goto Exit; - glyph->svg_document_length = doc_length; - - glyph->glyph_index = slot->glyph_index; - - glyph->metrics = document->metrics; - glyph->units_per_EM = document->units_per_EM; - - glyph->start_glyph_id = document->start_glyph_id; - glyph->end_glyph_id = document->end_glyph_id; - - glyph->transform = document->transform; - glyph->delta = document->delta; - - /* copy the document into glyph */ - FT_MEM_COPY( glyph->svg_document, document->svg_document, doc_length ); - - Exit: - return error; - } - - - FT_CALLBACK_DEF( void ) - ft_svg_glyph_done( FT_Glyph svg_glyph ) - { - FT_SvgGlyph glyph = (FT_SvgGlyph)svg_glyph; - FT_Memory memory = svg_glyph->library->memory; - - - /* just free the memory */ - FT_FREE( glyph->svg_document ); - } - - - FT_CALLBACK_DEF( FT_Error ) - ft_svg_glyph_copy( FT_Glyph svg_source, - FT_Glyph svg_target ) - { - FT_SvgGlyph source = (FT_SvgGlyph)svg_source; - FT_SvgGlyph target = (FT_SvgGlyph)svg_target; - - FT_Error error = FT_Err_Ok; - FT_Memory memory = FT_GLYPH( source )->library->memory; - - - if ( svg_source->format != FT_GLYPH_FORMAT_SVG ) - { - error = FT_THROW( Invalid_Glyph_Format ); - goto Exit; - } - - if ( source->svg_document_length == 0 ) - { - error = FT_THROW( Invalid_Slot_Handle ); - goto Exit; - } - - target->glyph_index = source->glyph_index; - - target->svg_document_length = source->svg_document_length; - - target->metrics = source->metrics; - target->units_per_EM = source->units_per_EM; - - target->start_glyph_id = source->start_glyph_id; - target->end_glyph_id = source->end_glyph_id; - - target->transform = source->transform; - target->delta = source->delta; - - /* allocate space for the SVG document */ - if ( FT_QALLOC( target->svg_document, target->svg_document_length ) ) - goto Exit; - - /* copy the document */ - FT_MEM_COPY( target->svg_document, - source->svg_document, - target->svg_document_length ); - - Exit: - return error; - } - - - FT_CALLBACK_DEF( void ) - ft_svg_glyph_transform( FT_Glyph svg_glyph, - const FT_Matrix* _matrix, - const FT_Vector* _delta ) - { - FT_SvgGlyph glyph = (FT_SvgGlyph)svg_glyph; - FT_Matrix* matrix = (FT_Matrix*)_matrix; - FT_Vector* delta = (FT_Vector*)_delta; - - FT_Matrix tmp_matrix; - FT_Vector tmp_delta; - - FT_Matrix a, b; - FT_Pos x, y; - - - if ( !matrix ) - { - tmp_matrix.xx = 0x10000; - tmp_matrix.xy = 0; - tmp_matrix.yx = 0; - tmp_matrix.yy = 0x10000; - - matrix = &tmp_matrix; - } - - if ( !delta ) - { - tmp_delta.x = 0; - tmp_delta.y = 0; - - delta = &tmp_delta; - } - - a = glyph->transform; - b = *matrix; - FT_Matrix_Multiply( &b, &a ); - - x = ADD_LONG( ADD_LONG( FT_MulFix( matrix->xx, glyph->delta.x ), - FT_MulFix( matrix->xy, glyph->delta.y ) ), - delta->x ); - y = ADD_LONG( ADD_LONG( FT_MulFix( matrix->yx, glyph->delta.x ), - FT_MulFix( matrix->yy, glyph->delta.y ) ), - delta->y ); - - glyph->delta.x = x; - glyph->delta.y = y; - - glyph->transform = a; - } - - - FT_CALLBACK_DEF( FT_Error ) - ft_svg_glyph_prepare( FT_Glyph svg_glyph, - FT_GlyphSlot slot ) - { - FT_SvgGlyph glyph = (FT_SvgGlyph)svg_glyph; - - FT_Error error = FT_Err_Ok; - FT_Memory memory = svg_glyph->library->memory; - - FT_SVG_Document document = NULL; - - - if ( FT_NEW( document ) ) - return error; - - document->svg_document = glyph->svg_document; - document->svg_document_length = glyph->svg_document_length; - - document->metrics = glyph->metrics; - document->units_per_EM = glyph->units_per_EM; - - document->start_glyph_id = glyph->start_glyph_id; - document->end_glyph_id = glyph->end_glyph_id; - - document->transform = glyph->transform; - document->delta = glyph->delta; - - slot->format = FT_GLYPH_FORMAT_SVG; - slot->glyph_index = glyph->glyph_index; - slot->other = document; - - return error; - } - - - FT_DEFINE_GLYPH( - ft_svg_glyph_class, - - sizeof ( FT_SvgGlyphRec ), - FT_GLYPH_FORMAT_SVG, - - ft_svg_glyph_init, /* FT_Glyph_InitFunc glyph_init */ - ft_svg_glyph_done, /* FT_Glyph_DoneFunc glyph_done */ - ft_svg_glyph_copy, /* FT_Glyph_CopyFunc glyph_copy */ - ft_svg_glyph_transform, /* FT_Glyph_TransformFunc glyph_transform */ - NULL, /* FT_Glyph_GetBBoxFunc glyph_bbox */ - ft_svg_glyph_prepare /* FT_Glyph_PrepareFunc glyph_prepare */ - ) - -#endif /* FT_CONFIG_OPTION_SVG */ - - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -612,12 +377,6 @@ else if ( format == FT_GLYPH_FORMAT_OUTLINE ) clazz = &ft_outline_glyph_class; -#ifdef FT_CONFIG_OPTION_SVG - /* if it is an SVG glyph */ - else if ( format == FT_GLYPH_FORMAT_SVG ) - clazz = &ft_svg_glyph_class; -#endif - else { /* try to find a renderer that supports the glyph image format */ @@ -836,16 +595,6 @@ if ( !error ) error = FT_Render_Glyph_Internal( glyph->library, &dummy, render_mode ); -#ifdef FT_CONFIG_OPTION_SVG - if ( clazz == &ft_svg_glyph_class ) - { - FT_Memory memory = library->memory; - - - FT_FREE( dummy.other ); - } -#endif - #if 1 if ( !destroy && origin ) { diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftgxval.c b/Build/source/libs/freetype2/freetype-src/src/base/ftgxval.c index 5598a11c6d1..e9567f77f34 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftgxval.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftgxval.c @@ -4,7 +4,7 @@ * * FreeType API for validating TrueTypeGX/AAT tables (body). * - * Copyright (C) 2004-2022 by + * Copyright (C) 2004-2021 by * Masatake YAMATO, Redhat K.K, * David Turner, Robert Wilhelm, and Werner Lemberg. * diff --git a/Build/source/libs/freetype2/freetype-src/src/base/fthash.c b/Build/source/libs/freetype2/freetype-src/src/base/fthash.c index 313bbbb4b27..449b03a5c16 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/fthash.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/fthash.c @@ -243,7 +243,7 @@ nn = *bp; if ( !nn ) { - if ( FT_QNEW( nn ) ) + if ( FT_NEW( nn ) ) goto Exit; *bp = nn; diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftinit.c b/Build/source/libs/freetype2/freetype-src/src/base/ftinit.c index 0f29a6017e5..a2d2b933c09 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftinit.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftinit.c @@ -4,7 +4,7 @@ * * FreeType initialization layer (body). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftlcdfil.c b/Build/source/libs/freetype2/freetype-src/src/base/ftlcdfil.c index e72f6d668d7..488b913e636 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftlcdfil.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftlcdfil.c @@ -4,7 +4,7 @@ * * FreeType API for color filtering of subpixel bitmap glyphs (body). * - * Copyright (C) 2006-2022 by + * Copyright (C) 2006-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftmac.c b/Build/source/libs/freetype2/freetype-src/src/base/ftmac.c index 8f0cf701af1..36a860979e1 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftmac.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftmac.c @@ -8,7 +8,7 @@ * This file is for Mac OS X only; see builds/mac/ftoldmac.c for * classic platforms built by MPW. * - * Copyright (C) 1996-2022 by + * Copyright (C) 1996-2021 by * Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -105,7 +105,7 @@ /* Don't want warnings about our own use of deprecated functions. */ #define FT_DEPRECATED_ATTRIBUTE -#include <freetype/ftmac.h> +#include FT_MAC_H #ifndef kATSOptionFlagsUnRestrictedScope /* since Mac OS X 10.1 */ #define kATSOptionFlagsUnRestrictedScope kATSOptionFlagsDefault diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftmm.c b/Build/source/libs/freetype2/freetype-src/src/base/ftmm.c index dbbd87c9b9c..fc5d4ecc8d0 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftmm.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftmm.c @@ -4,7 +4,7 @@ * * Multiple Master font support (body). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftobjs.c b/Build/source/libs/freetype2/freetype-src/src/base/ftobjs.c index eeda69c3ed8..883f1a8970c 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftobjs.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftobjs.c @@ -4,7 +4,7 @@ * * The FreeType private base classes (body). * - * 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, @@ -19,7 +19,6 @@ #include <freetype/ftlist.h> #include <freetype/ftoutln.h> #include <freetype/ftfntfmt.h> -#include <freetype/otsvg.h> #include <freetype/internal/ftvalid.h> #include <freetype/internal/ftobjs.h> @@ -28,7 +27,6 @@ #include <freetype/internal/ftstream.h> #include <freetype/internal/sfnt.h> /* for SFNT_Load_Table_Func */ #include <freetype/internal/psaux.h> /* for PS_Driver */ -#include <freetype/internal/svginterface.h> #include <freetype/tttables.h> #include <freetype/tttags.h> @@ -330,19 +328,6 @@ if ( !error && clazz->init_slot ) error = clazz->init_slot( slot ); -#ifdef FT_CONFIG_OPTION_SVG - /* if SVG table exists, allocate the space in `slot->other` */ - if ( slot->face->face_flags & FT_FACE_FLAG_SVG ) - { - FT_SVG_Document document = NULL; - - - if ( FT_NEW( document ) ) - goto Exit; - slot->other = document; - } -#endif - Exit: return error; } @@ -387,18 +372,7 @@ FT_Pos width, height, pitch; - if ( slot->format == FT_GLYPH_FORMAT_SVG ) - { - FT_Module module; - SVG_Service svg_service; - - - module = FT_Get_Module( slot->library, "ot-svg" ); - svg_service = (SVG_Service)module->clazz->module_interface; - - return (FT_Bool)svg_service->preset_slot( module, slot, FALSE ); - } - else if ( slot->format != FT_GLYPH_FORMAT_OUTLINE ) + if ( slot->format != FT_GLYPH_FORMAT_OUTLINE ) return 1; if ( origin ) @@ -590,27 +564,8 @@ slot->subglyphs = NULL; slot->control_data = NULL; slot->control_len = 0; - -#ifndef FT_CONFIG_OPTION_SVG - slot->other = NULL; -#else - if ( !( slot->face->face_flags & FT_FACE_FLAG_SVG ) ) - slot->other = NULL; - else - { - if ( slot->internal->flags & FT_GLYPH_OWN_GZIP_SVG ) - { - FT_Memory memory = slot->face->memory; - FT_SVG_Document doc = (FT_SVG_Document)slot->other; - - - FT_FREE( doc->svg_document ); - slot->internal->load_flags &= ~FT_GLYPH_OWN_GZIP_SVG; - } - } -#endif - - slot->format = FT_GLYPH_FORMAT_NONE; + slot->other = NULL; + slot->format = FT_GLYPH_FORMAT_NONE; slot->linearHoriAdvance = 0; slot->linearVertAdvance = 0; @@ -628,23 +583,6 @@ FT_Driver_Class clazz = driver->clazz; FT_Memory memory = driver->root.memory; -#ifdef FT_CONFIG_OPTION_SVG - if ( slot->face->face_flags & FT_FACE_FLAG_SVG ) - { - /* free memory in case SVG was there */ - if ( slot->internal->flags & FT_GLYPH_OWN_GZIP_SVG ) - { - FT_SVG_Document doc = (FT_SVG_Document)slot->other; - - - FT_FREE( doc->svg_document ); - - slot->internal->flags &= ~FT_GLYPH_OWN_GZIP_SVG; - } - - FT_FREE( slot->other ); - } -#endif if ( clazz->done_slot ) clazz->done_slot( slot ); @@ -920,11 +858,6 @@ library = driver->root.library; hinter = library->auto_hinter; - /* undefined scale means no scale */ - if ( face->size->metrics.x_ppem == 0 || - face->size->metrics.y_ppem == 0 ) - load_flags |= FT_LOAD_NO_SCALE; - /* resolve load flags dependencies */ if ( load_flags & FT_LOAD_NO_RECURSE ) @@ -1014,21 +947,11 @@ FT_AutoHinter_Interface hinting; - /* XXX: The use of the `FT_LOAD_XXX_ONLY` flags is not very */ - /* elegant. */ - - /* try to load SVG documents if available */ - if ( FT_HAS_SVG( face ) ) - { - error = driver->clazz->load_glyph( slot, face->size, - glyph_index, - load_flags | FT_LOAD_SVG_ONLY ); - - if ( !error && slot->format == FT_GLYPH_FORMAT_SVG ) - goto Load_Ok; - } - - /* try to load embedded bitmaps if available */ + /* try to load embedded bitmaps first if available */ + /* */ + /* XXX: This is really a temporary hack that should disappear */ + /* promptly with FreeType 2.1! */ + /* */ if ( FT_HAS_FIXED_SIZES( face ) && ( load_flags & FT_LOAD_NO_BITMAP ) == 0 ) { @@ -1674,6 +1597,7 @@ FT_FREE( stream->base ); stream->size = 0; + stream->base = NULL; stream->close = NULL; } @@ -2527,16 +2451,6 @@ #endif - /* only use lower 31 bits together with sign bit */ - if ( face_index > 0 ) - face_index &= 0x7FFFFFFFL; - else - { - face_index = -face_index; - face_index &= 0x7FFFFFFFL; - face_index = -face_index; - } - #ifdef FT_DEBUG_LEVEL_TRACE FT_TRACE3(( "FT_Open_Face: " )); if ( face_index < 0 ) @@ -3409,9 +3323,6 @@ if ( !face ) return FT_THROW( Invalid_Face_Handle ); - if ( !face->size ) - return FT_THROW( Invalid_Size_Handle ); - if ( !req || req->width < 0 || req->height < 0 || req->type >= FT_SIZE_REQUEST_TYPE_MAX ) return FT_THROW( Invalid_Argument ); @@ -4563,7 +4474,7 @@ render->glyph_format = clazz->glyph_format; /* allocate raster object if needed */ - if ( clazz->raster_class && clazz->raster_class->raster_new ) + if ( clazz->raster_class->raster_new ) { error = clazz->raster_class->raster_new( memory, &render->raster ); if ( error ) @@ -4573,11 +4484,6 @@ render->render = clazz->render_glyph; } -#ifdef FT_CONFIG_OPTION_SVG - if ( clazz->glyph_format == FT_GLYPH_FORMAT_SVG ) - render->render = clazz->render_glyph; -#endif - /* add to list */ node->data = module; FT_List_Add( &library->renderers, node ); @@ -5823,7 +5729,7 @@ SFNT_Service sfnt; - if ( !face || !paint ) + if ( !face || !paint || !paint ) return 0; if ( !FT_IS_SFNT( face ) ) diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftotval.c b/Build/source/libs/freetype2/freetype-src/src/base/ftotval.c index f336e962274..0f748d006c8 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftotval.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftotval.c @@ -4,7 +4,7 @@ * * FreeType API for validating OpenType tables (body). * - * Copyright (C) 2004-2022 by + * Copyright (C) 2004-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftoutln.c b/Build/source/libs/freetype2/freetype-src/src/base/ftoutln.c index 624df03ad8d..98c6ca16e65 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftoutln.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftoutln.c @@ -4,7 +4,7 @@ * * FreeType outline management (body). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftpatent.c b/Build/source/libs/freetype2/freetype-src/src/base/ftpatent.c index 353ed2b5317..cd192d33bd4 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftpatent.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftpatent.c @@ -5,7 +5,7 @@ * FreeType API for checking patented TrueType bytecode instructions * (body). Obsolete, retained for backward compatibility. * - * Copyright (C) 2007-2022 by + * Copyright (C) 2007-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/base/ftpfr.c b/Build/source/libs/freetype2/freetype-src/src/base/ftpfr.c index 9e748f06e68..5afd5a183f8 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftpfr.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftpfr.c @@ -4,7 +4,7 @@ * * FreeType API for accessing PFR-specific data (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftpsprop.c b/Build/source/libs/freetype2/freetype-src/src/base/ftpsprop.c index 81fcee08f6f..3655ae97eca 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftpsprop.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftpsprop.c @@ -5,7 +5,7 @@ * Get and set properties of PostScript drivers (body). * See `ftdriver.h' for available properties. * - * Copyright (C) 2017-2022 by + * Copyright (C) 2017-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftrfork.c b/Build/source/libs/freetype2/freetype-src/src/base/ftrfork.c index 7fe4146fd0a..cb7e94ddb08 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftrfork.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftrfork.c @@ -4,7 +4,7 @@ * * Embedded resource forks accessor (body). * - * Copyright (C) 2004-2022 by + * Copyright (C) 2004-2021 by * Masatake YAMATO and Redhat K.K. * * FT_Raccess_Get_HeaderInfo() and raccess_guess_darwin_hfsplus() are @@ -868,7 +868,9 @@ const char* tmp; const char* slash; size_t new_length; - FT_Error error; + FT_Error error = FT_Err_Ok; + + FT_UNUSED( error ); new_length = ft_strlen( original_name ) + ft_strlen( insertion ); diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftsnames.c b/Build/source/libs/freetype2/freetype-src/src/base/ftsnames.c index 3bf20c389b3..44dba66638e 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftsnames.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftsnames.c @@ -7,7 +7,7 @@ * * This is _not_ used to retrieve glyph names! * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftstream.c b/Build/source/libs/freetype2/freetype-src/src/base/ftstream.c index cc926565c32..5992998ba3e 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftstream.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftstream.c @@ -4,7 +4,7 @@ * * I/O stream support (body). * - * Copyright (C) 2000-2022 by + * Copyright (C) 2000-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftstroke.c b/Build/source/libs/freetype2/freetype-src/src/base/ftstroke.c index aa983f940f2..37e9649411f 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftstroke.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftstroke.c @@ -4,7 +4,7 @@ * * FreeType path stroker (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftsynth.c b/Build/source/libs/freetype2/freetype-src/src/base/ftsynth.c index 10bbe0dfdaf..73565b13077 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftsynth.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftsynth.c @@ -4,7 +4,7 @@ * * FreeType synthesizing code for emboldening and slanting (body). * - * Copyright (C) 2000-2022 by + * Copyright (C) 2000-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-src/src/base/ftsystem.c index d8826b23671..9beb7e245d2 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftsystem.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftsystem.c @@ -4,7 +4,7 @@ * * ANSI-specific FreeType low-level system interface (body). * - * 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, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/fttrigon.c b/Build/source/libs/freetype2/freetype-src/src/base/fttrigon.c index 6964edb0f59..0ca6d7810a5 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/fttrigon.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/fttrigon.c @@ -4,7 +4,7 @@ * * FreeType trigonometric functions (body). * - * Copyright (C) 2001-2022 by + * Copyright (C) 2001-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/fttype1.c b/Build/source/libs/freetype2/freetype-src/src/base/fttype1.c index de3d5a48bdc..0d0afbcef06 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/fttype1.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/fttype1.c @@ -4,7 +4,7 @@ * * FreeType utility file for PS names support (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftutil.c b/Build/source/libs/freetype2/freetype-src/src/base/ftutil.c index 5a913825802..3142faee987 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftutil.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftutil.c @@ -4,7 +4,7 @@ * * FreeType utility file for memory and list management (body). * - * Copyright (C) 2002-2022 by + * Copyright (C) 2002-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftver.rc b/Build/source/libs/freetype2/freetype-src/src/base/ftver.rc index 2d0cb416b78..a3d05b37806 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftver.rc +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftver.rc @@ -4,7 +4,7 @@ /* */ /* FreeType VERSIONINFO resource for Windows DLLs. */ /* */ -/* Copyright (C) 2018-2022 by */ +/* Copyright (C) 2018-2021 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,8 +18,8 @@ #include<windows.h> -#define FT_VERSION 2,12,0,0 -#define FT_VERSION_STR "2.12.0" +#define FT_VERSION 2,11,1,0 +#define FT_VERSION_STR "2.11.1" VS_VERSION_INFO VERSIONINFO FILEVERSION FT_VERSION @@ -45,7 +45,7 @@ BEGIN VALUE "FileVersion", FT_VERSION_STR VALUE "ProductName", "FreeType" VALUE "ProductVersion", FT_VERSION_STR - VALUE "LegalCopyright", "\251 2000-2022 The FreeType Project www.freetype.org. All rights reserved." + VALUE "LegalCopyright", "\251 2000-2021 The FreeType Project www.freetype.org. All rights reserved." VALUE "InternalName", "freetype" VALUE "OriginalFilename", FT_FILENAME END diff --git a/Build/source/libs/freetype2/freetype-src/src/base/ftwinfnt.c b/Build/source/libs/freetype2/freetype-src/src/base/ftwinfnt.c index 193f7fa0486..98f197afdc4 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/ftwinfnt.c +++ b/Build/source/libs/freetype2/freetype-src/src/base/ftwinfnt.c @@ -4,7 +4,7 @@ * * FreeType API for accessing Windows FNT specific info (body). * - * Copyright (C) 2003-2022 by + * Copyright (C) 2003-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/base/rules.mk b/Build/source/libs/freetype2/freetype-src/src/base/rules.mk index 9a224b14ed2..53289aee6d4 100644 --- a/Build/source/libs/freetype2/freetype-src/src/base/rules.mk +++ b/Build/source/libs/freetype2/freetype-src/src/base/rules.mk @@ -3,7 +3,7 @@ # -# 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, modified, |