mirror of
https://github.com/gohugoio/hugo.git
synced 2026-08-24 15:28:54 +00:00
f0cfc28c00
Smartcrop can return a crop rectangle that is smaller than the requested dimensions after prescaling and rounding. Expand that rectangle within the source image bounds before applying Hugo's crop/fill pipeline, so smart crops keep the requested size without stretching the image. Bump the smart crop cache version for crop/fill only. Fixes #13688 Co-Authored-By: Joe Mooring <joe.mooring@veriphor.com>
73 lines
2.0 KiB
Go
73 lines
2.0 KiB
Go
// Copyright 2026 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package images
|
|
|
|
import (
|
|
"image"
|
|
"testing"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
)
|
|
|
|
func TestExpandCropRectToMinSize(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
for _, test := range []struct {
|
|
name string
|
|
r image.Rectangle
|
|
bounds image.Rectangle
|
|
width int
|
|
height int
|
|
expectedRect image.Rectangle
|
|
}{
|
|
{
|
|
name: "top left",
|
|
r: image.Rect(0, 0, 899, 560),
|
|
bounds: image.Rect(0, 0, 900, 562),
|
|
width: 900,
|
|
height: 561,
|
|
expectedRect: image.Rect(0, 0, 900, 561),
|
|
},
|
|
{
|
|
name: "bottom right",
|
|
r: image.Rect(1, 2, 900, 562),
|
|
bounds: image.Rect(0, 0, 900, 562),
|
|
width: 900,
|
|
height: 561,
|
|
expectedRect: image.Rect(0, 1, 900, 562),
|
|
},
|
|
{
|
|
name: "centered",
|
|
r: image.Rect(10, 10, 109, 109),
|
|
bounds: image.Rect(0, 0, 200, 200),
|
|
width: 101,
|
|
height: 101,
|
|
expectedRect: image.Rect(9, 9, 110, 110),
|
|
},
|
|
{
|
|
name: "source too small",
|
|
r: image.Rect(0, 0, 899, 560),
|
|
bounds: image.Rect(0, 0, 899, 560),
|
|
width: 900,
|
|
height: 561,
|
|
expectedRect: image.Rect(0, 0, 899, 560),
|
|
},
|
|
} {
|
|
c.Run(test.name, func(c *qt.C) {
|
|
got := expandCropRectToMinSize(test.r, test.bounds, test.width, test.height)
|
|
c.Assert(got, qt.Equals, test.expectedRect)
|
|
})
|
|
}
|
|
}
|