feat: use new zigimg compatibility module

Author: RossComputerGuy

build.zig

@@ -17,11 +17,6 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    const zigimg = b.dependency("zigimg", .{
-        .target = target,
-        .optimize = optimize,
-    });
-
     const options = b.addOptions();
     options.addOption(Phantom.DisplayBackendType, "display_backend", display_backend);
     options.addOption(Phantom.SceneBackendType, "scene_backend", scene_backend);
@@ -37,7 +32,6 @@ pub fn build(b: *std.Build) void {
 
     exe_compositor.addModule("phantom", phantom.module("phantom"));
     exe_compositor.addModule("vizops", vizops.module("vizops"));
-    exe_compositor.addModule("zigimg", zigimg.module("zigimg"));
     exe_compositor.addOptions("options", options);
     b.installArtifact(exe_compositor);
 }

build.zig.zon

@@ -7,9 +7,9 @@
       .url = "https://github.com/PhantomUIx/display-uefi/archive/cca33aa75ed0b9790ad61cc0fd583a7ece240715.tar.gz",
       .hash = "1220fec48cb9d68b2da146f7660afc1d0afdee60ad1b9c4d754cbd3aa2dd009baea9",
     },
-    .@"phantom.image.gif" = .{
-      .url = "https://github.com/PhantomUIx/image-gif/archive/fd2949f098d6ab5b59dc1b542bb255a01d59d3a9.tar.gz",
-      .hash = "1220b315f3a8ef4af55026b704713a0bb4bf14a54a17e8196bfe9c236c0feafa752f",
+    .@"phantom.compat.zigimg" = .{
+      .url = "https://github.com/PhantomUIx/compat-zigimg/archive/e8fcb8681bdfcd0b4f1151f207fe4a6c89c1d1b6.tar.gz",
+      .hash = "1220be41c35eb8b3c0428b02ae9c4639d80310da1b00f9d5f8aad2a90ca5b0c754d7",
     },
     .phantom = .{
       .url = "https://github.com/PhantomUIx/core/archive/0cbea8f53e650f4864bf41c372c330a050710c10.tar.gz",
@@ -19,9 +19,5 @@
       .url = "https://github.com/MidstallSoftware/vizops/archive/8b8499e195d8cf66e9b13ed1c80b24ee27420a29.tar.gz",
       .hash = "1220f478cda5edf75a0b837e04c741631e4136e422b4257ccbd09d4cccaf736ac312",
     },
-    .zigimg = .{
-      .url = "https://github.com/zigimg/zigimg/archive/281d3a0e7599e8c3e174ecc00a259e5e039c9870.tar.gz",
-      .hash = "12203ffe8b358a125a40c6683715bc634e244a4e8fda191c01cc4084e5bfc9e0007b",
-    },
   },
 }

src/compositor.zig

@@ -3,7 +3,6 @@ const builtin = @import("builtin");
 const options = @import("options");
 const phantom = @import("phantom");
 const vizops = @import("vizops");
-const zigimg = @import("zigimg");
 
 const alloc = if (builtin.link_libc) std.heap.c_allocator else if (builtin.os.tag == .uefi) std.os.uefi.pool_allocator else std.heap.page_allocator;
 
@@ -49,54 +48,21 @@ pub fn main() void {
 
     const scene = surface.createScene(@enumFromInt(@intFromEnum(sceneBackendType))) catch |e| @panic(@errorName(e));
 
-    const format = phantom.painting.image.formats.gif.create(alloc) catch |e| @panic(@errorName(e));
+    const format = phantom.painting.image.formats.zigimg.create(alloc) catch |e| @panic(@errorName(e));
     defer format.deinit();
 
-    //const image = format.readBuffer(@embedFile("example.gif")) catch |e| @panic(@errorName(e));
-    //defer image.deinit();
-
-    const image = zigimg.Image.fromMemory(alloc, @embedFile("example.gif")) catch |e| @panic(@errorName(e));
+    const image = format.readBuffer(@embedFile("example.gif")) catch |e| @panic(@errorName(e));
     defer image.deinit();
 
-    var buffers = std.ArrayList(*phantom.painting.fb.Base).initCapacity(alloc, image.animation.frames.items.len) catch |e| @panic(@errorName(e));
-    defer buffers.deinit();
-
-    for (0..image.animation.frames.items.len) |i| {
-        buffers.appendAssumeCapacity(createFrameBuffer(image, i) catch |e| @panic(@errorName(e)));
-    }
-
     const fb = scene.createNode(.NodeFrameBuffer, .{
-        .source = buffers.items[0].dupe() catch |e| @panic(@errorName(e)),
+        .source = image.buffer(0) catch |e| @panic(@errorName(e)),
     }) catch |e| @panic(@errorName(e));
 
     while (true) {
         _ = scene.frame(fb) catch |e| @panic(@errorName(e));
 
         fb.setProperties(.{
-            .source = buffers.items[scene.seq % image.animation.frames.items.len],
+            .source = image.buffer(scene.seq % image.info().seqCount) catch |e| @panic(@errorName(e)),
         }) catch |e| @panic(@errorName(e));
     }
 }
-
-fn createFrameBuffer(image: zigimg.Image, frameIndex: usize) !*phantom.painting.fb.Base {
-    const frame = &image.animation.frames.items[frameIndex];
-
-    const fb = try phantom.painting.fb.AllocatedFrameBuffer.create(alloc, .{
-        .res = .{ .value = .{ image.width, image.height } },
-        .colorspace = .sRGB,
-        .colorFormat = .{ .rgb = @splat(8) },
-    });
-    errdefer fb.deinit();
-
-    var i: usize = 0;
-    for (frame.pixels.indexed4.indices) |indic| {
-        const pixel = frame.pixels.indexed4.palette[indic];
-        try fb.write(i, &[_]u8{
-            pixel.r,
-            pixel.g,
-            pixel.b,
-        });
-        i += 3;
-    }
-    return fb;
-}