Merge pull request #271 from escenic/the-area-of-interest

Improved area of interest

sandbox/pom.xml

@@ -153,4 +153,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
+</project>

servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java

@@ -33,6 +33,8 @@ import com.twelvemonkeys.io.FastByteArrayOutputStream;
 import com.twelvemonkeys.lang.StringUtil;
 import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
 import com.twelvemonkeys.servlet.ServletUtil;
+import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest;
+import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory;
 
 import javax.imageio.*;
 import javax.imageio.stream.ImageInputStream;
@@ -598,7 +600,10 @@ class ImageServletResponseImpl extends HttpServletResponseWrapper implements Ima
         boolean aoiUniform = b != null && b; // default: false
 
         if (aoiX >= 0 || aoiY >= 0 || aoiW >= 0 || aoiH >= 0) {
-            aoi = getAOI(pDefaultWidth, pDefaultHeight, aoiX, aoiY, aoiW, aoiH, aoiPercent, aoiUniform);
+
+            AreaOfInterest areaOfInterest = AreaOfInterestFactory.getDefault().
+                    createAreaOfInterest(pDefaultWidth, pDefaultHeight, aoiPercent, aoiUniform);
+            aoi = areaOfInterest.getAOI(new Rectangle(aoiX, aoiY, aoiW, aoiH));
             return aoi;
         }
 

servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java

@@ -0,0 +1,20 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public interface AreaOfInterest {
+    
+    Rectangle getAOI(Rectangle pCrop);
+
+    Dimension getOriginalDimension();
+
+    int calculateX(Dimension pOriginalDimension, Rectangle pCrop);
+
+    int calculateY(Dimension pOriginalDimension, Rectangle pCrop);
+
+    Dimension getCrop(Dimension pOriginalDimension, Rectangle pCrop);
+}

servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java

@@ -0,0 +1,33 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class AreaOfInterestFactory {
+    private final static AtomicReference<AreaOfInterestFactory> DEFAULT =
+            new AtomicReference<AreaOfInterestFactory>(new AreaOfInterestFactory());
+
+    public static void setDefault(AreaOfInterestFactory factory) {
+        DEFAULT.set(factory);
+    }
+
+    public static AreaOfInterestFactory getDefault() {
+        return DEFAULT.get();
+    }
+
+    public AreaOfInterest createAreaOfInterest(int pDefaultWidth, int pDefaultHeight, boolean aoiPercent, boolean aoiUniform) {
+        if (aoiPercent && aoiUniform) {
+            throw new IllegalArgumentException("Cannot be both uniform and percent Area of Interest");
+        }
+        if (aoiPercent) {
+            return new PercentAreaOfInterest(pDefaultWidth, pDefaultHeight);
+        }
+        else if (aoiUniform) {
+            return new UniformAreaOfInterest(pDefaultWidth, pDefaultHeight);
+        }
+        return new DefaultAreaOfInterest(pDefaultWidth, pDefaultHeight);
+    }
+}

servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java

@@ -0,0 +1,37 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.awt.*;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class AreaOfInterestWrapper implements AreaOfInterest {
+    private AreaOfInterest mDelegate;
+
+    public AreaOfInterestWrapper(AreaOfInterest mDelegate) {
+        this.mDelegate = Validate.notNull(mDelegate);
+    }
+
+    public Rectangle getAOI(Rectangle pCrop) {
+        return mDelegate.getAOI(pCrop);
+    }
+
+    public Dimension getOriginalDimension() {
+        return mDelegate.getOriginalDimension();
+    }
+
+    public int calculateX(Dimension pOriginalDimension, Rectangle pCrop) {
+        return mDelegate.calculateX(pOriginalDimension, pCrop);
+    }
+
+    public int calculateY(Dimension pOriginalDimension, Rectangle pCrop) {
+        return mDelegate.calculateY(pOriginalDimension, pCrop);
+    }
+
+    public Dimension getCrop(Dimension pOriginalDimension, Rectangle pCrop) {
+        return mDelegate.getCrop(pOriginalDimension, pCrop);
+    }
+}

servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java

