From: Bjørn Erik Pedersen Date: Tue, 20 Jan 2026 00:43:03 +0000 (+0100) Subject: deps: Upgrade github.com/gohugoio/gift v0.1.0 => v0.2.0 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=77214117ae76ddac6b82dfa232b6aa5d85e64f6b;p=brevno-suite%2Fhugo deps: Upgrade github.com/gohugoio/gift v0.1.0 => v0.2.0 --- diff --git a/go.mod b/go.mod index 3c9713546..1a8bf97ce 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/gobuffalo/flect v1.0.3 github.com/gobwas/glob v0.2.3 github.com/goccy/go-yaml v1.19.2 - github.com/gohugoio/gift v0.1.0 + github.com/gohugoio/gift v0.2.0 github.com/gohugoio/go-i18n/v2 v2.1.3-0.20251018145728-cfcc22d823c6 github.com/gohugoio/go-radix v1.2.0 github.com/gohugoio/hashstructure v0.6.0 diff --git a/go.sum b/go.sum index ef96f149e..a2f182198 100644 --- a/go.sum +++ b/go.sum @@ -270,6 +270,8 @@ github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/gohugoio/gift v0.1.0 h1:KDx+OBrSn/sXmnMdMLYocOLn35MrBpnVhgQghHxd7g8= github.com/gohugoio/gift v0.1.0/go.mod h1:1Mrm5CjF33KpD749Dwj+UAjWZ3LC6cBXGuTMa5XwoP4= +github.com/gohugoio/gift v0.2.0 h1:vA31pP0rTVmBxBrhpY3WEt+4zM4g+1sDqYeemwsYeqc= +github.com/gohugoio/gift v0.2.0/go.mod h1:1Mrm5CjF33KpD749Dwj+UAjWZ3LC6cBXGuTMa5XwoP4= github.com/gohugoio/go-i18n/v2 v2.1.3-0.20251018145728-cfcc22d823c6 h1:pxlAea9eRwuAnt/zKbGqlFO2ZszpIe24YpOVLf+N+4I= github.com/gohugoio/go-i18n/v2 v2.1.3-0.20251018145728-cfcc22d823c6/go.mod h1:m5hu1im5Qc7LDycVLvee6MPobJiRLBYHklypFJR0/aE= github.com/gohugoio/go-radix v1.2.0 h1:D5GTk8jIoeXirBSc2P4E4NdHKDrenk9k9N0ctU5Yrhg= diff --git a/resources/images/auto_orient.go b/resources/images/auto_orient.go index a57987c78..cb5efc454 100644 --- a/resources/images/auto_orient.go +++ b/resources/images/auto_orient.go @@ -38,7 +38,7 @@ type ImageFilterFromOrientationProvider interface { AutoOrient(orientation int) gift.Filter } -func (f autoOrientFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { +func (f autoOrientFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { panic("not supported") } diff --git a/resources/images/dither.go b/resources/images/dither.go index 825b06e87..61b8362fc 100644 --- a/resources/images/dither.go +++ b/resources/images/dither.go @@ -62,8 +62,8 @@ var ditherMethodsOrdered = map[string]dither.OrderedDitherMatrix{ "vertical5x3": dither.Vertical5x3, } -func (f ditherFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { - return gift.New().Draw(dst, f.ditherer.Dither(src)) +func (f ditherFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { + gift.New().Draw(dst, f.ditherer.Dither(src)) } func (f ditherFilter) Bounds(srcBounds image.Rectangle) image.Rectangle { diff --git a/resources/images/mask.go b/resources/images/mask.go index b3688ef90..5ab21bc46 100644 --- a/resources/images/mask.go +++ b/resources/images/mask.go @@ -15,10 +15,10 @@ type maskFilter struct { } // Draw applies the mask to the base image. -func (f maskFilter) Draw(dst draw.Image, baseImage image.Image, options *gift.Options) error { +func (f maskFilter) Draw(dst draw.Image, baseImage image.Image, options *gift.Options) { maskImage, err := f.mask.DecodeImage() if err != nil { - return fmt.Errorf("failed to decode image: %s", err) + panic(fmt.Sprintf("failed to decode image: %s", err)) } // Ensure the mask is the same size as the base image @@ -54,11 +54,7 @@ func (f maskFilter) Draw(dst draw.Image, baseImage image.Image, options *gift.Op draw.DrawMask(outputImage, baseBounds, baseImage, image.Point{}, alphaMask, image.Point{}, draw.Over) // Copy the result to the destination - if err := gift.New().Draw(dst, outputImage); err != nil { - return fmt.Errorf("failed to draw masked image: %s", err) - } - - return nil + gift.New().Draw(dst, outputImage) } // Bounds returns the bounds of the resulting image. diff --git a/resources/images/opacity.go b/resources/images/opacity.go index b2eaf5f12..37132ab63 100644 --- a/resources/images/opacity.go +++ b/resources/images/opacity.go @@ -27,12 +27,11 @@ type opacityFilter struct { opacity float32 } -func (f opacityFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { +func (f opacityFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { // 0 is fully transparent and 255 is opaque. alpha := uint8(f.opacity * 255) mask := image.NewUniform(color.Alpha{alpha}) draw.DrawMask(dst, dst.Bounds(), src, image.Point{}, mask, image.Point{}, draw.Over) - return nil } func (f opacityFilter) Bounds(srcBounds image.Rectangle) image.Rectangle { diff --git a/resources/images/overlay.go b/resources/images/overlay.go index 91934ddb9..bc5bb3e78 100644 --- a/resources/images/overlay.go +++ b/resources/images/overlay.go @@ -28,15 +28,13 @@ type overlayFilter struct { x, y int } -func (f overlayFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { +func (f overlayFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { overlaySrc, err := f.src.DecodeImage() if err != nil { - return fmt.Errorf("failed to decode image: %s", err) + panic(fmt.Sprintf("failed to decode image: %s", err)) } - if err := gift.New().Draw(dst, src); err != nil { - return err - } - return gift.New().DrawAt(dst, overlaySrc, image.Pt(f.x, f.y), gift.OverOperator) + gift.New().Draw(dst, src) + gift.New().DrawAt(dst, overlaySrc, image.Pt(f.x, f.y), gift.OverOperator) } func (f overlayFilter) Bounds(srcBounds image.Rectangle) image.Rectangle { diff --git a/resources/images/padding.go b/resources/images/padding.go index 73341b89e..70a5a0182 100644 --- a/resources/images/padding.go +++ b/resources/images/padding.go @@ -28,7 +28,7 @@ type paddingFilter struct { ccolor color.Color // canvas color } -func (f paddingFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { +func (f paddingFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { w := src.Bounds().Dx() + f.left + f.right h := src.Bounds().Dy() + f.top + f.bottom @@ -41,10 +41,8 @@ func (f paddingFilter) Draw(dst draw.Image, src image.Image, options *gift.Optio i := image.NewRGBA(image.Rect(0, 0, w, h)) draw.Draw(i, i.Bounds(), image.NewUniform(f.ccolor), image.Point{}, draw.Src) - if err := gift.New().Draw(dst, i); err != nil { - return err - } - return gift.New().DrawAt(dst, src, image.Pt(f.left, f.top), gift.OverOperator) + gift.New().Draw(dst, i) + gift.New().DrawAt(dst, src, image.Pt(f.left, f.top), gift.OverOperator) } func (f paddingFilter) Bounds(srcBounds image.Rectangle) image.Rectangle { diff --git a/resources/images/process.go b/resources/images/process.go index ed21fce5f..7cd4a886d 100644 --- a/resources/images/process.go +++ b/resources/images/process.go @@ -30,7 +30,7 @@ type processFilter struct { spec string } -func (f processFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { +func (f processFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { panic("not supported") } diff --git a/resources/images/text.go b/resources/images/text.go index ae2831638..8eef2dd5a 100644 --- a/resources/images/text.go +++ b/resources/images/text.go @@ -42,7 +42,7 @@ type textFilter struct { fontSource hugio.ReadSeekCloserProvider } -func (f textFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) error { +func (f textFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { // Load and parse font ttf := goregular.TTF if f.fontSource != nil { @@ -143,7 +143,6 @@ func (f textFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) d.DrawString(line) y = y + fontHeight + f.linespacing } - return nil } func (f textFilter) Bounds(srcBounds image.Rectangle) image.Rectangle {