Fixed drawingResize dimensions calculation

col.go

@@ -800,16 +800,15 @@ func (f *File) RemoveCol(sheet, col string) error {
 // pixel. If the width hasn't been set by the user we use the default value.
 // If the column is hidden it has a value of zero.
 func convertColWidthToPixels(width float64) float64 {
-	var padding float64 = 5
 	var pixels float64
-	var maxDigitWidth float64 = 7
+	var maxDigitWidth float64 = 8
 	if width == 0 {
 		return pixels
 	}
 	if width < 1 {
 		pixels = (width * 12) + 0.5
-		return math.Ceil(pixels)
+		return float64(int(pixels))
 	}
-	pixels = (width*maxDigitWidth + 0.5) + padding
-	return math.Ceil(pixels)
+	pixels = (width*maxDigitWidth + 0.5)
+	return float64(int(pixels))
 }

picture.go

@@ -753,18 +753,20 @@ func (f *File) drawingResize(sheet, cell string, width, height float64, opts *Gr
 			cellHeight += f.getRowHeight(sheet, row)
 		}
 	}
-	if float64(cellWidth) < width {
-		asp := float64(cellWidth) / width
-		width, height = float64(cellWidth), height*asp
-	}
-	if float64(cellHeight) < height {
-		asp := float64(cellHeight) / height
-		height, width = float64(cellHeight), width*asp
+	if float64(cellWidth) < width || float64(cellHeight) < height {
+		aspWidth := float64(cellWidth) / width
+		aspHeight := float64(cellHeight) / height
+		var asp float64
+		if aspWidth < aspHeight {
+			asp = aspWidth
+		} else {
+			asp = aspHeight
+		}
+		width, height = width*asp, height*asp
 	}
 	if opts.AutoFitIgnoreAspect {
 		width, height = float64(cellWidth), float64(cellHeight)
 	}
-	width, height = width-float64(opts.OffsetX), height-float64(opts.OffsetY)
 	w, h = int(width*opts.ScaleX), int(height*opts.ScaleY)
 	return
 }

rows.go

@@ -947,5 +947,5 @@ func convertRowHeightToPixels(height float64) float64 {
 	if height == 0 {
 		return 0
 	}
-	return math.Ceil(4.0 / 3.4 * height)
+	return height * 4.0 / 3.0
 }