diff --git a/internal/epub/filters/autorotate.go b/internal/epub/filters/autorotate.go index ea12583..36c47c2 100644 --- a/internal/epub/filters/autorotate.go +++ b/internal/epub/filters/autorotate.go @@ -7,14 +7,29 @@ import ( "github.com/disintegration/gift" ) -func AutoRotate() gift.Filter { - return &autoRotateFilter{} +func AutoRotate(viewWidth, viewHeight int) gift.Filter { + return &autoRotateFilter{ + viewWidth, viewHeight, + } } -type autoRotateFilter struct{} +type autoRotateFilter struct { + viewWidth, viewHeight int +} + +func (p *autoRotateFilter) needRotate(srcBounds image.Rectangle) bool { + width, height := srcBounds.Dx(), srcBounds.Dy() + if width <= height { + return false + } + if width <= p.viewWidth && height <= p.viewHeight { + return false + } + return true +} func (p *autoRotateFilter) Bounds(srcBounds image.Rectangle) (dstBounds image.Rectangle) { - if srcBounds.Dx() > srcBounds.Dy() { + if p.needRotate(srcBounds) { dstBounds = gift.Rotate90().Bounds(srcBounds) } else { dstBounds = srcBounds @@ -23,7 +38,7 @@ func (p *autoRotateFilter) Bounds(srcBounds image.Rectangle) (dstBounds image.Re } func (p *autoRotateFilter) Draw(dst draw.Image, src image.Image, options *gift.Options) { - if src.Bounds().Dx() > src.Bounds().Dy() { + if p.needRotate(src.Bounds()) { gift.Rotate90().Draw(dst, src, options) } else { draw.Draw(dst, dst.Bounds(), src, src.Bounds().Min, draw.Src) diff --git a/internal/epub/image_filters.go b/internal/epub/image_filters.go index 4839dba..204c271 100644 --- a/internal/epub/image_filters.go +++ b/internal/epub/image_filters.go @@ -10,7 +10,7 @@ func NewGift(options *ImageOptions) *gift.GIFT { g.SetParallelization(false) if options.AutoRotate { - g.Add(filters.AutoRotate()) + g.Add(filters.AutoRotate(options.ViewWidth, options.ViewHeight)) } if options.Contrast != 0 { g.Add(gift.Contrast(float32(options.Contrast)))