eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-26 08:44:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

openstream fixes, changes to compiling of pde files

Browse Source
This commit is contained in:
benfry
2004-07-17 01:14:24 +00:00
parent 96f1fb4798
commit 45ac7279de
6 changed files with 182 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
processing/core/PApplet.java
View File

@@ -1666,23 +1666,23 @@ public class PApplet extends Applet
public PFont loadFont(String filename) {
try {
String lower = filename.toLowerCase();
InputStream input = null;
InputStream input = openStream(filename);
if (lower.endsWith(".vlw")) {
input = openStream(filename);
if (lower.endsWith(".vlw.gz")) {
input = new GZIPInputStream(input);
} else if (lower.endsWith(".vlw.gz")) {
input = new GZIPInputStream(openStream(filename));
} else {
throw new IOException("don't know what type of file that is");
} else if (!lower.endsWith(".vlw")) {
throw new IOException("I don't know how to load a font named " +
filename);
}
return new PFont(input);
} catch (IOException e) {
//} catch (IOException e) {
} catch (Exception e) {
System.err.println("Could not load font " + filename);
System.err.println("Make sure that the font has been copied");
System.err.println("to the data folder of your sketch.");
System.err.println();
e.printStackTrace();
}
return null;
@@ -1716,6 +1716,14 @@ public class PApplet extends Applet
if (stream != null) return stream;
try {
try {
String location = folder + File.separator + "data";
File file = new File(location, filename);
stream = new FileInputStream(file);
if (stream != null) return stream;
} catch (Exception e) { } // ignored
try {
stream = new FileInputStream(new File("data", filename));
if (stream != null) return stream;