project: Update for 2.11.1 merge.

ShiftMediaProject · Jan 17, 2022 · 1337e22 · 1337e22
1 parent 9f37c48
commit 1337e22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -1,15 +1,15 @@
 diff --git a/builds/windows/ftsystem.c b/builds/windows/ftsystem.c
-index cb1c7340e..e89907bca 100644
+index 1ebadd49f..7c49158a6 100644
 --- a/builds/windows/ftsystem.c
 +++ b/builds/windows/ftsystem.c
-@@ -217,8 +217,30 @@
+@@ -266,8 +266,30 @@
        return FT_THROW( Invalid_Stream_Handle );
 
      /* open the file */
 +#if !defined( WINAPI_FAMILY ) || !( WINAPI_FAMILY == WINAPI_FAMILY_PC_APP || \
-+    WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP )
-     file = CreateFileA( filepathname, GENERIC_READ, FILE_SHARE_READ, NULL,
-                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
++                                    WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP )
+     file = CreateFileA( (LPCSTR)filepathname, GENERIC_READ, FILE_SHARE_READ,
+                         NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
 +#else
 +    WCHAR wlpFileName[MAX_PATH];
 +    if ( MultiByteToWideChar( CP_UTF8, 0, filepathname, -1, wlpFileName,
@@ -21,33 +21,20 @@ index cb1c7340e..e89907bca 100644
 +    {
 +      CREATEFILE2_EXTENDED_PARAMETERS CreateExParams = { 0 };
 +      CreateExParams.dwSize = sizeof( CREATEFILE2_EXTENDED_PARAMETERS );
-+      CreateExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL & 0xFFFF;
-+      CreateExParams.dwFileFlags = FILE_ATTRIBUTE_NORMAL & 0xFFF00000;
-+      CreateExParams.dwSecurityQosFlags = FILE_ATTRIBUTE_NORMAL & 0x000F0000;
++      CreateExParams.dwFileAttributes     = FILE_ATTRIBUTE_NORMAL & 0xFFFF;
++      CreateExParams.dwFileFlags          = FILE_ATTRIBUTE_NORMAL & 0xFFF00000;
++      CreateExParams.dwSecurityQosFlags   = FILE_ATTRIBUTE_NORMAL & 0x000F0000;
 +      CreateExParams.lpSecurityAttributes = NULL;
-+      CreateExParams.hTemplateFile = 0;
++      CreateExParams.hTemplateFile        = 0;
 +      file = CreateFile2( wlpFileName, GENERIC_READ, FILE_SHARE_READ,
 +                          OPEN_EXISTING, &CreateExParams );
 +    }
 +#endif
      if ( file == INVALID_HANDLE_VALUE )
      {
        FT_ERROR(( "FT_Stream_Open:" ));
-diff --git a/src/autofit/afwrtsys.h b/src/autofit/afwrtsys.h
-index 39aa12112..81e6108b9 100644
---- a/src/autofit/afwrtsys.h
-+++ b/src/autofit/afwrtsys.h
-@@ -27,6 +27,8 @@
- #include "afcjk.h"
- #include "afindic.h"
-
-+#else
-+
- #endif /* AFWRTSYS_H_ */
-
-
 diff --git a/src/base/ftver.rc b/src/base/ftver.rc
-index 5fe433cbd..877a5fcc6 100644
+index a3d05b378..d70304202 100644
 --- a/src/base/ftver.rc
 +++ b/src/base/ftver.rc
 @@ -29,11 +29,19 @@ FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK

diff --git a/SMP/libfreetype.def b/SMP/libfreetype.def
@@ -61,6 +61,7 @@ EXPORTS
   FT_Get_CMap_Language_ID
   FT_Get_Char_Index
   FT_Get_Charmap_Index
+  FT_Get_Color_Glyph_ClipBox
   FT_Get_Color_Glyph_Layer
   FT_Get_Color_Glyph_Paint
   FT_Get_Colorline_Stops