From a1f756b4cdaed602e21d99197c057db360279169 Mon Sep 17 00:00:00 2001 From: Ali Chraghi <63465728+alichraghi@users.noreply.github.com> Date: Thu, 26 May 2022 03:20:00 +0430 Subject: [PATCH] freetype: reduce code size --- freetype/src/Face.zig | 21 +++++++++------------ freetype/src/Stroker.zig | 1 - freetype/src/types.zig | 2 -- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/freetype/src/Face.zig b/freetype/src/Face.zig index 7f9adc73..c4162676 100644 --- a/freetype/src/Face.zig +++ b/freetype/src/Face.zig @@ -239,19 +239,17 @@ pub fn numGlyphs(self: Face) i64 { } pub fn familyName(self: Face) ?[:0]const u8 { - const family = self.handle.*.family_name; - return if (family == null) - null + return if (self.handle.*.family_name) |family| + std.mem.span(family) else - std.mem.span(family); + null; } pub fn styleName(self: Face) ?[:0]const u8 { - const style = self.handle.*.style_name; - return if (style == null) - null + return if (self.handle.*.style_name) |style_name| + std.mem.span(style_name) else - std.mem.span(style); + null; } pub fn styleFlags(self: Face) StyleFlags { @@ -267,9 +265,8 @@ pub fn sizeMetrics(self: Face) ?SizeMetrics { } pub fn postscriptName(self: Face) ?[:0]const u8 { - const face_name = c.FT_Get_Postscript_Name(self.handle); - return if (face_name == null) - null + return if (c.FT_Get_Postscript_Name(self.handle)) |face_name| + std.mem.span(face_name) else - std.mem.span(face_name); + null; } diff --git a/freetype/src/Stroker.zig b/freetype/src/Stroker.zig index ce97fbef..f3567fc0 100644 --- a/freetype/src/Stroker.zig +++ b/freetype/src/Stroker.zig @@ -9,7 +9,6 @@ pub const StrokerLineCap = enum(u2) { round = c.FT_STROKER_LINECAP_ROUND, square = c.FT_STROKER_LINECAP_SQUARE, }; - pub const StrokerLineJoin = enum(u2) { round = c.FT_STROKER_LINEJOIN_ROUND, bevel = c.FT_STROKER_LINEJOIN_BEVEL, diff --git a/freetype/src/types.zig b/freetype/src/types.zig index 10caaeb7..79255ce0 100644 --- a/freetype/src/types.zig +++ b/freetype/src/types.zig @@ -18,7 +18,6 @@ pub const BBox = extern struct { xMax: c_long, yMax: c_long, }; - pub const RenderMode = enum(u3) { normal = c.FT_RENDER_MODE_NORMAL, light = c.FT_RENDER_MODE_LIGHT, @@ -27,7 +26,6 @@ pub const RenderMode = enum(u3) { lcd_v = c.FT_RENDER_MODE_LCD_V, sdf = c.FT_RENDER_MODE_SDF, }; - pub const OpenFlags = packed struct { memory: bool = false, stream: bool = false,