Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 464C511A89 for ; Tue, 19 Aug 2014 17:03:25 +0000 (UTC) Received: (qmail 29078 invoked by uid 500); 19 Aug 2014 17:03:25 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 29062 invoked by uid 500); 19 Aug 2014 17:03:25 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 29053 invoked by uid 99); 19 Aug 2014 17:03:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 17:03:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 17:03:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8104F23888D2; Tue, 19 Aug 2014 17:03:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1618898 - in /pdfbox/branches/no-awt: fontbox/src/main/java/org/apache/fontbox/ttf/ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ pdfbox/src/main/java/org/apache/pdfbox/rendering/font/ Date: Tue, 19 Aug 2014 17:03:03 -0000 To: commits@pdfbox.apache.org From: jahewson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140819170303.8104F23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jahewson Date: Tue Aug 19 17:03:02 2014 New Revision: 1618898 URL: http://svn.apache.org/r1618898 Log: PDFBOX-2262: Don't use RAFDataStream Modified: pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java Modified: pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java?rev=1618898&r1=1618897&r2=1618898&view=diff ============================================================================== --- pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java (original) +++ pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java Tue Aug 19 17:03:02 2014 @@ -186,26 +186,18 @@ public class GlyfSimpleDescript extends */ private void readFlags(int flagCount, TTFDataStream bais) throws IOException { - try + for (int index = 0; index < flagCount; index++) { - for (int index = 0; index < flagCount; index++) + flags[index] = (byte) bais.readUnsignedByte(); + if ((flags[index] & REPEAT) != 0) { - flags[index] = (byte) bais.readUnsignedByte(); - if ((flags[index] & REPEAT) != 0) + int repeats = bais.readUnsignedByte(); + for (int i = 1; i <= repeats; i++) { - int repeats = bais.readUnsignedByte(); - for (int i = 1; i <= repeats; i++) - { - flags[index + i] = flags[index]; - } - index += repeats; + flags[index + i] = flags[index]; } + index += repeats; } } - catch (ArrayIndexOutOfBoundsException e) - { - LOG.error("error: array index out of bounds", e); - } } - } Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1618898&r1=1618897&r2=1618898&view=diff ============================================================================== --- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original) +++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Tue Aug 19 17:03:02 2014 @@ -188,7 +188,10 @@ final class FileSystemFontProvider imple TTFParser ttfParser = new TTFParser(false, true); try { - ttf = ttfParser.parseTTF(file); + // fixme: RAFDataStream appears to be broken + //ttf = ttfParser.parseTTF(file); + ttf = ttfParser.parseTTF(new FileInputStream(file)); + ttfFonts.put(postScriptName, ttf); if (LOG.isDebugEnabled()) { Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java?rev=1618898&r1=1618897&r2=1618898&view=diff ============================================================================== --- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java (original) +++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java Tue Aug 19 17:03:02 2014 @@ -203,8 +203,9 @@ public class TTFGlyph2D implements Glyph } catch (RuntimeException e) { - throw new RuntimeException("Error in TTF:" + pdFont.getBaseFont() + " -> " + - ttf.getNaming().getPostScriptName(), e); + LOG.error("Error in TTF: " + pdFont.getBaseFont() + " -> " + + ttf.getNaming().getPostScriptName()); + throw e; } if (glyphId >= glyphData.length)