zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

freetype: use u32 instead of usize

Browse source
This commit is contained in:
Ali Chraghi 2022-06-11 19:01:23 +04:30 • committed by Stephen Gutekanst
parent dd4d741aed
commit 128cf8098c
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
freetype/src/freetype/Glyph.zig
View file

@ -106,11 +106,11 @@ const SvgGlyph = struct {
return self.handle.*.svg_document[0..self.svgBufferLen()]; return self.handle.*.svg_document[0..self.svgBufferLen()];
} }
pub fn svgBufferLen(self: SvgGlyph) usize { pub fn svgBufferLen(self: SvgGlyph) u32 {
return self.handle.*.svg_document_length; return self.handle.*.svg_document_length;
} }
pub fn glyphIndex(self: SvgGlyph) usize { pub fn glyphIndex(self: SvgGlyph) u32 {
return self.handle.*.glyph_index; return self.handle.*.glyph_index;
} }

2
freetype/src/freetype/color.zig
View file

@ -114,7 +114,7 @@ pub const PaletteData = struct {
return self.handle.palette_flags[0..self.numPalettes()]; return self.handle.palette_flags[0..self.numPalettes()];
} }
pub fn paletteFlag(self: PaletteData, index: usize) PaletteFlags { pub fn paletteFlag(self: PaletteData, index: u32) PaletteFlags {
return PaletteFlags.from(@intCast(u2, self.handle.palette_flags[index])); return PaletteFlags.from(@intCast(u2, self.handle.palette_flags[index]));
} }

44
freetype/src/harfbuzz/buffer.zig
View file

