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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2022-12-01 13:58:06 +05:30
parent 3601488b26
commit e555d963b1
3 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/cmd/at/set_window_logo.go
View File

@@ -7,16 +7,11 @@ import (
"encoding/base64"
"fmt"
"image"
_ "image/gif"
_ "image/jpeg"
"image/png"
"io"
"os"
"strings"
_ "golang.org/x/image/bmp"
_ "golang.org/x/image/tiff"
_ "golang.org/x/image/webp"
"kitty/tools/utils/images"
)
type struct_with_data interface {
@@ -57,7 +52,7 @@ func read_window_logo(io_data *rc_io_data, path string) (func(io_data *rc_io_dat
f.Close()
b := bytes.Buffer{}
b.Grow(config.Height * config.Width * 4)
err = png.Encode(&b, img)
err = images.Encode(&b, img, "image/png")
if err != nil {
return nil, err
}

35
tools/cmd/clipboard/read.go
View File

@@ -7,9 +7,6 @@ import (
"encoding/base64"
"fmt"
"image"
"image/gif"
"image/jpeg"
"image/png"
"mime"
"os"
"path/filepath"
@@ -19,10 +16,7 @@ import (
"kitty/tools/tty"
"kitty/tools/tui/loop"
"kitty/tools/utils"
"golang.org/x/image/bmp"
"golang.org/x/image/tiff"
_ "golang.org/x/image/webp"
"kitty/tools/utils/images"
)
var _ = fmt.Print
@@ -30,14 +24,6 @@ var cwd string
const OSC_NUMBER = "5522"
var decodable_image_types = map[string]bool{
"image/jpeg": true, "image/png": true, "image/bmp": true, "image/tiff": true, "image/webp": true, "image/gif": true,
}
var encodable_image_types = map[string]bool{
"image/jpeg": true, "image/png": true, "image/bmp": true, "image/tiff": true, "image/gif": true,
}
type Output struct {
arg string
ext string
@@ -114,20 +100,7 @@ func (self *Output) write_image(img image.Image) (err error) {
os.Remove(output.Name())
}
}()
switch self.mime_type {
case "image/png":
return png.Encode(output, img)
case "image/jpeg":
return jpeg.Encode(output, img, nil)
case "image/bmp":
return bmp.Encode(output, img)
case "image/gif":
return gif.Encode(output, img, nil)
case "image/tiff":
return tiff.Encode(output, img, nil)
}
err = fmt.Errorf("Unsupported output image MIME type %s", self.mime_type)
return
return images.Encode(output, img, self.mime_type)
}
func (self *Output) commit() {
@@ -167,9 +140,9 @@ func (self *Output) assign_mime_type(available_mimes []string) (err error) {
self.remote_mime_type = "."
return
}
if encodable_image_types[self.mime_type] {
if images.EncodableImageTypes[self.mime_type] {
for _, mt := range available_mimes {
if decodable_image_types[mt] {
if images.DecodableImageTypes[mt] {
self.remote_mime_type = mt
self.image_needs_conversion = true
return

44
tools/utils/images/formats.go Normal file
View File

@@ -0,0 +1,44 @@
// License: GPLv3 Copyright: 2022, Kovid Goyal, <kovid at kovidgoyal.net>
package images
import (
"fmt"
"image"
"image/gif"
"image/jpeg"
"image/png"
"io"
"golang.org/x/image/bmp"
"golang.org/x/image/tiff"
_ "golang.org/x/image/webp"
)
var _ = fmt.Print
var DecodableImageTypes = map[string]bool{
"image/jpeg": true, "image/png": true, "image/bmp": true, "image/tiff": true, "image/webp": true, "image/gif": true,
}
var EncodableImageTypes = map[string]bool{
"image/jpeg": true, "image/png": true, "image/bmp": true, "image/tiff": true, "image/gif": true,
}
func Encode(output io.Writer, img image.Image, format_mime string) (err error) {
switch format_mime {
case "image/png":
return png.Encode(output, img)
case "image/jpeg":
return jpeg.Encode(output, img, nil)
case "image/bmp":
return bmp.Encode(output, img)
case "image/gif":
return gif.Encode(output, img, nil)
case "image/tiff":
return tiff.Encode(output, img, nil)
}
err = fmt.Errorf("Unsupported output image MIME type %s", format_mime)
return
}