1From 2651de697594c01efd6701045ca4f780437411c8 Mon Sep 17 00:00:00 2001 2From: Zacoh <kouzhenrong@h-partners.com> 3Date: Thu, 15 May 2025 10:21:38 +0800 4Subject: [PATCH] freetype update version 2.13.3 5 6--- 7 include/freetype/internal/ftgloadr.h | 2 +- 8 include/freetype/internal/ftobjs.h | 2 +- 9 include/freetype/internal/ftstream.h | 20 ++++++++++---------- 10 src/base/ftgloadr.c | 2 +- 11 src/base/ftobjs.c | 6 +++--- 12 src/base/ftstream.c | 16 ++++++++-------- 13 6 files changed, 24 insertions(+), 24 deletions(-) 14 15diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h 16index f1c155b..b32eb6b 100644 17--- a/include/freetype/internal/ftgloadr.h 18+++ b/include/freetype/internal/ftgloadr.h 19@@ -88,7 +88,7 @@ FT_BEGIN_HEADER 20 FT_GlyphLoader_Done( FT_GlyphLoader loader ); 21 22 /* reset a glyph loader (frees everything int it) */ 23- FT_BASE( void ) 24+ FT_EXPORT( void ) 25 FT_GlyphLoader_Reset( FT_GlyphLoader loader ); 26 27 /* rewind a glyph loader */ 28diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h 29index a1e9329..2ef3c29 100644 30--- a/include/freetype/internal/ftobjs.h 31+++ b/include/freetype/internal/ftobjs.h 32@@ -690,7 +690,7 @@ FT_BEGIN_HEADER 33 34 /* Free the bitmap of a given glyphslot when needed (i.e., only when it */ 35 /* was allocated with ft_glyphslot_alloc_bitmap). */ 36- FT_BASE( void ) 37+ FT_EXPORT( void ) 38 ft_glyphslot_free_bitmap( FT_GlyphSlot slot ); 39 40 41diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h 42index fd52f76..d2bc268 100644 43--- a/include/freetype/internal/ftstream.h 44+++ b/include/freetype/internal/ftstream.h 45@@ -357,13 +357,13 @@ FT_BEGIN_HEADER 46 47 48 /* create a new (input) stream from an FT_Open_Args structure */ 49- FT_BASE( FT_Error ) 50+ FT_EXPORT( FT_Error ) 51 FT_Stream_New( FT_Library library, 52 const FT_Open_Args* args, 53 FT_Stream *astream ); 54 55 /* free a stream */ 56- FT_BASE( void ) 57+ FT_EXPORT( void ) 58 FT_Stream_Free( FT_Stream stream, 59 FT_Int external ); 60 61@@ -379,22 +379,22 @@ FT_BEGIN_HEADER 62 63 64 /* seek within a stream. position is relative to start of stream */ 65- FT_BASE( FT_Error ) 66+ FT_EXPORT( FT_Error ) 67 FT_Stream_Seek( FT_Stream stream, 68 FT_ULong pos ); 69 70 /* skip bytes in a stream */ 71- FT_BASE( FT_Error ) 72+ FT_EXPORT( FT_Error ) 73 FT_Stream_Skip( FT_Stream stream, 74 FT_Long distance ); 75 76 /* return current stream position */ 77- FT_BASE( FT_ULong ) 78+ FT_EXPORT( FT_ULong ) 79 FT_Stream_Pos( FT_Stream stream ); 80 81 /* read bytes from a stream into a user-allocated buffer, returns an */ 82 /* error if not all bytes could be read. */ 83- FT_BASE( FT_Error ) 84+ FT_EXPORT( FT_Error ) 85 FT_Stream_Read( FT_Stream stream, 86 FT_Byte* buffer, 87 FT_ULong count ); 88@@ -485,7 +485,7 @@ FT_BEGIN_HEADER 89 FT_Error* error ); 90 91 /* read a 16-bit big-endian unsigned integer from a stream */ 92- FT_BASE( FT_UInt16 ) 93+ FT_EXPORT( FT_UInt16 ) 94 FT_Stream_ReadUShort( FT_Stream stream, 95 FT_Error* error ); 96 97@@ -495,12 +495,12 @@ FT_BEGIN_HEADER 98 FT_Error* error ); 99 100 /* read a 32-bit big-endian integer from a stream */ 101- FT_BASE( FT_UInt32 ) 102+ FT_EXPORT( FT_UInt32 ) 103 FT_Stream_ReadULong( FT_Stream stream, 104 FT_Error* error ); 105 106 /* read a 16-bit little-endian unsigned integer from a stream */ 107- FT_BASE( FT_UInt16 ) 108+ FT_EXPORT( FT_UInt16 ) 109 FT_Stream_ReadUShortLE( FT_Stream stream, 110 FT_Error* error ); 111 112@@ -511,7 +511,7 @@ FT_BEGIN_HEADER 113 114 /* Read a structure from a stream. The structure must be described */ 115 /* by an array of FT_Frame_Field records. */ 116- FT_BASE( FT_Error ) 117+ FT_EXPORT( FT_Error ) 118 FT_Stream_ReadFields( FT_Stream stream, 119 const FT_Frame_Field* fields, 120 void* structure ); 121diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c 122index 484d98f..c874dfa 100644 123--- a/src/base/ftgloadr.c 124+++ b/src/base/ftgloadr.c 125@@ -101,7 +101,7 @@ 126 127 /* reset glyph loader, free all allocated tables, */ 128 /* and start from zero */ 129- FT_BASE_DEF( void ) 130+ FT_EXPORT_DEF( void ) 131 FT_GlyphLoader_Reset( FT_GlyphLoader loader ) 132 { 133 FT_Memory memory = loader->memory; 134diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c 135index 9b97820..ae2b21d 100644 136--- a/src/base/ftobjs.c 137+++ b/src/base/ftobjs.c 138@@ -191,7 +191,7 @@ 139 140 /* create a new input stream from an FT_Open_Args structure */ 141 /* */ 142- FT_BASE_DEF( FT_Error ) 143+ FT_EXPORT_DEF( FT_Error ) 144 FT_Stream_New( FT_Library library, 145 const FT_Open_Args* args, 146 FT_Stream *astream ) 147@@ -267,7 +267,7 @@ 148 } 149 150 151- FT_BASE_DEF( void ) 152+ FT_EXPORT_DEF( void ) 153 FT_Stream_Free( FT_Stream stream, 154 FT_Int external ) 155 { 156@@ -348,7 +348,7 @@ 157 } 158 159 160- FT_BASE_DEF( void ) 161+ FT_EXPORT_DEF( void ) 162 ft_glyphslot_free_bitmap( FT_GlyphSlot slot ) 163 { 164 if ( slot->internal && ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) ) 165diff --git a/src/base/ftstream.c b/src/base/ftstream.c 166index 6672224..b7ae179 100644 167--- a/src/base/ftstream.c 168+++ b/src/base/ftstream.c 169@@ -52,7 +52,7 @@ 170 } 171 172 173- FT_BASE_DEF( FT_Error ) 174+ FT_EXPORT_DEF( FT_Error ) 175 FT_Stream_Seek( FT_Stream stream, 176 FT_ULong pos ) 177 { 178@@ -87,7 +87,7 @@ 179 } 180 181 182- FT_BASE_DEF( FT_Error ) 183+ FT_EXPORT_DEF( FT_Error ) 184 FT_Stream_Skip( FT_Stream stream, 185 FT_Long distance ) 186 { 187@@ -98,14 +98,14 @@ 188 } 189 190 191- FT_BASE_DEF( FT_ULong ) 192+ FT_EXPORT_DEF( FT_ULong ) 193 FT_Stream_Pos( FT_Stream stream ) 194 { 195 return stream->pos; 196 } 197 198 199- FT_BASE_DEF( FT_Error ) 200+ FT_EXPORT_DEF( FT_Error ) 201 FT_Stream_Read( FT_Stream stream, 202 FT_Byte* buffer, 203 FT_ULong count ) 204@@ -497,7 +497,7 @@ 205 } 206 207 208- FT_BASE_DEF( FT_UInt16 ) 209+ FT_EXPORT_DEF( FT_UInt16 ) 210 FT_Stream_ReadUShort( FT_Stream stream, 211 FT_Error* error ) 212 { 213@@ -542,7 +542,7 @@ 214 } 215 216 217- FT_BASE_DEF( FT_UInt16 ) 218+ FT_EXPORT_DEF( FT_UInt16 ) 219 FT_Stream_ReadUShortLE( FT_Stream stream, 220 FT_Error* error ) 221 { 222@@ -632,7 +632,7 @@ 223 } 224 225 226- FT_BASE_DEF( FT_UInt32 ) 227+ FT_EXPORT_DEF( FT_UInt32 ) 228 FT_Stream_ReadULong( FT_Stream stream, 229 FT_Error* error ) 230 { 231@@ -722,7 +722,7 @@ 232 } 233 234 235- FT_BASE_DEF( FT_Error ) 236+ FT_EXPORT_DEF( FT_Error ) 237 FT_Stream_ReadFields( FT_Stream stream, 238 const FT_Frame_Field* fields, 239 void* structure ) 240-- 2412.44.0.windows.1 242 243