diff options
| author | Sven Gothel <[email protected]> | 2012-10-16 07:50:45 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-16 07:50:45 +0200 |
| commit | 9ad5f1ea9f4ee9908fe5c5c422b287397b63e551 (patch) | |
| tree | 38becf6642a670e1f08ffd206c26201761333a7b /src | |
| parent | 658d269db957cdb986f2da2fbe15d2441b6f03c4 (diff) | |
| parent | f15b5df4114e46b4c6a968b75aebb6014afc1806 (diff) | |
Merge remote-tracking branch 'hharrison/master'
Diffstat (limited to 'src')
3 files changed, 8 insertions, 3 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java index 37dbc54df..b7262aa3e 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java @@ -180,7 +180,7 @@ public class LEDataInputStream extends FilterInputStream implements DataInput { int i1 = readInt(); int i2 = readInt(); - return ((long)(i1) & 0xFFFFFFFFL) + (i2 << 32); + return ((long)i1 & 0xFFFFFFFFL) + ((long)i2 << 32); } public final float readFloat() throws IOException 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);
}
|