< prev index next >

modules/graphics/src/main/java/com/sun/javafx/font/PrismFontLoader.java

Print this page

        

*** 77,107 **** String n = (String)names.nextElement(); String p = map.getProperty(n); if (p.startsWith("/")) { p = p.substring(1); try (InputStream in = loader.getResourceAsStream(p)) { ! fontFactory.loadEmbeddedFont(n, in, 0, true); } catch (Exception e) { } } } embeddedFontsLoaded = true; } } ! @Override public Font loadFont(InputStream in, double size) { ! FontFactory factory = getFontFactoryFromPipeline(); ! PGFont font = factory.loadEmbeddedFont(null, in, (float)size, true); ! if (font != null) return createFont(font); return null; } - @Override public Font loadFont(String path, double size) { FontFactory factory = getFontFactoryFromPipeline(); ! PGFont font = factory.loadEmbeddedFont(null, path, (float)size, true); ! if (font != null) return createFont(font); ! return null; } @SuppressWarnings("deprecation") private Font createFont(PGFont font) { return FontHelper.nativeFont(font, --- 77,124 ---- String n = (String)names.nextElement(); String p = map.getProperty(n); if (p.startsWith("/")) { p = p.substring(1); try (InputStream in = loader.getResourceAsStream(p)) { ! fontFactory.loadEmbeddedFont(n, in, 0, true, false); } catch (Exception e) { } } } embeddedFontsLoaded = true; } } ! private Font[] createFonts(PGFont[] fonts) { ! if (fonts == null || fonts.length == 0) { return null; } + Font[] fxFonts = new Font[fonts.length]; + for (int i=0; i<fonts.length; i++) { + fxFonts[i] = createFont(fonts[i]); + } + return fxFonts; + } + + @Override public Font[] loadFont(InputStream in, + double size, + boolean loadAll) { FontFactory factory = getFontFactoryFromPipeline(); ! PGFont[] fonts = ! factory.loadEmbeddedFont(null, in, (float)size, true, loadAll); ! return createFonts(fonts); ! } ! ! @Override public Font[] loadFont(String path, ! double size, ! boolean loadAll) { ! ! FontFactory factory = getFontFactoryFromPipeline(); ! PGFont[] fonts = ! factory.loadEmbeddedFont(null, path, (float)size, true, loadAll); ! return createFonts(fonts); } @SuppressWarnings("deprecation") private Font createFont(PGFont font) { return FontHelper.nativeFont(font,
< prev index next >