From 57f7c8f65e1bf130f2a2fb9c07a3a2ade2546a25 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 8 Nov 2025 10:27:56 +0530 Subject: [PATCH] Bump version of imaging for a few more fixes --- go.mod | 2 +- go.sum | 4 ++-- kittens/icat/native.go | 2 +- tools/utils/images/loading.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 71fa1131c..1b0be8d82 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/uuid v1.6.0 github.com/kovidgoyal/dbus v0.0.0-20250519011319-e811c41c0bc1 github.com/kovidgoyal/go-parallel v1.1.1 - github.com/kovidgoyal/imaging v1.8.4 + github.com/kovidgoyal/imaging v1.8.5 github.com/seancfoley/ipaddress-go v1.7.1 github.com/shirou/gopsutil/v4 v4.25.10 github.com/zeebo/xxh3 v1.0.2 diff --git a/go.sum b/go.sum index 718f02ecf..1bab6a0a5 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ github.com/kovidgoyal/dbus v0.0.0-20250519011319-e811c41c0bc1 h1:rMY/hWfcVzBm6BL github.com/kovidgoyal/dbus v0.0.0-20250519011319-e811c41c0bc1/go.mod h1:RbNG3Q1g6GUy1/WzWVx+S24m7VKyvl57vV+cr2hpt50= github.com/kovidgoyal/go-parallel v1.1.1 h1:1OzpNjtrUkBPq3UaqrnvOoB2F9RttSt811uiUXyI7ok= github.com/kovidgoyal/go-parallel v1.1.1/go.mod h1:BJNIbe6+hxyFWv7n6oEDPj3PA5qSw5OCtf0hcVxWJiw= -github.com/kovidgoyal/imaging v1.8.4 h1:gCL5Ogc14NL6F2zOn9/T1eoRewUuxSFgLOoihLjcma4= -github.com/kovidgoyal/imaging v1.8.4/go.mod h1:fHutWjAiIZ3t7+YRVzuPkICFFzHTTkxgx2jSeQXKjE0= +github.com/kovidgoyal/imaging v1.8.5 h1:GZrBlpRbuSbpomWhERCl5ZmQq5Q6nMR8gnHL9R3uomM= +github.com/kovidgoyal/imaging v1.8.5/go.mod h1:fHutWjAiIZ3t7+YRVzuPkICFFzHTTkxgx2jSeQXKjE0= github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a h1:N9zuLhTvBSRt0gWSiJswwQ2HqDmtX/ZCDJURnKUt1Ik= github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/kittens/icat/native.go b/kittens/icat/native.go index 4ff597227..a9457fe29 100644 --- a/kittens/icat/native.go +++ b/kittens/icat/native.go @@ -114,7 +114,7 @@ var _ = debugprintln func add_frames(ctx *images.Context, imgd *image_data, gf *imaging.Image) { for _, f := range gf.Frames { - frame := add_frame(ctx, imgd, f.Image, f.X, f.Y) + frame := add_frame(ctx, imgd, f.Image, f.TopLeft.X, f.TopLeft.Y) frame.number, frame.compose_onto = int(f.Number), int(f.ComposeOnto) frame.replace = f.Replace frame.delay_ms = int(f.Delay.Milliseconds()) diff --git a/tools/utils/images/loading.go b/tools/utils/images/loading.go index 9714d7aa1..d57a39d53 100644 --- a/tools/utils/images/loading.go +++ b/tools/utils/images/loading.go @@ -269,7 +269,7 @@ func OpenNativeImageFromReader(f io.ReadSeeker) (ans *ImageData, err error) { for _, f := range ic.Frames { fr := ImageFrame{ - Img: f.Image, Left: f.X, Top: f.Y, Width: f.Image.Bounds().Dx(), Height: f.Image.Bounds().Dy(), + Img: f.Image, Left: f.TopLeft.X, Top: f.TopLeft.Y, Width: f.Image.Bounds().Dx(), Height: f.Image.Bounds().Dy(), Compose_onto: int(f.ComposeOnto), Number: int(f.Number), Delay_ms: int32(f.Delay.Milliseconds()), Replace: f.Replace, Is_opaque: imaging.IsOpaque(f.Image), }