1diff --git a/freetype-2.12.1/include/freetype/internal/ftgloadr.h b/freetype-2.12.1/include/freetype/internal/ftgloadr.h 2index f73b663..d2f9a77 100644 3--- a/include/freetype/internal/ftgloadr.h 4+++ b/include/freetype/internal/ftgloadr.h 5@@ -88,7 +88,7 @@ FT_BEGIN_HEADER 6 FT_GlyphLoader_Done( FT_GlyphLoader loader ); 7 8 /* reset a glyph loader (frees everything int it) */ 9- FT_BASE( void ) 10+ FT_EXPORT( void ) 11 FT_GlyphLoader_Reset( FT_GlyphLoader loader ); 12 13 /* rewind a glyph loader */ 14diff --git a/freetype-2.12.1/include/freetype/internal/ftobjs.h b/freetype-2.12.1/include/freetype/internal/ftobjs.h 15index 1c779ce..70942a7 100644 16--- a/include/freetype/internal/ftobjs.h 17+++ b/include/freetype/internal/ftobjs.h 18@@ -696,7 +696,7 @@ FT_BEGIN_HEADER 19 20 /* Free the bitmap of a given glyphslot when needed (i.e., only when it */ 21 /* was allocated with ft_glyphslot_alloc_bitmap). */ 22- FT_BASE( void ) 23+ FT_EXPORT( void ) 24 ft_glyphslot_free_bitmap( FT_GlyphSlot slot ); 25 26 27diff --git a/freetype-2.12.1/include/freetype/internal/ftstream.h b/freetype-2.12.1/include/freetype/internal/ftstream.h 28index aa51fe5..f8760f4 100644 29--- a/include/freetype/internal/ftstream.h 30+++ b/include/freetype/internal/ftstream.h 31@@ -357,13 +357,13 @@ FT_BEGIN_HEADER 32 33 34 /* create a new (input) stream from an FT_Open_Args structure */ 35- FT_BASE( FT_Error ) 36+ FT_EXPORT( FT_Error ) 37 FT_Stream_New( FT_Library library, 38 const FT_Open_Args* args, 39 FT_Stream *astream ); 40 41 /* free a stream */ 42- FT_BASE( void ) 43+ FT_EXPORT( void ) 44 FT_Stream_Free( FT_Stream stream, 45 FT_Int external ); 46 47@@ -379,22 +379,22 @@ FT_BEGIN_HEADER 48 49 50 /* seek within a stream. position is relative to start of stream */ 51- FT_BASE( FT_Error ) 52+ FT_EXPORT( FT_Error ) 53 FT_Stream_Seek( FT_Stream stream, 54 FT_ULong pos ); 55 56 /* skip bytes in a stream */ 57- FT_BASE( FT_Error ) 58+ FT_EXPORT( FT_Error ) 59 FT_Stream_Skip( FT_Stream stream, 60 FT_Long distance ); 61 62 /* return current stream position */ 63- FT_BASE( FT_ULong ) 64+ FT_EXPORT( FT_ULong ) 65 FT_Stream_Pos( FT_Stream stream ); 66 67 /* read bytes from a stream into a user-allocated buffer, returns an */ 68 /* error if not all bytes could be read. */ 69- FT_BASE( FT_Error ) 70+ FT_EXPORT( FT_Error ) 71 FT_Stream_Read( FT_Stream stream, 72 FT_Byte* buffer, 73 FT_ULong count ); 74@@ -485,7 +485,7 @@ FT_BEGIN_HEADER 75 FT_Error* error ); 76 77 /* read a 16-bit big-endian unsigned integer from a stream */ 78- FT_BASE( FT_UShort ) 79+ FT_EXPORT( FT_UShort ) 80 FT_Stream_ReadUShort( FT_Stream stream, 81 FT_Error* error ); 82 83@@ -495,12 +495,12 @@ FT_BEGIN_HEADER 84 FT_Error* error ); 85 86 /* read a 32-bit big-endian integer from a stream */ 87- FT_BASE( FT_ULong ) 88+ FT_EXPORT( FT_ULong ) 89 FT_Stream_ReadULong( FT_Stream stream, 90 FT_Error* error ); 91 92 /* read a 16-bit little-endian unsigned integer from a stream */ 93- FT_BASE( FT_UShort ) 94+ FT_EXPORT( FT_UShort ) 95 FT_Stream_ReadUShortLE( FT_Stream stream, 96 FT_Error* error ); 97 98@@ -511,7 +511,7 @@ FT_BEGIN_HEADER 99 100 /* Read a structure from a stream. The structure must be described */ 101 /* by an array of FT_Frame_Field records. */ 102- FT_BASE( FT_Error ) 103+ FT_EXPORT( FT_Error ) 104 FT_Stream_ReadFields( FT_Stream stream, 105 const FT_Frame_Field* fields, 106 void* structure ); 107diff --git a/freetype-2.12.1/src/base/ftgloadr.c b/freetype-2.12.1/src/base/ftgloadr.c 108index f05abde..1d99710 100644 109--- a/src/base/ftgloadr.c 110+++ b/src/base/ftgloadr.c 111@@ -101,7 +101,7 @@ 112 113 /* reset glyph loader, free all allocated tables, */ 114 /* and start from zero */ 115- FT_BASE_DEF( void ) 116+ FT_EXPORT_DEF( void ) 117 FT_GlyphLoader_Reset( FT_GlyphLoader loader ) 118 { 119 FT_Memory memory = loader->memory; 120diff --git a/freetype-2.12.1/src/base/ftobjs.c b/freetype-2.12.1/src/base/ftobjs.c 121index eeda69c..0d925f7 100644 122--- a/src/base/ftobjs.c 123+++ b/src/base/ftobjs.c 124@@ -191,7 +191,7 @@ 125 126 /* create a new input stream from an FT_Open_Args structure */ 127 /* */ 128- FT_BASE_DEF( FT_Error ) 129+ FT_EXPORT_DEF( FT_Error ) 130 FT_Stream_New( FT_Library library, 131 const FT_Open_Args* args, 132 FT_Stream *astream ) 133@@ -267,7 +267,7 @@ 134 } 135 136 137- FT_BASE_DEF( void ) 138+ FT_EXPORT_DEF( void ) 139 FT_Stream_Free( FT_Stream stream, 140 FT_Int external ) 141 { 142@@ -348,7 +348,7 @@ 143 } 144 145 146- FT_BASE_DEF( void ) 147+ FT_EXPORT_DEF( void ) 148 ft_glyphslot_free_bitmap( FT_GlyphSlot slot ) 149 { 150 if ( slot->internal && ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) ) 151diff --git a/freetype-2.12.1/src/base/ftstream.c b/freetype-2.12.1/src/base/ftstream.c 152index cc92656..77a6283 100644 153--- a/src/base/ftstream.c 154+++ b/src/base/ftstream.c 155@@ -52,7 +52,7 @@ 156 } 157 158 159- FT_BASE_DEF( FT_Error ) 160+ FT_EXPORT_DEF( FT_Error ) 161 FT_Stream_Seek( FT_Stream stream, 162 FT_ULong pos ) 163 { 164@@ -87,7 +87,7 @@ 165 } 166 167 168- FT_BASE_DEF( FT_Error ) 169+ FT_EXPORT_DEF( FT_Error ) 170 FT_Stream_Skip( FT_Stream stream, 171 FT_Long distance ) 172 { 173@@ -98,14 +98,14 @@ 174 } 175 176 177- FT_BASE_DEF( FT_ULong ) 178+ FT_EXPORT_DEF( FT_ULong ) 179 FT_Stream_Pos( FT_Stream stream ) 180 { 181 return stream->pos; 182 } 183 184 185- FT_BASE_DEF( FT_Error ) 186+ FT_EXPORT_DEF( FT_Error ) 187 FT_Stream_Read( FT_Stream stream, 188 FT_Byte* buffer, 189 FT_ULong count ) 190@@ -493,7 +493,7 @@ 191 } 192 193 194- FT_BASE_DEF( FT_UShort ) 195+ FT_EXPORT_DEF( FT_UShort ) 196 FT_Stream_ReadUShort( FT_Stream stream, 197 FT_Error* error ) 198 { 199@@ -538,7 +538,7 @@ 200 } 201 202 203- FT_BASE_DEF( FT_UShort ) 204+ FT_EXPORT_DEF( FT_UShort ) 205 FT_Stream_ReadUShortLE( FT_Stream stream, 206 FT_Error* error ) 207 { 208@@ -628,7 +628,7 @@ 209 } 210 211 212- FT_BASE_DEF( FT_ULong ) 213+ FT_EXPORT_DEF( FT_ULong ) 214 FT_Stream_ReadULong( FT_Stream stream, 215 FT_Error* error ) 216 { 217@@ -718,7 +718,7 @@ 218 } 219 220 221- FT_BASE_DEF( FT_Error ) 222+ FT_EXPORT_DEF( FT_Error ) 223 FT_Stream_ReadFields( FT_Stream stream, 224 const FT_Frame_Field* fields, 225 void* structure ) 226diff --git a/freetype-2.12.1/src/gzip/inflate.c b/freetype-2.12.1/src/gzip/inflate.c 227index 5bf5b81..51399cd 100644 228--- a/src/gzip/inflate.c 229+++ b/src/gzip/inflate.c 230@@ -769,9 +769,10 @@ int ZEXPORT inflate( 231 copy = state->length; 232 if (copy > have) copy = have; 233 if (copy) { 234+ len = state->head->extra_len - state->length; 235 if (state->head != Z_NULL && 236- state->head->extra != Z_NULL) { 237- len = state->head->extra_len - state->length; 238+ state->head->extra != Z_NULL && 239+ len < state->head->extra_max) { 240 zmemcpy(state->head->extra + len, next, 241 len + copy > state->head->extra_max ? 242 state->head->extra_max - len : copy); 243diff --git a/freetype-2.12.1/src/truetype/ttgxvar.c b/freetype-2.12.1/src/truetype/ttgxvar.c 244index a1b816b..eff7219 100644 245--- a/src/truetype/ttgxvar.c 246+++ b/src/truetype/ttgxvar.c 247@@ -1141,7 +1141,7 @@ 248 delta == 1 ? "" : "s", 249 vertical ? "VVAR" : "HVAR" )); 250 251- *avalue = ADD_INT(*avalue, delta ); 252+ *avalue = ADD_INT( *avalue, delta ); 253 254 Exit: 255 return error; 256