Fix AdjustProperties

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
 	}

thumbnailing/u/dimensions.go

 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
 		}