@@ -0,0 +1,75 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author <a href="mailto:erlend@hamnaberg.net">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class DefaultAreaOfInterest implements AreaOfInterest {
+    private final int mOriginalWidth;
+    private final int mOriginalHeight;
+
+    public DefaultAreaOfInterest(int pOriginalWidth, int pOriginalHeight) {
+        this.mOriginalWidth = pOriginalWidth;
+        this.mOriginalHeight = pOriginalHeight;
+    }
+
+    public DefaultAreaOfInterest(Dimension pOriginalDimension) {
+        this(pOriginalDimension.width, pOriginalDimension.height);
+    }
+
+    Rectangle getAOI(final int pX, final int pY, final int pWidth, final int pHeight) {
+        return getAOI(new Rectangle(pX, pY, pWidth, pHeight));
+    }
+
+    public Rectangle getAOI(final Rectangle pCrop) {
+        int y = pCrop.y;
+        int x = pCrop.x;
+        Dimension dimension = getOriginalDimension();
+
+        Dimension crop = getCrop(dimension, pCrop);
+
+       // Center
+        if (y < 0) {
+            y = calculateY(dimension, new Rectangle(x, y, crop.width, crop.height));
+        }
+
+        if (x < 0) {
+            x = calculateX(dimension, new Rectangle(x, y, crop.width, crop.height));
+        }
+        return new Rectangle(x, y, crop.width, crop.height);
+    }
+
+    public Dimension getOriginalDimension() {
+        return new Dimension(mOriginalWidth, mOriginalHeight);
+    }
+
+    public int calculateX(Dimension pOriginalDimension, Rectangle pCrop) {
+        return (pOriginalDimension.width - pCrop.width) / 2;
+    }
+
+    public int calculateY(Dimension pOriginalDimension, Rectangle pCrop) {
+        return (pOriginalDimension.height - pCrop.height) / 2;
+    }
+
+    public Dimension getCrop(Dimension pOriginalDimension, final Rectangle pCrop) {
+        int mOriginalWidth1 = pOriginalDimension.width;
+        int mOriginalHeight1 = pOriginalDimension.height;
+        int x = pCrop.x;
+        int y = pCrop.y;
+        int cropWidth = pCrop.width;
+        int cropHeight = pCrop.height;
+
+        if (cropWidth < 0 || (x < 0 && cropWidth > mOriginalWidth1)
+                || (x >= 0 && (x + cropWidth) > mOriginalWidth1)) {
+            cropWidth = (x >= 0 ? mOriginalWidth1 - x : mOriginalWidth1);
+        }
+        if (cropHeight < 0 || (y < 0 && cropHeight > mOriginalHeight1)
+                || (y >= 0 && (y + cropHeight) > mOriginalHeight1)) {
+            cropHeight = (y >= 0 ? mOriginalHeight1 - y : mOriginalHeight1);
+        }
+        return new Dimension(cropWidth, cropHeight);
+    }
+}

servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java

@@ -0,0 +1,47 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class PercentAreaOfInterest extends DefaultAreaOfInterest {
+
+    public PercentAreaOfInterest(Dimension pOriginalDimension) {
+        super(pOriginalDimension);
+    }
+
+    public PercentAreaOfInterest(int pOriginalWidth, int pOriginalHeight) {
+        super(pOriginalWidth, pOriginalHeight);
+    }
+
+    public Dimension getCrop(Dimension pOriginalDimension, final Rectangle pCrop) {
+        int cropWidth = pCrop.width;
+        int cropHeight = pCrop.height;
+        float ratio;
+
+        if (cropWidth >= 0 && cropHeight >= 0) {
+            // Non-uniform
+            cropWidth = Math.round((float) pOriginalDimension.width * (float) pCrop.width / 100f);
+            cropHeight = Math.round((float) pOriginalDimension.height * (float) pCrop.height / 100f);
+        }
+        else if (cropWidth >= 0) {
+            // Find ratio from pWidth
+            ratio = (float) cropWidth / 100f;
+            cropWidth = Math.round((float) pOriginalDimension.width * ratio);
+            cropHeight = Math.round((float) pOriginalDimension.height * ratio);
+
+        }
+        else if (cropHeight >= 0) {
+            // Find ratio from pHeight
+            ratio = (float) cropHeight / 100f;
+            cropWidth = Math.round((float) pOriginalDimension.width * ratio);
+            cropHeight = Math.round((float) pOriginalDimension.height * ratio);
+        }
+        // Else: No crop
+
+        return new Dimension(cropWidth, cropHeight);
+    }
+
+}

servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java

