Skip to content

Commit

Permalink
project: Update for 2.13.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Mar 11, 2023
1 parent f32d80f commit 0d7aa1e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
19 changes: 16 additions & 3 deletions SMP/SMP.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/builds/windows/ftsystem.c b/builds/windows/ftsystem.c
index 4f4ac15f3..28ed21280 100644
index 418d7995e..1d24c2545 100644
--- a/builds/windows/ftsystem.c
+++ b/builds/windows/ftsystem.c
@@ -330,8 +330,30 @@
@@ -329,8 +329,30 @@
return FT_THROW( Invalid_Stream_Handle );

/* open the file */
Expand Down Expand Up @@ -33,8 +33,21 @@ index 4f4ac15f3..28ed21280 100644
if ( file == INVALID_HANDLE_VALUE )
{
FT_ERROR(( "FT_Stream_Open:" ));
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 9e03e1783..38a131801 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -195,7 +195,7 @@ FT_BEGIN_HEADER
* Define this macro if you want to enable this 'feature'. See also the
* macro `FT_CONFIG_OPTION_SYSTEM_ZLIB` below.
*/
-#define FT_CONFIG_OPTION_USE_ZLIB
+/* #define FT_CONFIG_OPTION_USE_ZLIB */


/**************************************************************************
diff --git a/src/base/ftver.rc b/src/base/ftver.rc
index 2d0cb416b..3abf1c0bb 100644
index f113cb892..dcb33e89b 100644
--- a/src/base/ftver.rc
+++ b/src/base/ftver.rc
@@ -29,11 +29,19 @@ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
Expand Down
1 change: 1 addition & 0 deletions SMP/libfreetype.def
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ EXPORTS
FT_GlyphSlot_Embolden
FT_GlyphSlot_Oblique
FT_GlyphSlot_Own_Bitmap
FT_GlyphSlot_Slant
FT_Glyph_Copy
FT_Glyph_Get_CBox
FT_Glyph_Stroke
Expand Down

0 comments on commit 0d7aa1e

Please sign in to comment.