From 20f742cb9470a15b31dc32910dd2ce4df2f1ae45 Mon Sep 17 00:00:00 2001 From: Lizhiqi Date: Thu, 3 Nov 2022 14:15:34 +0800 Subject: [PATCH] fixed a4e56fe from https://gitee.com/pssea/third_party_freetype/pulls/45 Description: optimize vector font memeory IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5Z265 Feature or Bugfix: Feature Binary Source:No Signed-off-by: lizhiqi --- include/freetype/internal/ftgloadr.h | 2 +- include/freetype/internal/ftobjs.h | 2 +- include/freetype/internal/ftstream.h | 2 +- src/base/ftgloadr.c | 2 +- src/base/ftobjs.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h index 27b8659..9592b33 100644 --- a/include/freetype/internal/ftgloadr.h +++ b/include/freetype/internal/ftgloadr.h @@ -87,7 +87,7 @@ FT_BEGIN_HEADER FT_GlyphLoader_Done( FT_GlyphLoader loader ); /* reset a glyph loader (frees everything int it) */ - FT_BASE( void ) + FT_EXPORT( void ) FT_GlyphLoader_Reset( FT_GlyphLoader loader ); /* rewind a glyph loader */ diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index 25db2c4..d9e6814 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h @@ -695,7 +695,7 @@ FT_BEGIN_HEADER /* Free the bitmap of a given glyphslot when needed (i.e., only when it */ /* was allocated with ft_glyphslot_alloc_bitmap). */ - FT_BASE( void ) + FT_EXPORT( void ) ft_glyphslot_free_bitmap( FT_GlyphSlot slot ); diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h index 54a89ad..122fc49 100644 --- a/include/freetype/internal/ftstream.h +++ b/include/freetype/internal/ftstream.h @@ -396,7 +396,7 @@ FT_BEGIN_HEADER /* read bytes from a stream into a user-allocated buffer, returns an */ /* error if not all bytes could be read. */ - FT_EXPORT_DEF( FT_Error ) + FT_EXPORT( FT_Error ) FT_Stream_Read( FT_Stream stream, FT_Byte* buffer, FT_ULong count ); diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 05fc769..4f06bc7 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -101,7 +101,7 @@ /* reset glyph loader, free all allocated tables, */ /* and start from zero */ - FT_BASE_DEF( void ) + FT_EXPORT_DEF( void ) FT_GlyphLoader_Reset( FT_GlyphLoader loader ) { FT_Memory memory = loader->memory; diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index bec0ee7..5197983 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -321,7 +321,7 @@ } - FT_BASE_DEF( void ) + FT_EXPORT_DEF( void ) ft_glyphslot_free_bitmap( FT_GlyphSlot slot ) { if ( slot->internal && ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) ) -- GitLab