eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

removing .gz unpacking from openstream, moving to loadFont

Browse Source
This commit is contained in:
benfry
2004-07-12 20:04:50 +00:00
parent f3fb562795
commit 06fb6902e4
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/PFont.java
View File

@@ -27,6 +27,7 @@ package processing.core;
import java.io.*;
import java.util.*;
import java.util.zip.*;
// value[] could be used to build a char to byte mapping table
@@ -127,14 +128,12 @@ public class PFont implements PConstants {
//this.parent = parent;
//this.valid = false;
//try {
String lower = filename.toLowerCase();
if (lower.endsWith(".vlw") || lower.endsWith(".vlw.gz")) {
//load_vlw_font(filename);
if (lower.endsWith(".vlw")) {
read(parent.openStream(filename));
//} else if (lower.endsWith(".fbf")) {
//load_fbf_font(filename);
} else if (lower.endsWith(".vlw.gz")) {
read(new GZIPInputStream(parent.openStream(filename)));
} else {
throw new IOException("don't know what type of file that is");

20
core/PGraphics.java
View File

@@ -31,7 +31,6 @@ import java.awt.event.*;
import java.awt.image.*;
import java.io.*;
import java.net.*;
import java.util.zip.*;
public class PGraphics extends PImage implements PConstants {
@@ -5480,13 +5479,12 @@ public class PGraphics extends PImage implements PConstants {
public InputStream openStream(String filename) throws IOException {
InputStream stream = null;
boolean gz = filename.toLowerCase().endsWith(".gz");
if (filename.startsWith("http://")) {
try {
URL url = new URL(filename);
stream = url.openStream();
return gz ? new GZIPInputStream(stream) : stream;
return stream;
} catch (MalformedURLException e) {
e.printStackTrace();
@@ -5494,25 +5492,21 @@ public class PGraphics extends PImage implements PConstants {
}
}
try {
stream = getClass().getResourceAsStream(filename);
if (stream != null) return gz ? new GZIPInputStream(stream) : stream;
} catch (IOException e) { }
stream = getClass().getResourceAsStream(filename);
if (stream != null) return stream;
try {
stream = getClass().getResourceAsStream("data/" + filename);
if (stream != null) return gz ? new GZIPInputStream(stream) : stream;
} catch (IOException e) { }
stream = getClass().getResourceAsStream("data/" + filename);
if (stream != null) return stream;
try {
try {
stream = new FileInputStream(new File("data", filename));
if (stream != null) return gz ? new GZIPInputStream(stream) : stream;
if (stream != null) return stream;
} catch (IOException e2) { }
try {
stream = new FileInputStream(filename);
if (stream != null) return gz ? new GZIPInputStream(stream) : stream;
if (stream != null) return stream;
} catch (IOException e1) { }
} catch (SecurityException se) { } // online, whups