Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump FreeType to 2.10.3 #1214

Merged
merged 2 commits into from
Oct 11, 2020
Merged

Bump FreeType to 2.10.3 #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a69a2c8
Bump FreeType to 2.10.3
NiLuJe Oct 11, 2020
ad71cd1
Refresh FT FFI stuff
NiLuJe Oct 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ffi-cdecl/freetype2_decl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "ffi-cdecl.h"

#include FT_FREETYPE_H
#include FT_SYNTHESIS_H
#include FT_OUTLINE_H
#include <freetype/freetype.h>
#include <freetype/ftsynth.h>
#include <freetype/ftoutln.h>

cdecl_type(FT_Error)
cdecl_type(FT_Pos)
Expand Down
28 changes: 14 additions & 14 deletions ffi/freetype_h.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ struct FT_CharMapRec_ {
short unsigned int platform_id;
short unsigned int encoding_id;
};
FT_Error FT_Init_FreeType(FT_Library *);
FT_Error FT_New_Face(FT_Library, const char *, long int, FT_Face *);
FT_Error FT_Set_Pixel_Sizes(FT_Face, unsigned int, unsigned int);
FT_Error FT_Done_Face(FT_Face);
unsigned int FT_Get_Char_Index(FT_Face, long unsigned int);
FT_Error FT_Load_Char(FT_Face, long unsigned int, int);
FT_Error FT_Get_Kerning(FT_Face, unsigned int, unsigned int, unsigned int, FT_Vector *);
void FT_GlyphSlot_Embolden(FT_GlyphSlot);
void FT_GlyphSlot_Oblique(FT_GlyphSlot);
FT_Error FT_Init_FreeType(FT_Library *) __attribute__((visibility("default")));
FT_Error FT_New_Face(FT_Library, const char *, long int, FT_Face *) __attribute__((visibility("default")));
FT_Error FT_Set_Pixel_Sizes(FT_Face, unsigned int, unsigned int) __attribute__((visibility("default")));
FT_Error FT_Done_Face(FT_Face) __attribute__((visibility("default")));
unsigned int FT_Get_Char_Index(FT_Face, long unsigned int) __attribute__((visibility("default")));
FT_Error FT_Load_Char(FT_Face, long unsigned int, int) __attribute__((visibility("default")));
FT_Error FT_Get_Kerning(FT_Face, unsigned int, unsigned int, unsigned int, FT_Vector *) __attribute__((visibility("default")));
void FT_GlyphSlot_Embolden(FT_GlyphSlot) __attribute__((visibility("default")));
void FT_GlyphSlot_Oblique(FT_GlyphSlot) __attribute__((visibility("default")));
enum FT_Render_Mode_ {
FT_RENDER_MODE_NORMAL = 0,
FT_RENDER_MODE_LIGHT = 1,
Expand All @@ -240,11 +240,11 @@ enum FT_Render_Mode_ {
FT_RENDER_MODE_MAX = 5,
};
typedef enum FT_Render_Mode_ FT_Render_Mode;
FT_Error FT_Load_Glyph(FT_Face, unsigned int, int);
FT_Error FT_Render_Glyph(FT_GlyphSlot, FT_Render_Mode);
FT_Error FT_Outline_Embolden(FT_Outline *, FT_Pos);
void FT_Outline_Translate(const FT_Outline *, FT_Pos, FT_Pos);
long int FT_MulFix(long int, long int);
FT_Error FT_Load_Glyph(FT_Face, unsigned int, int) __attribute__((visibility("default")));
FT_Error FT_Render_Glyph(FT_GlyphSlot, FT_Render_Mode) __attribute__((visibility("default")));
FT_Error FT_Outline_Embolden(FT_Outline *, FT_Pos) __attribute__((visibility("default")));
void FT_Outline_Translate(const FT_Outline *, FT_Pos, FT_Pos) __attribute__((visibility("default")));
long int FT_MulFix(long int, long int) __attribute__((visibility("default")));
static const int FT_LOAD_RENDER = 4;
static const int FT_LOAD_DEFAULT = 0;
static const int FT_LOAD_TARGET_LIGHT = 65536;
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/freetype2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://gitlab.com/koreader/freetype2.git
VER-2-10-2
VER-2-10-3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, changed cmakelists = this will be recompiled as will everything that depends on FT.

${SOURCE_DIR}
)

Expand Down