Merge pull request #99 from mo3et/s3/del-expire-data

add getResizeImageSize function in minio

s3/minio/image.go

@@ -118,3 +118,23 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 	// By default, the original image is returned
 	return img
 }
+
+func getResizeImageSize(img image.Image, maxWidth, maxHeight int) (thumbnailWidth, thumbnailHeight int) {
+	bounds := img.Bounds()
+	imgWidth := bounds.Max.X
+	imgHeight := bounds.Max.Y
+
+	// Calculating scaling
+	scaleWidth := float64(maxWidth) / float64(imgWidth)
+	scaleHeight := float64(maxHeight) / float64(imgHeight)
+
+	scale := scaleWidth
+	if scaleHeight < scaleWidth {
+		scale = scaleHeight
+	}
+
+	// Calculate Thumbnail Size
+	thumbnailWidth = int(float64(imgWidth) * scale)
+	thumbnailHeight = int(float64(imgHeight) * scale)
+	return 
+}

s3/minio/minio.go

@@ -508,8 +508,7 @@ func (m *Minio) GetImageThumbnailKey(ctx context.Context, name string) (string,
 		return "", errs.New("object not image").Wrap()
 	}
 
-	thumbnail := resizeImage(img, info.Width, info.Height)
-	thumbnailWidth, thumbnailHeight := ImageWidthHeight(thumbnail)
+	thumbnailWidth, thumbnailHeight := getResizeImageSize(img, info.Width, info.Height)
 	opt := &s3.Image{
 		Width:  thumbnailWidth,
 		Height: thumbnailHeight,