From 8cece6137b2af5df49afa37338f105b0bd4df9c8 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 28 Nov 2012 16:29:44 -0800 Subject: [PATCH] (From aduros) AbstractRectangle.contains should contain bounds. Points on the top and left edges are considered contained, so should points on right and bottom. This also makes contains() consistent with outcode(). --- src/main/java/pythagoras/d/AbstractRectangle.java | 2 +- src/main/java/pythagoras/f/AbstractRectangle.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/pythagoras/d/AbstractRectangle.java b/src/main/java/pythagoras/d/AbstractRectangle.java index 1467650..2b775f7 100644 --- a/src/main/java/pythagoras/d/AbstractRectangle.java +++ b/src/main/java/pythagoras/d/AbstractRectangle.java @@ -108,7 +108,7 @@ public abstract class AbstractRectangle extends RectangularShape implements IRec px -= x; py -= y; - return px < width() && py < height(); + return px <= width() && py <= height(); } @Override // from interface IShape diff --git a/src/main/java/pythagoras/f/AbstractRectangle.java b/src/main/java/pythagoras/f/AbstractRectangle.java index c62c440..c22ff48 100644 --- a/src/main/java/pythagoras/f/AbstractRectangle.java +++ b/src/main/java/pythagoras/f/AbstractRectangle.java @@ -108,7 +108,7 @@ public abstract class AbstractRectangle extends RectangularShape implements IRec px -= x; py -= y; - return px < width() && py < height(); + return px <= width() && py <= height(); } @Override // from interface IShape