From 352631e0717899e6c3364327aafc6db7eed47999 Mon Sep 17 00:00:00 2001 From: potassium Date: Sun, 22 Feb 2026 01:06:02 +0300 Subject: [PATCH] merging all related stuff here --- go.mod | 11 +++----- go.sum | 40 ++--------------------------- http/blank/blank.go | 48 +++++++++++++++++++++++++++++++++++ http/http.go | 7 +++-- http/test.go | 33 ++++++++++++++++++++++++ pkg/mkpalette/palette.go | 2 +- pkg/showpalette/.show.go.swp | Bin 12288 -> 0 bytes pkg/showpalette/show.go | 2 +- pkg/texture | 1 + scale_test.go | 17 ++++++++++++- util/util.go | 20 --------------- 11 files changed, 110 insertions(+), 71 deletions(-) create mode 100644 http/blank/blank.go create mode 100644 http/test.go delete mode 100644 pkg/showpalette/.show.go.swp create mode 160000 pkg/texture delete mode 100644 util/util.go diff --git a/go.mod b/go.mod index 22bfd08..47e5e39 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,8 @@ -module git.niplace.ru/XoxJlopeZi4BB/imageutils +module git.nkpl.cc/twocookedfaggots/imageutils -go 1.24.0 +go 1.25.5 require ( github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 - golang.org/x/image v0.33.0 -) - -require ( - 9fans.net/go v0.0.7 // indirect - github.com/potassium5703/texture v0.0.0-20240820054037-fce43fc4b0f0 // indirect + golang.org/x/image v0.36.0 ) diff --git a/go.sum b/go.sum index 1a19b10..3b477c3 100644 --- a/go.sum +++ b/go.sum @@ -1,40 +1,4 @@ -9fans.net/go v0.0.7 h1:H5CsYJTf99C8EYAQr+uSoEJnLP/iZU8RmDuhyk30iSM= -9fans.net/go v0.0.7/go.mod h1:Rxvbbc1e+1TyGMjAvLthGTyO97t+6JMQ6ly+Lcs9Uf0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/potassium5703/texture v0.0.0-20240820054037-fce43fc4b0f0 h1:sowjIIVme5ovcdB0kjP3w+4xbVNrlOPdx7Up4LIGJz8= -github.com/potassium5703/texture v0.0.0-20240820054037-fce43fc4b0f0/go.mod h1:KwM7hMpZhr3XySWuK/SZ7s1BXVQe8p1IyZftYg9KtWY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20210405174845-4513512abef3/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ= -golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= -golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc= +golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4= diff --git a/http/blank/blank.go b/http/blank/blank.go new file mode 100644 index 0000000..d0c98a2 --- /dev/null +++ b/http/blank/blank.go @@ -0,0 +1,48 @@ +package blank + +import ( + "image" + "image/color" + "image/draw" + + "git.nkpl.cc/twocookedfaggots/imageutils" +) + +type blank struct { + image.Image + color.Color + imageutils.Side +} + +func (b blank) ColorModel() color.Model { return b.Image.ColorModel() } + +func (b blank) Bounds() image.Rectangle { + rect := image.Rectangle{} + switch b.Side { + case imageutils.Left: + fallthrough + case imageutils.Right: + rect = image.Rectangle{ + image.ZP, + image.Point{ + 1, b.Image.Bounds().Dy(), + }, + } + case imageutils.Up: + fallthrough + case imageutils.Down: + rect = image.Rectangle{ + image.ZP, + image.Point{ + b.Image.Bounds().Dx(), 1, + }, + } + } + return rect +} + +func (b blank) At(x, y int) color.Color { return b.Color } + +func Blank(img image.Image, clr color.Color, side imageutils.Side) image.Image { + return imageutils.Concat(img, blank{img, clr, side}, side) +} diff --git a/http/http.go b/http/http.go index 8361f67..c84af96 100644 --- a/http/http.go +++ b/http/http.go @@ -10,12 +10,15 @@ type imageTransform struct { TransformFunc func(image.Image) image.Image } +type BlankFill struct { +} + func (t imageTransform) ServeHTTP(w http.ResponseWriter, r *http.Request) { - + } func indexHTML(w http.ResponseWriter, r *http.Request) { - f, err := os.Open("index.html") + f, err := os.Open("") if err != nil { w.WriteHeader(http.StatusInternalServerError) log.Fatalln("error opening file:", err) diff --git a/http/test.go b/http/test.go new file mode 100644 index 0000000..66c31ad --- /dev/null +++ b/http/test.go @@ -0,0 +1,33 @@ +//go:build ignore +package main + +import "git.nkpl.cc/twocookedfaggots/imageutils/http/blank" + +func BlankFillWhiteUp(img image.Image) image.Image { + for i := 0; i < img.Bounds().Dx(); i++ { + img = blank.Blank(img, color.White, Up) + } + return img +} + +func ProcessImageStdio(f func(image.Image) image.Image) error { + img, err := png.Decode(os.Stdin) + if err != nil { + return err + } + img = f(img) + err := img.Encode(os.Stdout, img) + if err != nil { + return err + } + return nil +} + +func main() { + err := ProcessImageStdio( + BlankFillWhiteUp, + ) + if err != nil { + panic(err) + } +} diff --git a/pkg/mkpalette/palette.go b/pkg/mkpalette/palette.go index cd6365d..acd4afe 100644 --- a/pkg/mkpalette/palette.go +++ b/pkg/mkpalette/palette.go @@ -9,7 +9,7 @@ import ( "os" "slices" - imgutil "git.niplace.ru/XoxJlopeZi4BB/imageutils/pkg" + imgutil "git.nkpl.cc/twocookedfaggots/imageutils/pkg" ) func check(err error) { diff --git a/pkg/showpalette/.show.go.swp b/pkg/showpalette/.show.go.swp deleted file mode 100644 index 1e47865143a26863d4fa6c9d408578e0933db24e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmYc?2=nw+u+%eTU|?VnU|`^S5S0qlrKT1n<>wdR zQ395#gBz${T$HSznVXoNT3V8sQ>>qyo1$NwkzZbrn3Gykk_u+)rRRfnjS{0FFd70B zhd^mbnyv+JsIifu0mv+6B}D~cp->QW6px0$Xb6mkz-S1JhQMeDjE2By2#kinXb6mu z5GW~NWT%+J8^iJyVtB|ihhO@0Q33;YZW2l*Kow(v7B ztl?*1SjNx5u#}&HA&;MdA%~xVA)B9p!IPhXL7Ja|L4couftR0w;T<0X!y7&ZhSz)y z443#A7!LC>FdXD#U^u|Xz%Y@IfuWL*fuWp_fuW3#fx(@RfkBavfq{vSfq{XKf#E+d z1H%Pg28LC<3=9)_85sI`85sI_85qiV85mM|85kmX85lx&85n|j85n|i85neV85k6K z85qQQ85l%)85l%(85l0|FfeT8VPIIu!@$tZ!@$tN!@y9g3T77!85Z z5Eu=C(GVC7fzc44AOva|IFmC{le0Bai;6TEI8%#?6l@g=^3wHO^OEyZQZ@36^@2-M z@=Hr}6hP}go%3_@i;AnE%Rp;288{g@H5oWLHFX#`IXP>=Bxg}-Noi4@f^TVYiAH8_ zI%ox{UO-||ajHjZ1=s+MGEI;sPR@d&%)FAEJdH91Z3U&|#1h>yC9p(VXPQ7ETT~?)44k!4 zRUpftt}RL}F3l-n;N+|Y`2@mKuvJJbC`ipq(SY!E6w0DAV?mnI@{1HQK_(X^=B1}9 zl!2WEQ3MjrP0UW!K)BFAMOU6obKr3U$%3A%;2%!A4+~k&Xh07hzjp`%c#keOG4p4gEh0=yhsFDNy+M8iNw z!9YhLPe&n7lLBj<@=NnliZwJ95GE()rRStV!w8x&z{yN6$lb}&H$Npc2NE=B9sp-e zu(Sru17IH1B#05v;9@ALEJ#K2J}7aQCYL~!LM=rP#XJRV1w&0(A_NyNc?_JHX$rZC zB^i3Y`6(J;1~|mia`F>P%uF=$G&OY;3^f&OZ50e)QHp6UILtHi!1il0a6-!~1*P=N z61}|4f}F(URK227{fPVuubljX)Tm4oCnw~U@derGN(>B~O8Lb~44g_JSAb}6i0T*Q ur6V}tK!9^Wj8sq&o0*rcpIls~#E_X=kY7}ypuxaUkeHmEn4SvGjSK+Zq8kSQ diff --git a/pkg/showpalette/show.go b/pkg/showpalette/show.go index f3936b9..0450654 100644 --- a/pkg/showpalette/show.go +++ b/pkg/showpalette/show.go @@ -8,7 +8,7 @@ import ( "math" "os" - imgutil "git.niplace.ru/XoxJlopeZi4BB/imageutils/pkg" + imgutil "git.nkpl.cc/twocookedfaggots/imageutils/pkg" ) func nearestHighSqrt(n int) int { diff --git a/pkg/texture b/pkg/texture new file mode 160000 index 0000000..fce43fc --- /dev/null +++ b/pkg/texture @@ -0,0 +1 @@ +Subproject commit fce43fc4b0f0f5636c0b905bc1eecde203c239e8 diff --git a/scale_test.go b/scale_test.go index 63afb00..dbf4e86 100644 --- a/scale_test.go +++ b/scale_test.go @@ -8,7 +8,7 @@ import ( "io" "testing" - "github.com/potassium5703/texture" + "git.nkpl.cc/twocookedfaggots/imageutils/pkg/texture" ) func Render(img image.Image, rect image.Rectangle) image.Image { @@ -33,6 +33,21 @@ func BenchmarkScale(b *testing.B) { } } + +type SinglePixel struct{} + +func (s SinglePixel) At(x, y int) color.Color { + return color.White +} + +func (s SinglePixel) ColorModel() color.Model { + return color.RGBAModel +} + +func (s SinglePixel) Bounds() image.Rectangle { + return image.Rect(0, 0, 1, 1) +} + func BenchmarkSinglePixel(b *testing.B) { instance := SinglePixel{} err := png.Encode(io.Discard, diff --git a/util/util.go b/util/util.go deleted file mode 100644 index 516178a..0000000 --- a/util/util.go +++ /dev/null @@ -1,20 +0,0 @@ -package imageutils - -import ( - "image" - "image/color" -) - -type SinglePixel struct{} - -func (s SinglePixel) At(x, y int) color.Color { - return color.White -} - -func (s SinglePixel) ColorModel() color.Model { - return color.RGBAModel -} - -func (s SinglePixel) Bounds() image.Rectangle { - return image.Rect(0, 0, 1, 1) -}