From 9731a0a1307f4edcc0a2b9bf654e52d350a23861 Mon Sep 17 00:00:00 2001 From: Lizhiqi Date: Mon, 17 Oct 2022 22:16:48 +0800 Subject: [PATCH] fixed ecd0a7a from https://gitee.com/pssea/third_party_freetype/pulls/42 Description:export font to read ttc header IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5W3CK Feature or Bugfix: Feature Binary Source:No Signed-off-by: lizhiqi --- include/freetype/internal/ftstream.h | 16 ++++++++-------- src/base/ftstream.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h index dfb2411..54a89ad 100644 --- a/include/freetype/internal/ftstream.h +++ b/include/freetype/internal/ftstream.h @@ -381,22 +381,22 @@ FT_BEGIN_HEADER /* seek within a stream. position is relative to start of stream */ - FT_BASE( FT_Error ) + FT_EXPORT( FT_Error ) FT_Stream_Seek( FT_Stream stream, FT_ULong pos ); /* skip bytes in a stream */ - FT_BASE( FT_Error ) + FT_EXPORT( FT_Error ) FT_Stream_Skip( FT_Stream stream, FT_Long distance ); /* return current stream position */ - FT_BASE( FT_ULong ) + FT_EXPORT( FT_ULong ) FT_Stream_Pos( FT_Stream stream ); /* read bytes from a stream into a user-allocated buffer, returns an */ /* error if not all bytes could be read. */ - FT_BASE( FT_Error ) + FT_EXPORT_DEF( FT_Error ) FT_Stream_Read( FT_Stream stream, FT_Byte* buffer, FT_ULong count ); @@ -487,7 +487,7 @@ FT_BEGIN_HEADER FT_Error* error ); /* read a 16-bit big-endian unsigned integer from a stream */ - FT_BASE( FT_UShort ) + FT_EXPORT( FT_UShort ) FT_Stream_ReadUShort( FT_Stream stream, FT_Error* error ); @@ -497,12 +497,12 @@ FT_BEGIN_HEADER FT_Error* error ); /* read a 32-bit big-endian integer from a stream */ - FT_BASE( FT_ULong ) + FT_EXPORT( FT_ULong ) FT_Stream_ReadULong( FT_Stream stream, FT_Error* error ); /* read a 16-bit little-endian unsigned integer from a stream */ - FT_BASE( FT_UShort ) + FT_EXPORT( FT_UShort ) FT_Stream_ReadUShortLE( FT_Stream stream, FT_Error* error ); @@ -513,7 +513,7 @@ FT_BEGIN_HEADER /* Read a structure from a stream. The structure must be described */ /* by an array of FT_Frame_Field records. */ - FT_BASE( FT_Error ) + FT_EXPORT( FT_Error ) FT_Stream_ReadFields( FT_Stream stream, const FT_Frame_Field* fields, void* structure ); diff --git a/src/base/ftstream.c b/src/base/ftstream.c index d940254..ab95a59 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -52,7 +52,7 @@ } - FT_BASE_DEF( FT_Error ) + FT_EXPORT_DEF( FT_Error ) FT_Stream_Seek( FT_Stream stream, FT_ULong pos ) { @@ -87,7 +87,7 @@ } - FT_BASE_DEF( FT_Error ) + FT_EXPORT_DEF( FT_Error ) FT_Stream_Skip( FT_Stream stream, FT_Long distance ) { @@ -98,14 +98,14 @@ } - FT_BASE_DEF( FT_ULong ) + FT_EXPORT_DEF( FT_ULong ) FT_Stream_Pos( FT_Stream stream ) { return stream->pos; } - FT_BASE_DEF( FT_Error ) + FT_EXPORT_DEF( FT_Error ) FT_Stream_Read( FT_Stream stream, FT_Byte* buffer, FT_ULong count ) @@ -492,7 +492,7 @@ } - FT_BASE_DEF( FT_UShort ) + FT_EXPORT_DEF( FT_UShort ) FT_Stream_ReadUShort( FT_Stream stream, FT_Error* error ) { @@ -537,7 +537,7 @@ } - FT_BASE_DEF( FT_UShort ) + FT_EXPORT_DEF( FT_UShort ) FT_Stream_ReadUShortLE( FT_Stream stream, FT_Error* error ) { @@ -627,7 +627,7 @@ } - FT_BASE_DEF( FT_ULong ) + FT_EXPORT_DEF( FT_ULong ) FT_Stream_ReadULong( FT_Stream stream, FT_Error* error ) { @@ -717,7 +717,7 @@ } - FT_BASE_DEF( FT_Error ) + FT_EXPORT_DEF( FT_Error ) FT_Stream_ReadFields( FT_Stream stream, const FT_Frame_Field* fields, void* structure ) -- GitLab