diff --git a/build.zig b/build.zig index cebdc6b..248052e 100644 --- a/build.zig +++ b/build.zig @@ -42,9 +42,11 @@ pub fn build(b: *std.Build) void { const tests = b.addTest(.{ .name = "zstbi-tests", - .root_source_file = b.path("src/zstbi.zig"), - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .root_source_file = b.path("src/zstbi.zig"), + .target = target, + .optimize = optimize, + }), }); tests.root_module.addImport("zstbi", zstbi); b.installArtifact(tests); diff --git a/build.zig.zon b/build.zig.zon index 7a9cb6b..0278b65 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -2,7 +2,7 @@ .name = .zstbi, .fingerprint = 0x3c971054ff1a412f, .version = "0.11.0-dev", - .minimum_zig_version = "0.14.0", + .minimum_zig_version = "0.15.1", .paths = .{ "build.zig", "build.zig.zon", diff --git a/src/zstbi.zig b/src/zstbi.zig index b0908f7..75e3abe 100644 --- a/src/zstbi.zig +++ b/src/zstbi.zig @@ -312,7 +312,7 @@ pub const Image = struct { pub fn writeToFn( image: Image, - write_fn: *const fn (ctx: ?*anyopaque, data: ?*anyopaque, size: c_int) callconv(.C) void, + write_fn: *const fn (ctx: ?*anyopaque, data: ?*anyopaque, size: c_int) callconv(.c) void, context: ?*anyopaque, image_format: ImageWriteFormat, ) ImageWriteError!void { @@ -382,16 +382,16 @@ var mem_allocations: ?std.AutoHashMap(usize, usize) = null; var mem_mutex: std.Thread.Mutex = .{}; const mem_alignment = 16; -extern var zstbiMallocPtr: ?*const fn (size: usize) callconv(.C) ?*anyopaque; -extern var zstbiwMallocPtr: ?*const fn (size: usize) callconv(.C) ?*anyopaque; +extern var zstbiMallocPtr: ?*const fn (size: usize) callconv(.c) ?*anyopaque; +extern var zstbiwMallocPtr: ?*const fn (size: usize) callconv(.c) ?*anyopaque; -fn zstbiMalloc(size: usize) callconv(.C) ?*anyopaque { +fn zstbiMalloc(size: usize) callconv(.c) ?*anyopaque { mem_mutex.lock(); defer mem_mutex.unlock(); const mem = mem_allocator.?.alignedAlloc( u8, - mem_alignment, + .fromByteUnits(mem_alignment), size, ) catch @panic("zstbi: out of memory"); @@ -400,10 +400,10 @@ fn zstbiMalloc(size: usize) callconv(.C) ?*anyopaque { return mem.ptr; } -extern var zstbiReallocPtr: ?*const fn (ptr: ?*anyopaque, size: usize) callconv(.C) ?*anyopaque; -extern var zstbiwReallocPtr: ?*const fn (ptr: ?*anyopaque, size: usize) callconv(.C) ?*anyopaque; +extern var zstbiReallocPtr: ?*const fn (ptr: ?*anyopaque, size: usize) callconv(.c) ?*anyopaque; +extern var zstbiwReallocPtr: ?*const fn (ptr: ?*anyopaque, size: usize) callconv(.c) ?*anyopaque; -fn zstbiRealloc(ptr: ?*anyopaque, size: usize) callconv(.C) ?*anyopaque { +fn zstbiRealloc(ptr: ?*anyopaque, size: usize) callconv(.c) ?*anyopaque { mem_mutex.lock(); defer mem_mutex.unlock(); @@ -425,10 +425,10 @@ fn zstbiRealloc(ptr: ?*anyopaque, size: usize) callconv(.C) ?*anyopaque { return new_mem.ptr; } -extern var zstbiFreePtr: ?*const fn (maybe_ptr: ?*anyopaque) callconv(.C) void; -extern var zstbiwFreePtr: ?*const fn (maybe_ptr: ?*anyopaque) callconv(.C) void; +extern var zstbiFreePtr: ?*const fn (maybe_ptr: ?*anyopaque) callconv(.c) void; +extern var zstbiwFreePtr: ?*const fn (maybe_ptr: ?*anyopaque) callconv(.c) void; -fn zstbiFree(maybe_ptr: ?*anyopaque) callconv(.C) void { +fn zstbiFree(maybe_ptr: ?*anyopaque) callconv(.c) void { if (maybe_ptr) |ptr| { mem_mutex.lock(); defer mem_mutex.unlock(); @@ -439,15 +439,15 @@ fn zstbiFree(maybe_ptr: ?*anyopaque) callconv(.C) void { } } -extern var zstbirMallocPtr: ?*const fn (size: usize, maybe_context: ?*anyopaque) callconv(.C) ?*anyopaque; +extern var zstbirMallocPtr: ?*const fn (size: usize, maybe_context: ?*anyopaque) callconv(.c) ?*anyopaque; -fn zstbirMalloc(size: usize, _: ?*anyopaque) callconv(.C) ?*anyopaque { +fn zstbirMalloc(size: usize, _: ?*anyopaque) callconv(.c) ?*anyopaque { return zstbiMalloc(size); } -extern var zstbirFreePtr: ?*const fn (maybe_ptr: ?*anyopaque, maybe_context: ?*anyopaque) callconv(.C) void; +extern var zstbirFreePtr: ?*const fn (maybe_ptr: ?*anyopaque, maybe_context: ?*anyopaque) callconv(.c) void; -fn zstbirFree(maybe_ptr: ?*anyopaque, _: ?*anyopaque) callconv(.C) void { +fn zstbirFree(maybe_ptr: ?*anyopaque, _: ?*anyopaque) callconv(.c) void { zstbiFree(maybe_ptr); } @@ -540,7 +540,7 @@ extern fn stbi_write_png( ) c_int; extern fn stbi_write_png_to_func( - func: *const fn (?*anyopaque, ?*anyopaque, c_int) callconv(.C) void, + func: *const fn (?*anyopaque, ?*anyopaque, c_int) callconv(.c) void, context: ?*anyopaque, w: c_int, h: c_int, @@ -550,7 +550,7 @@ extern fn stbi_write_png_to_func( ) c_int; extern fn stbi_write_jpg_to_func( - func: *const fn (?*anyopaque, ?*anyopaque, c_int) callconv(.C) void, + func: *const fn (?*anyopaque, ?*anyopaque, c_int) callconv(.c) void, context: ?*anyopaque, x: c_int, y: c_int,