summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-09-24 06:08:12 +0200
committerSven Gothel <[email protected]>2014-09-24 06:08:12 +0200
commitf197d38d0ea31416645ac69cebb3f9b3544d903f (patch)
treef81fc1a48af5515164ad2c64ad0fa80bd2ad8521 /src/jogl/classes/com
parentca357af70d46a6c12ff8810565874ecabb564d87 (diff)
parent628509b39ea7c16210315d191860511d6be4aa69 (diff)
Merge remote-tracking branch 'picoworm/master'
Diffstat (limited to 'src/jogl/classes/com')
-rw-r--r--src/jogl/classes/com/jogamp/graph/font/FontFactory.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
index db775e8dc..cfd06cf6c 100644
--- a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
+++ b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
@@ -29,6 +29,7 @@ package com.jogamp.graph.font;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URI;
import java.net.URLConnection;
@@ -91,6 +92,10 @@ public class FontFactory {
return fontConstr.create(file);
}
+ public static final Font get(final InputStream stream) throws IOException {
+ return fontConstr.create(stream);
+ }
+
public static final Font get(final URLConnection conn) throws IOException {
return fontConstr.create(conn);
}