summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2003-07-17 20:35:08 +0000
committerKenneth Russel <[email protected]>2003-07-17 20:35:08 +0000
commitcb38b392ed47d3994251858fac6a2e4abe851eda (patch)
tree0a2c8c756ef49f685ee47ea8fd67494902e51fbc
parent9835bfed12eb04fe8a4207bdfa418214598c11ac (diff)
Worked around 4764639/4892246
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@15 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
-rw-r--r--src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java3
-rw-r--r--src/demos/vertexProgRefract/VertexProgRefract.java3
-rw-r--r--www/webstart/jogl-demos.jarbin104920 -> 104891 bytes
3 files changed, 4 insertions, 2 deletions
diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
index e917ca2..74ecbdd 100644
--- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
+++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
@@ -478,7 +478,8 @@ public class HWShadowmapsSimple {
private BufferedImage readPNGImage(String resourceName) {
try {
- BufferedImage img = ImageIO.read(getClass().getClassLoader().getResourceAsStream(resourceName));
+ // Note: use of BufferedInputStream works around 4764639/4892246
+ BufferedImage img = ImageIO.read(new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(resourceName)));
if (img == null) {
throw new RuntimeException("Error reading resource " + resourceName);
}
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index c14f204..0670898 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -468,7 +468,8 @@ public class VertexProgRefract {
private void loadPNGCubemap(GL gl, GLU glu, String baseName, boolean mipmapped) throws IOException {
for (int i = 0; i < suffixes.length; i++) {
String resourceName = baseName + "_" + suffixes[i] + ".png";
- BufferedImage img = ImageIO.read(getClass().getClassLoader().getResourceAsStream(resourceName));
+ // Note: use of BufferedInputStream works around 4764639/4892246
+ BufferedImage img = ImageIO.read(new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(resourceName)));
if (img == null) {
throw new RuntimeException("Error reading PNG image " + resourceName);
}
diff --git a/www/webstart/jogl-demos.jar b/www/webstart/jogl-demos.jar
index 7746a16..1b1803f 100644
--- a/www/webstart/jogl-demos.jar
+++ b/www/webstart/jogl-demos.jar
Binary files differ