From 87f4c5ccecab0039c17b44b23f2c34dc55034053 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 8 Nov 2025 12:21:28 +0530
Subject: [PATCH] Remove no longer needed code

---
 kittens/icat/magick.go |  4 ++--
 kittens/icat/native.go | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/kittens/icat/magick.go b/kittens/icat/magick.go
index a738ab546..2fcf10eed 100644
--- a/kittens/icat/magick.go
+++ b/kittens/icat/magick.go
@@ -12,7 +12,7 @@ import (
 
 var _ = fmt.Print
 
-func Render(path, original_file_path string, ro *images.RenderOptions, frames []images.IdentifyRecord) (ans []*image_frame, err error) {
+func render(path, original_file_path string, ro *images.RenderOptions, frames []images.IdentifyRecord) (ans []*image_frame, err error) {
 	ro.TempfilenameTemplate = shm_template
 	image_frames, filenames, err := images.RenderWithMagick(path, original_file_path, ro, frames)
 	if err == nil {
@@ -56,7 +56,7 @@ func render_image_with_magick(imgd *image_data, src *opened_input) (err error) {
 	if scale_image(imgd) {
 		ro.ResizeTo.X, ro.ResizeTo.Y = imgd.canvas_width, imgd.canvas_height
 	}
-	imgd.frames, err = Render(src.FileSystemName(), imgd.source_name, &ro, frames)
+	imgd.frames, err = render(src.FileSystemName(), imgd.source_name, &ro, frames)
 	if err != nil {
 		return err
 	}
diff --git a/kittens/icat/native.go b/kittens/icat/native.go
index e387f15c1..3c711db13 100644
--- a/kittens/icat/native.go
+++ b/kittens/icat/native.go
@@ -32,13 +32,7 @@ func resize_frame(imgd *image_data, img image.Image) (image.Image, image.Rectang
 const shm_template = "kitty-icat-*"
 
 func add_frame(ctx *images.Context, imgd *image_data, img image.Image, left, top int) *image_frame {
-	is_opaque := false
-	if imgd.format_uppercase == "JPEG" {
-		// special cased because EXIF orientation could have already changed this image to an NRGBA making IsOpaque() very slow
-		is_opaque = true
-	} else {
-		is_opaque = imaging.IsOpaque(img)
-	}
+	is_opaque := imaging.IsOpaque(img)
 	b := img.Bounds()
 	if imgd.scaled_frac.x != 0 {
 		img, b = resize_frame(imgd, img)
@@ -163,10 +157,11 @@ func render_image_with_go(imgd *image_data, src *opened_input) (err error) {
 	if imgs == nil {
 		return fmt.Errorf("unknown image format")
 	}
+	imgd.format_uppercase = imgs.Metadata.Format.String()
 	// Loading could auto orient and therefore change width/height, so
 	// re-calculate
-	imgd.canvas_width = int(imgs.Metadata.PixelWidth)
-	imgd.canvas_height = int(imgs.Metadata.PixelHeight)
+	b := imgs.Bounds()
+	imgd.canvas_width, imgd.canvas_height = b.Dx(), b.Dy()
 	set_basic_metadata(imgd)
 	scale_image(imgd)
 	add_frames(&ctx, imgd, imgs)