Merge remote-tracking branch 'hharrison/master'

2 files changed, 7 insertions, 2 deletions

diff --git a/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java b/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java
index 8082fe4e1..bf5f5e9b6 100644
--- a/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java
+++ b/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java
@@ -397,7 +397,12 @@ public final class Path2D implements Cloneable {
     }
 
     public boolean contains(AABBox r) {
-        return contains(r);
+        float lx = r.getMinX();
+        float ly = r.getMinY();
+        float w = r.getWidth();
+        float h = r.getHeight();
+        int cross = Crossing.intersectShape(this, lx, ly, w, h);
+        return cross != Crossing.CROSSING && isInside(cross);
     }
 
     public boolean intersects(AABBox r) {
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTIME.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTIME.java
index 37e617acb..fa61f6237 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTIME.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTIME.java
@@ -75,7 +75,7 @@ public class PngChunkTIME extends PngChunk {
 

 	/** format YYYY/MM/DD HH:mm:SS */

 	public String getAsString() {

-		return String.format("%04/%02d/%02d %02d:%02d:%02d", year, mon, day, hour, min, sec);

+		return String.format("%04d/%02d/%02d %02d:%02d:%02d", year, mon, day, hour, min, sec);

 	}