Fix images.AutoOrient regression

Broken in v0.130.0. Added a integration test to avoid future breakage.

Fixes #12712
This commit is contained in:
Bjørn Erik Pedersen 2024-08-02 09:37:00 +02:00
parent 914fa13efd
commit 944fcc216f
3 changed files with 39 additions and 1 deletions

View file

@ -19,6 +19,7 @@ import (
"github.com/disintegration/gift" "github.com/disintegration/gift"
"github.com/gohugoio/hugo/resources/images/exif" "github.com/gohugoio/hugo/resources/images/exif"
"github.com/spf13/cast"
) )
var _ gift.Filter = (*autoOrientFilter)(nil) var _ gift.Filter = (*autoOrientFilter)(nil)
@ -49,7 +50,8 @@ func (f autoOrientFilter) Bounds(srcBounds image.Rectangle) image.Rectangle {
func (f autoOrientFilter) AutoOrient(exifInfo *exif.ExifInfo) gift.Filter { func (f autoOrientFilter) AutoOrient(exifInfo *exif.ExifInfo) gift.Filter {
if exifInfo != nil { if exifInfo != nil {
if orientation, ok := exifInfo.Tags["Orientation"].(int); ok { if v, ok := exifInfo.Tags["Orientation"]; ok {
orientation := cast.ToInt(v)
if filter, ok := transformationFilters[orientation]; ok { if filter, ok := transformationFilters[orientation]; ok {
return filter return filter
} }

View file

@ -0,0 +1,36 @@
// Copyright 2024 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_test
import (
"testing"
"github.com/gohugoio/hugo/hugolib"
)
func TestAutoOrient(t *testing.T) {
files := `
-- hugo.toml --
-- assets/rotate270.jpg --
sourcefilename: ../testdata/exif/orientation6.jpg
-- layouts/index.html --
{{ $img := resources.Get "rotate270.jpg" }}
W/H original: {{ $img.Width }}/{{ $img.Height }}
{{ $rotated := $img.Filter images.AutoOrient }}
W/H rotated: {{ $rotated.Width }}/{{ $rotated.Height }}
`
b := hugolib.Test(t, files)
b.AssertFileContent("public/index.html", "W/H original: 80/40\n\nW/H rotated: 40/80")
}

BIN
resources/testdata/exif/orientation6.jpg vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 982 B