@@ -0,0 +1,47 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class UniformAreaOfInterest extends DefaultAreaOfInterest {
+
+    public UniformAreaOfInterest(Dimension pOriginalDimension) {
+        super(pOriginalDimension);
+    }
+
+    public UniformAreaOfInterest(int pOriginalWidth, int pOriginalHeight) {
+        super(pOriginalWidth, pOriginalHeight);
+    }
+
+    public Dimension getCrop(Dimension pOriginalDimension, final Rectangle pCrop) {
+        float ratio;
+        if (pCrop.width >= 0 && pCrop.height >= 0) {
+            // Compute both ratios
+            ratio = (float) pCrop.width / (float) pCrop.height;
+            float originalRatio = (float) pOriginalDimension.width / (float) pOriginalDimension.height;
+            if (ratio > originalRatio) {
+                pCrop.width = pOriginalDimension.width;
+                pCrop.height = Math.round((float) pOriginalDimension.width / ratio);
+            }
+            else {
+                pCrop.height = pOriginalDimension.height;
+                pCrop.width = Math.round((float) pOriginalDimension.height * ratio);
+            }
+        }
+        else if (pCrop.width >= 0) {
+            // Find ratio from pWidth
+            ratio = (float) pCrop.width / (float) pOriginalDimension.width;
+            pCrop.height = Math.round((float) pOriginalDimension.height * ratio);
+        }
+        else if (pCrop.height >= 0) {
+            // Find ratio from pHeight
+            ratio = (float) pCrop.height / (float) pOriginalDimension.height;
+            pCrop.width = Math.round((float) pOriginalDimension.width * ratio);
+        }
+        // Else: No crop
+        return new Dimension(pCrop.width, pCrop.height);
+    }
+}

servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java

@@ -93,4 +93,4 @@ public class ServletParametersMapAdapterTest extends MapAbstractTestCase {
             return Collections.enumeration(collection);
         }
     }
-}
+}

servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java

@@ -22,7 +22,6 @@ import java.awt.image.IndexColorModel;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
 import static org.junit.Assert.*;
@@ -305,28 +304,6 @@ public class ImageServletResponseImplTestCase {
         verify(response).getOutputStream();
     }
 
-    private static void showIt(final BufferedImage expected, final BufferedImage actual, final BufferedImage diff) {
-        try {
-            SwingUtilities.invokeAndWait(new Runnable() {
-                public void run() {
-                    JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
-                    panel.add(new BlackLabel("expected", expected));
-                    panel.add(new BlackLabel("actual", actual));
-                    if (diff != null) {
-                        panel.add(new BlackLabel("diff", diff));
-                    }
-                    JScrollPane scroll = new JScrollPane(panel);
-                    scroll.setBorder(BorderFactory.createEmptyBorder());
-                    JOptionPane.showMessageDialog(null, scroll);
-                }
-            });
-        }
-        catch (InterruptedException ignore) {
-        }
-        catch (InvocationTargetException ignore) {
-        }
-    }
-
     @Test
     public void testTranscodeResponseIndexColorModelGIFToJPEG() throws IOException {
         // Custom setup
@@ -1601,4 +1578,5 @@ public class ImageServletResponseImplTestCase {
             return null;
         }
     }
+
 }

servlet/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java

