From 1635d80290a48fddd4ae9f1de187e49cbd35f39b Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Wed, 4 Nov 2026 23:55:19 -0300 Subject: image: contain and its Fit, a wrapper over containGeometry kept for the window built without MuPDF, are gone: gui.zig's two places there (nativePlaceDrawable, the native image instance) ask containGeometry, null exactly when the old size was zero, and the contain test asserts on it Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge --- src/image.zig | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/image.zig') diff --git a/src/image.zig b/src/image.zig index 357d9e94..e59696f8 100644 --- a/src/image.zig +++ b/src/image.zig @@ -634,20 +634,11 @@ pub fn containGeometry(iw: usize, ih: usize, max_w: u32, max_h: u32) ?NativeGeom return .{ .src = .{ .w = src_w, .h = src_h }, .dst = dst }; } -/// Compatibility helper for callers which need only the old contain size. -pub const Fit = struct { w: u32, h: u32 }; - -pub fn contain(iw: usize, ih: usize, max_w: u32, max_h: u32) Fit { - const geometry = containGeometry(iw, ih, max_w, max_h) orelse - return .{ .w = 0, .h = 0 }; - return .{ .w = geometry.dst.w, .h = geometry.dst.h }; -} - test "native image contain keeps aspect, bounds, top-left, and small-image size" { - try std.testing.expectEqual(Fit{ .w = 40, .h = 20 }, contain(400, 200, 40, 40)); - try std.testing.expectEqual(Fit{ .w = 20, .h = 40 }, contain(200, 400, 40, 40)); - try std.testing.expectEqual(Fit{ .w = 17, .h = 9 }, contain(17, 9, 40, 40)); - try std.testing.expectEqual(Fit{ .w = 0, .h = 0 }, contain(17, 9, 0, 40)); + try std.testing.expectEqual(PixelRect{ .w = 40, .h = 20 }, containGeometry(400, 200, 40, 40).?.dst); + try std.testing.expectEqual(PixelRect{ .w = 20, .h = 40 }, containGeometry(200, 400, 40, 40).?.dst); + try std.testing.expectEqual(PixelRect{ .w = 17, .h = 9 }, containGeometry(17, 9, 40, 40).?.dst); + try std.testing.expect(containGeometry(17, 9, 0, 40) == null); const odd = containGeometry(403, 211, 101, 47).?; try std.testing.expectEqual(PixelRect{ .w = 89, .h = 47 }, odd.dst); -- cgit v1.3