Cleaned up image resizing

This commit is contained in:
nathan 2017-09-03 15:15:31 +02:00
parent 0a2ffb451d
commit c8e88fb568

View File

@ -223,30 +223,16 @@ class ImageResizeUtil {
// resize the image, keep aspect ratio
Image image = ImageUtil.getImageImmediate(ImageIO.read(inputStream));
int height = image.getHeight(null);
int width = image.getWidth(null);
if (width > height) {
// fit on the width
image = image.getScaledInstance(size, -1, Image.SCALE_SMOOTH);
} else {
// fit on the height
image = image.getScaledInstance(-1, size, Image.SCALE_SMOOTH);
}
// the smaller dimension have padding, so the larger dimension is the size of this image.
BufferedImage bufferedImage = ImageUtil.getSquareBufferedImage(image);
// now write out the new one
BufferedImage bufferedImage = ImageUtil.getSquareBufferedImage(image);
ImageIO.write(bufferedImage, "png", newFile); // made up extension
return newFile;
}
public static
File shouldResizeOrCache(final boolean isTrayImage, final File imageFile) {
if (imageFile == null) {
@ -324,8 +310,8 @@ class ImageResizeUtil {
try {
final Image trayImage = ImageUtil.getImageImmediate(image);
BufferedImage bufferedImage = ImageUtil.getBufferedImage(trayImage);
ByteArrayOutputStream os = new ByteArrayOutputStream();
ImageIO.write(bufferedImage, "png", os);
InputStream imageInputStream = new ByteArrayInputStream(os.toByteArray());