@@ -0,0 +1,341 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import com.twelvemonkeys.servlet.image.aoi.DefaultAreaOfInterest;
+import com.twelvemonkeys.servlet.image.aoi.UniformAreaOfInterest;
+import org.junit.Test;
+
+import java.awt.*;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class AreaOfInterestTestCase {
+    private static final Dimension SQUARE_200_200 = new Dimension(200, 200);
+    private static final Dimension PORTRAIT_100_200 = new Dimension(100, 200);
+    private static final Dimension LANDSCAPE_200_100 = new Dimension(200, 100);
+    private static final Dimension SQUARE_100_100 = new Dimension(100, 100);
+    // -----------------------------------------------------------------------------------------------------------------
+    // Absolute AOI
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void testGetAOIAbsolute() {
+        assertEquals(new Rectangle(10, 10, 100, 100), new DefaultAreaOfInterest(SQUARE_200_200).getAOI(10, 10, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowX() {
+        assertEquals(new Rectangle(10, 10, 90, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(10, 10, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowW() {
+
+        assertEquals(new Rectangle(0, 10, 100, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(0, 10, 110, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowY() {
+
+        assertEquals(new Rectangle(10, 10, 100, 90), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(10, 10, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowH() {
+
+        assertEquals(new Rectangle(10, 0, 100, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(10, 0, 100, 110));
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Uniform AOI centered
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void testGetAOIUniformCenteredS2SUp() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2SDown() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 33, 33));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2SNormalized() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2W() {
+        assertEquals(new Rectangle(0, 25, 100, 50), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2WNormalized() {
+        assertEquals(new Rectangle(0, 25, 100, 50), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2N() {
+        assertEquals(new Rectangle(25, 0, 50, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2NNormalized() {
+        assertEquals(new Rectangle(25, 0, 50, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2S() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2SNormalized() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2W() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WW() {
+        assertEquals(new Rectangle(0, 25, 200, 50), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 200, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WN() {
+        assertEquals(new Rectangle(25, 0, 150, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 75, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WNNormalized() {
+        assertEquals(new Rectangle(25, 0, 150, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 150, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WNormalized() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2N() {
+        assertEquals(new Rectangle(75, 0, 50, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2NNormalized() {
+        assertEquals(new Rectangle(75, 0, 50, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2S() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2SNormalized() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2W() {
+        assertEquals(new Rectangle(0, 75, 100, 50), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2WNormalized() {
+        assertEquals(new Rectangle(0, 75, 100, 50), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2N() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NN() {
+        assertEquals(new Rectangle(25, 0, 50, 200), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 25, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NW() {
+        assertEquals(new Rectangle(0, 33, 100, 133), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 75, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NWNormalized() {
+        assertEquals(new Rectangle(0, 37, 100, 125), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 125));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NNormalized() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 200));
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Absolute AOI centered
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void testGetAOICenteredS2SUp() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOICenteredS2SDown() {
+        assertEquals(new Rectangle(33, 33, 33, 33), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 33, 33));
+    }
+
+    @Test
+    public void testGetAOICenteredS2SSame() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredS2WOverflow() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredS2W() {
+        assertEquals(new Rectangle(40, 45, 20, 10), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 20, 10));
+    }
+
+    @Test
+    public void testGetAOICenteredS2WMax() {
+        assertEquals(new Rectangle(0, 25, 100, 50), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredS2NOverflow() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredS2N() {
+        assertEquals(new Rectangle(45, 40, 10, 20), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 10, 20));
+    }
+
+    @Test
+    public void testGetAOICenteredS2NMax() {
+        assertEquals(new Rectangle(25, 0, 50, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredW2SOverflow() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOICenteredW2S() {
+        assertEquals(new Rectangle(75, 25, 50, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 50, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2SMax() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WOverflow() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 300, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredW2W() {
+        assertEquals(new Rectangle(50, 25, 100, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WW() {
+        assertEquals(new Rectangle(10, 40, 180, 20), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 180, 20));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WN() {
+        assertEquals(new Rectangle(62, 25, 75, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 75, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WSame() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredW2NOverflow() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredW2N() {
+        assertEquals(new Rectangle(83, 25, 33, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 33, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2NMax() {
+        assertEquals(new Rectangle(75, 0, 50, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2S() {
+        assertEquals(new Rectangle(33, 83, 33, 33), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 33, 33));
+    }
+
+    @Test
+    public void testGetAOICenteredN2SMax() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2WOverflow() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2W() {
+        assertEquals(new Rectangle(40, 95, 20, 10), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 20, 10));
+    }
+
+    @Test
+    public void testGetAOICenteredN2WMax() {
+        assertEquals(new Rectangle(0, 75, 100, 50), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredN2N() {
+        assertEquals(new Rectangle(45, 90, 10, 20), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 10, 20));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NSame() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NN() {
+        assertEquals(new Rectangle(37, 50, 25, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 25, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NW() {
+        assertEquals(new Rectangle(12, 50, 75, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 75, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NWMax() {
+        assertEquals(new Rectangle(0, 37, 100, 125), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 125));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NMax() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 200));
+    }
+
+
+}

twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java

@@ -0,0 +1,341 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import com.twelvemonkeys.servlet.image.aoi.DefaultAreaOfInterest;
+import com.twelvemonkeys.servlet.image.aoi.UniformAreaOfInterest;
+import org.junit.Test;
+
+import java.awt.*;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
+ * @version $Revision: $
+ */
+public class AreaOfInterestTestCase {
+    private static final Dimension SQUARE_200_200 = new Dimension(200, 200);
+    private static final Dimension PORTRAIT_100_200 = new Dimension(100, 200);
+    private static final Dimension LANDSCAPE_200_100 = new Dimension(200, 100);
+    private static final Dimension SQUARE_100_100 = new Dimension(100, 100);
+    // -----------------------------------------------------------------------------------------------------------------
+    // Absolute AOI
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void testGetAOIAbsolute() {
+        assertEquals(new Rectangle(10, 10, 100, 100), new DefaultAreaOfInterest(SQUARE_200_200).getAOI(10, 10, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowX() {
+        assertEquals(new Rectangle(10, 10, 90, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(10, 10, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowW() {
+
+        assertEquals(new Rectangle(0, 10, 100, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(0, 10, 110, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowY() {
+
+        assertEquals(new Rectangle(10, 10, 100, 90), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(10, 10, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIAbsoluteOverflowH() {
+
+        assertEquals(new Rectangle(10, 0, 100, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(10, 0, 100, 110));
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Uniform AOI centered
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void testGetAOIUniformCenteredS2SUp() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2SDown() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 33, 33));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2SNormalized() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2W() {
+        assertEquals(new Rectangle(0, 25, 100, 50), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2WNormalized() {
+        assertEquals(new Rectangle(0, 25, 100, 50), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2N() {
+        assertEquals(new Rectangle(25, 0, 50, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredS2NNormalized() {
+        assertEquals(new Rectangle(25, 0, 50, 100), new UniformAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2S() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2SNormalized() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2W() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WW() {
+        assertEquals(new Rectangle(0, 25, 200, 50), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 200, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WN() {
+        assertEquals(new Rectangle(25, 0, 150, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 75, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WNNormalized() {
+        assertEquals(new Rectangle(25, 0, 150, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 150, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2WNormalized() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2N() {
+        assertEquals(new Rectangle(75, 0, 50, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredW2NNormalized() {
+        assertEquals(new Rectangle(75, 0, 50, 100), new UniformAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2S() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2SNormalized() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2W() {
+        assertEquals(new Rectangle(0, 75, 100, 50), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2WNormalized() {
+        assertEquals(new Rectangle(0, 75, 100, 50), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2N() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NN() {
+        assertEquals(new Rectangle(25, 0, 50, 200), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 25, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NW() {
+        assertEquals(new Rectangle(0, 33, 100, 133), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 75, 100));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NWNormalized() {
+        assertEquals(new Rectangle(0, 37, 100, 125), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 125));
+    }
+
+    @Test
+    public void testGetAOIUniformCenteredN2NNormalized() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new UniformAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 200));
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Absolute AOI centered
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void testGetAOICenteredS2SUp() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOICenteredS2SDown() {
+        assertEquals(new Rectangle(33, 33, 33, 33), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 33, 33));
+    }
+
+    @Test
+    public void testGetAOICenteredS2SSame() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredS2WOverflow() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredS2W() {
+        assertEquals(new Rectangle(40, 45, 20, 10), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 20, 10));
+    }
+
+    @Test
+    public void testGetAOICenteredS2WMax() {
+        assertEquals(new Rectangle(0, 25, 100, 50), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredS2NOverflow() {
+        assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredS2N() {
+        assertEquals(new Rectangle(45, 40, 10, 20), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 10, 20));
+    }
+
+    @Test
+    public void testGetAOICenteredS2NMax() {
+        assertEquals(new Rectangle(25, 0, 50, 100), new DefaultAreaOfInterest(SQUARE_100_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredW2SOverflow() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 333, 333));
+    }
+
+    @Test
+    public void testGetAOICenteredW2S() {
+        assertEquals(new Rectangle(75, 25, 50, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 50, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2SMax() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WOverflow() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 300, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredW2W() {
+        assertEquals(new Rectangle(50, 25, 100, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WW() {
+        assertEquals(new Rectangle(10, 40, 180, 20), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 180, 20));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WN() {
+        assertEquals(new Rectangle(62, 25, 75, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 75, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2WSame() {
+        assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredW2NOverflow() {
+        assertEquals(new Rectangle(50, 0, 100, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredW2N() {
+        assertEquals(new Rectangle(83, 25, 33, 50), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 33, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredW2NMax() {
+        assertEquals(new Rectangle(75, 0, 50, 100), new DefaultAreaOfInterest(LANDSCAPE_200_100).getAOI(-1, -1, 50, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2S() {
+        assertEquals(new Rectangle(33, 83, 33, 33), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 33, 33));
+    }
+
+    @Test
+    public void testGetAOICenteredN2SMax() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2WOverflow() {
+        assertEquals(new Rectangle(0, 50, 100, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 200, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2W() {
+        assertEquals(new Rectangle(40, 95, 20, 10), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 20, 10));
+    }
+
+    @Test
+    public void testGetAOICenteredN2WMax() {
+        assertEquals(new Rectangle(0, 75, 100, 50), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 50));
+    }
+
+    @Test
+    public void testGetAOICenteredN2N() {
+        assertEquals(new Rectangle(45, 90, 10, 20), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 10, 20));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NSame() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 200));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NN() {
+        assertEquals(new Rectangle(37, 50, 25, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 25, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NW() {
+        assertEquals(new Rectangle(12, 50, 75, 100), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 75, 100));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NWMax() {
+        assertEquals(new Rectangle(0, 37, 100, 125), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 125));
+    }
+
+    @Test
+    public void testGetAOICenteredN2NMax() {
+        assertEquals(new Rectangle(0, 0, 100, 200), new DefaultAreaOfInterest(PORTRAIT_100_200).getAOI(-1, -1, 100, 200));
+    }
+
+
+}