|
|
|
@ -443,7 +443,11 @@ func imageCalculations(o *Options, inWidth, inHeight int) float64 {
|
|
|
|
switch {
|
|
|
|
switch {
|
|
|
|
// Fixed width and height
|
|
|
|
// Fixed width and height
|
|
|
|
case o.Width > 0 && o.Height > 0:
|
|
|
|
case o.Width > 0 && o.Height > 0:
|
|
|
|
factor = math.Min(xfactor, yfactor)
|
|
|
|
if o.Crop {
|
|
|
|
|
|
|
|
factor = math.Min(xfactor, yfactor)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
factor = math.Max(xfactor, yfactor)
|
|
|
|
|
|
|
|
}
|
|
|
|
// Fixed width, auto height
|
|
|
|
// Fixed width, auto height
|
|
|
|
case o.Width > 0:
|
|
|
|
case o.Width > 0:
|
|
|
|
if o.Crop {
|
|
|
|
if o.Crop {
|
|
|
|
|