mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

icat: Report panics in the render function correctly

Browse Source 
Also, only fallback to imagemagick on error when the engine is not
specified as builtin
This commit is contained in:
Kovid Goyal
2025-10-15 08:17:53 +05:30
parent dd7caaa91b
commit 284ae74201
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kittens/icat/magick.go
View File

@@ -5,6 +5,7 @@ package icat
import (
"fmt"
"github.com/kovidgoyal/go-parallel"
"github.com/kovidgoyal/kitty/tools/tui/graphics"
"github.com/kovidgoyal/kitty/tools/utils/images"
)
@@ -31,6 +32,11 @@ func Render(path string, ro *images.RenderOptions, frames []images.IdentifyRecor
}
func render_image_with_magick(imgd *image_data, src *opened_input) (err error) {
defer func() {
if r := recover(); r != nil {
err = parallel.Format_stacktrace_on_panic(r, 1)
}
}()
err = src.PutOnFilesystem()
if err != nil {
return err

11
kittens/icat/native.go
View File

@@ -4,13 +4,15 @@ package icat
import (
"fmt"
"image"
"image/gif"
"github.com/kovidgoyal/go-parallel"
"github.com/kovidgoyal/kitty/tools/tty"
"github.com/kovidgoyal/kitty/tools/tui/graphics"
"github.com/kovidgoyal/kitty/tools/utils"
"github.com/kovidgoyal/kitty/tools/utils/images"
"github.com/kovidgoyal/kitty/tools/utils/shm"
"image"
"image/gif"
"github.com/kovidgoyal/exiffix"
"github.com/kovidgoyal/imaging"
@@ -151,6 +153,11 @@ func add_gif_frames(ctx *images.Context, imgd *image_data, gf *gif.GIF) error {
}
func render_image_with_go(imgd *image_data, src *opened_input) (err error) {
defer func() {
if r := recover(); r != nil {
err = parallel.Format_stacktrace_on_panic(r, 1)
}
}()
ctx := images.Context{}
switch {
case imgd.format_uppercase == "GIF" && opts.Loop != 0:

16
kittens/icat/process_images.go
View File

@@ -279,7 +279,7 @@ func process_arg(arg input_arg) {
var format string
var err error
imgd := image_data{source_name: arg.value}
if opts.Engine == "auto" || opts.Engine == "native" {
if opts.Engine == "auto" || opts.Engine == "builtin" {
c, format, err = image.DecodeConfig(f.file)
f.Rewind()
can_use_go = err == nil
@@ -299,12 +299,16 @@ func process_arg(arg input_arg) {
}
err = render_image_with_go(&imgd, &f)
if err != nil {
merr := render_image_with_magick(&imgd, &f)
if merr != nil {
report_error(arg.value, "Could not render image to RGB", err)
return
if opts.Engine != "builtin" {
merr := render_image_with_magick(&imgd, &f)
if merr != nil {
report_error(arg.value, "Could not render image to RGB", err)
return
}
err = nil
}
err = nil
report_error(arg.value, "could not render", err)
return
}
} else {
err = render_image_with_magick(&imgd, &f)