@ -85,7 +85,7 @@ pub const SegmentProps = struct {
return c.hb_segment_properties_equal(&a.cast(), &b.cast()) > 0; return c.hb_segment_properties_equal(&a.cast(), &b.cast()) > 0;
} }
pub fn hash(self: SegmentProps) usize { pub fn hash(self: SegmentProps) u32 {
return c.hb_segment_properties_hash(&self.cast()); return c.hb_segment_properties_hash(&self.cast());
} }
@ -228,32 +228,32 @@ pub const Buffer = struct {
return c.hb_buffer_allocation_successful(self.handle) > 0; return c.hb_buffer_allocation_successful(self.handle) > 0;
} }
pub fn add(self: Buffer, codepoint: u32, cluster: usize) void { pub fn add(self: Buffer, codepoint: u32, cluster: u32) void {
c.hb_buffer_add(self.handle, codepoint, @intCast(c_uint, cluster)); c.hb_buffer_add(self.handle, codepoint, cluster);
} }
pub fn addCodepoints(self: Buffer, text: []const u32, item_offset: usize, item_length: usize) void { pub fn addCodepoints(self: Buffer, text: []const u32, item_offset: u32, item_length: ?u31) void {
c.hb_buffer_add_codepoints(self.handle, &text[0], @intCast(c_int, text.len), @intCast(c_uint, item_offset), @intCast(c_int, item_length)); c.hb_buffer_add_codepoints(self.handle, &text[0], @intCast(c_int, text.len), item_offset, if (item_length) |l| l else @intCast(c_int, text.len));
} }
pub fn addUTF32(self: Buffer, text: []const u32, item_offset: usize, item_length: usize) void { pub fn addUTF32(self: Buffer, text: []const u32, item_offset: u32, item_length: ?u31) void {
c.hb_buffer_add_utf32(self.handle, &text[0], @intCast(c_int, text.len), @intCast(c_uint, item_offset), @intCast(c_int, item_length)); c.hb_buffer_add_utf32(self.handle, &text[0], @intCast(c_int, text.len), item_offset, if (item_length) |l| l else @intCast(c_int, text.len));
} }
pub fn addUTF16(self: Buffer, text: []const u16, item_offset: usize, item_length: usize) void { pub fn addUTF16(self: Buffer, text: []const u16, item_offset: u32, item_length: ?u31) void {
c.hb_buffer_add_utf16(self.handle, &text[0], @intCast(c_int, text.len), @intCast(c_uint, item_offset), @intCast(c_int, item_length)); c.hb_buffer_add_utf16(self.handle, &text[0], @intCast(c_int, text.len), item_offset, if (item_length) |l| l else @intCast(c_int, text.len));
} }
pub fn addUTF8(self: Buffer, text: []const u8, item_offset: usize, item_length: usize) void { pub fn addUTF8(self: Buffer, text: []const u8, item_offset: u32, item_length: ?u31) void {
c.hb_buffer_add_utf8(self.handle, &text[0], @intCast(c_int, text.len), @intCast(c_uint, item_offset), @intCast(c_int, item_length)); c.hb_buffer_add_utf8(self.handle, &text[0], @intCast(c_int, text.len), item_offset, if (item_length) |l| l else @intCast(c_int, text.len));
} }
pub fn addLatin1(self: Buffer, text: []const u8, item_offset: usize, item_length: usize) void { pub fn addLatin1(self: Buffer, text: []const u8, item_offset: u32, item_length: ?u31) void {
c.hb_buffer_add_latin1(self.handle, &text[0], @intCast(c_int, text.len), @intCast(c_uint, item_offset), @intCast(c_int, item_length)); c.hb_buffer_add_latin1(self.handle, &text[0], @intCast(c_int, text.len), item_offset, if (item_length) |l| l else @intCast(c_int, text.len));
} }
pub fn append(self: Buffer, source: Buffer, start: usize, end: usize) void { pub fn append(self: Buffer, source: Buffer, start: u32, end: u32) void {
c.hb_buffer_append(self.handle, source.handle, @intCast(c_uint, start), @intCast(c_uint, end)); c.hb_buffer_append(self.handle, source.handle, start, end);
} }
pub fn getContentType(self: Buffer) ContentType { pub fn getContentType(self: Buffer) ContentType {
@ -304,12 +304,12 @@ pub const Buffer = struct {
c.hb_buffer_set_cluster_level(self.handle, @enumToInt(level)); c.hb_buffer_set_cluster_level(self.handle, @enumToInt(level));
} }
pub fn getLength(self: Buffer) usize { pub fn getLength(self: Buffer) u32 {
return c.hb_buffer_get_length(self.handle); return c.hb_buffer_get_length(self.handle);
} }
pub fn setLength(self: Buffer, new_len: usize) error{OutOfMemory}!void { pub fn setLength(self: Buffer, new_len: u32) error{OutOfMemory}!void {
if (c.hb_buffer_set_length(self.handle, @intCast(c_uint, new_len)) < 1) if (c.hb_buffer_set_length(self.handle, new_len) < 1)
return error.OutOfMemory; return error.OutOfMemory;
} }
@ -374,16 +374,16 @@ pub const Buffer = struct {
c.hb_buffer_reverse(self.handle); c.hb_buffer_reverse(self.handle);
} }
pub fn reverseRange(self: Buffer, start: usize, end: usize) void { pub fn reverseRange(self: Buffer, start: u32, end: u32) void {
c.hb_buffer_reverse_range(self.handle, @intCast(c_uint, start), @intCast(c_uint, end)); c.hb_buffer_reverse_range(self.handle, start, end);
} }
pub fn reverseClusters(self: Buffer) void { pub fn reverseClusters(self: Buffer) void {
c.hb_buffer_reverse_clusters(self.handle); c.hb_buffer_reverse_clusters(self.handle);
} }
pub fn diff(self: Buffer, ref: Buffer, dottedcircle_glyph: u32, position_fuzz: usize) DiffFlags { pub fn diff(self: Buffer, ref: Buffer, dottedcircle_glyph: u32, position_fuzz: u32) DiffFlags {
return DiffFlags.from(@intCast(u8, c.hb_buffer_diff(self.handle, ref.handle, dottedcircle_glyph, @intCast(c_uint, position_fuzz)))); return DiffFlags.from(@intCast(u8, c.hb_buffer_diff(self.handle, ref.handle, dottedcircle_glyph, position_fuzz)));
} }
}; };