From 0fe32923c410673f4e6ec6a222e1d384eb5e71a9 Mon Sep 17 00:00:00 2001 From: Etienne M Date: Sat, 2 May 2020 18:49:28 +0200 Subject: [PATCH] fix wrong test of width with height (#896) --- .../alfio/controller/api/admin/FileUploadApiController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/FileUploadApiController.java b/src/main/java/alfio/controller/api/admin/FileUploadApiController.java index 7afa468060..96ec110c4f 100644 --- a/src/main/java/alfio/controller/api/admin/FileUploadApiController.java +++ b/src/main/java/alfio/controller/api/admin/FileUploadApiController.java @@ -96,7 +96,7 @@ private UploadBase64FileModification rasterizeSVG(UploadBase64FileModification u final SVGUniverse uni = new SVGUniverse(); final URI uri = uni.loadSVG(upload.getInputStream(), "_"); - // use apply 10% margin to prevent final image size to exceed max allowed size + //apply 10% margin to prevent final image size to exceed max allowed size final int maxWidthWithMargin = (int) (IMAGE_THUMB_MAX_WIDTH_PX * 0.9); final int maxHeightWithMargin = (int) (IMAGE_THUMB_MAX_HEIGHT_PX * 0.9); @@ -104,7 +104,7 @@ private UploadBase64FileModification rasterizeSVG(UploadBase64FileModification u icon.setSvgUniverse(uni); icon.setSvgURI(uri); icon.setAntiAlias(true); - if(icon.getIconWidth() > maxHeightWithMargin || icon.getIconHeight() > maxHeightWithMargin) { + if(icon.getIconWidth() > maxWidthWithMargin || icon.getIconHeight() > maxHeightWithMargin) { icon.setAutosize(SVGIcon.AUTOSIZE_STRETCH); icon.setPreferredSize(new Dimension(Math.min(maxWidthWithMargin, icon.getIconWidth()), Math.min(maxHeightWithMargin, icon.getIconHeight()))); }