From 8c0285a0798575d547f1c14fd4574023f48c35c4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 9 Sep 2023 14:45:18 -0600
Subject: [PATCH] Fix AdjustProperties
---
thumbnailing/thumbnail.go | 3 +--
thumbnailing/u/dimensions.go | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/thumbnailing/thumbnail.go b/thumbnailing/thumbnail.go
index 371e63c2..cfd19163 100644
--- a/thumbnailing/thumbnail.go
+++ b/thumbnailing/thumbnail.go
@@ -50,9 +50,8 @@ func GenerateThumbnail(imgStream io.ReadCloser, contentType string, width int, h
return nil, common.ErrMediaTooLarge
}
- // TODO: Why does AdjustProperties even take `canAnimate` if it's always been hardcoded to `false`? (see git blame on this comment)
var shouldThumbnail bool
- shouldThumbnail, width, height, _, method = u.AdjustProperties(w, h, width, height, animated, false, method)
+ shouldThumbnail, width, height, _, method = u.AdjustProperties(w, h, width, height, animated, method)
if !shouldThumbnail && dimensional {
return nil, common.ErrMediaDimensionsTooSmall
}
diff --git a/thumbnailing/u/dimensions.go b/thumbnailing/u/dimensions.go
index ca943736..9b8744b1 100644
--- a/thumbnailing/u/dimensions.go
+++ b/thumbnailing/u/dimensions.go
@@ -1,6 +1,6 @@
package u
-func AdjustProperties(srcWidth int, srcHeight int, desiredWidth int, desiredHeight int, wantAnimated bool, canAnimate bool, method string) (bool, int, int, bool, string) {
+func AdjustProperties(srcWidth int, srcHeight int, desiredWidth int, desiredHeight int, wantAnimated bool, method string) (bool, int, int, bool, string) {
aspectRatio := float32(srcHeight) / float32(srcWidth)
targetAspectRatio := float32(desiredHeight) / float32(desiredWidth)
if aspectRatio == targetAspectRatio {
@@ -11,8 +11,6 @@ func AdjustProperties(srcWidth int, srcHeight int, desiredWidth int, desiredHeig
if srcWidth <= desiredWidth && srcHeight <= desiredHeight {
if wantAnimated {
return true, srcWidth, srcHeight, true, method
- } else if canAnimate {
- return true, srcWidth, srcHeight, false, method
} else {
return false, desiredWidth, desiredHeight, false, method
}
--
GitLab