Fix image scaling and positioning.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / ImageLinkFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index 35cc140..063a1de 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -38,7 +38,7 @@ import net.pterodactylus.util.template.TemplateParser;
  */
 public class ImageLinkFilter implements Filter {
 
-       /** The template to render for the <img%gt; tag. */
+       /** The template to render for the <img> tag. */
        private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html>\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" style=\"position: relative;<%ifnull ! top>top: <% top|html>;<%/if><%ifnull ! left>left: <% left|html>;<%/if>\"/>"));
 
        /** The template context factory. */
@@ -82,13 +82,8 @@ public class ImageLinkFilter implements Filter {
                        double scale = Math.max(maxWidth / (double) imageWidth, maxHeight / (double) imageHeight);
                        linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5));
                        linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5));
-                       if (scale >= 1) {
-                               linkTemplateContext.set("left", String.format("%dpx", (int) ((imageWidth * scale) - maxWidth) / 2));
-                               linkTemplateContext.set("top", String.format("%dpx", (int) ((imageHeight * scale) - maxHeight) / 2));
-                       } else {
-                               linkTemplateContext.set("left", String.format("%dpx", (int) (maxWidth - (imageWidth * scale)) / 2));
-                               linkTemplateContext.set("top", String.format("%dpx", (int) (maxHeight - (imageHeight * scale)) / 2));
-                       }
+                       linkTemplateContext.set("left", String.format("%dpx", (int) (maxWidth - (imageWidth * scale)) / 2));
+                       linkTemplateContext.set("top", String.format("%dpx", (int) (maxHeight - (imageHeight * scale)) / 2));
                } else {
                        double scale = 1;
                        if ((imageWidth > maxWidth) || (imageHeight > maxHeight)) {