You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2014/06/06 12:41:36 UTC
svn commit: r1600844 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
Author: nick
Date: Fri Jun 6 10:41:36 2014
New Revision: 1600844
URL: http://svn.apache.org/r1600844
Log:
Remove the temporary PDFBox workaround for TIKA-1182, now that we have upgraded to a version with the fix
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java?rev=1600844&r1=1600843&r2=1600844&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java Fri Jun 6 10:41:36 2014
@@ -16,8 +16,6 @@
*/
package org.apache.tika.parser.font;
-import java.awt.Font;
-import java.awt.FontFormatException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
@@ -60,23 +58,6 @@ public class TrueTypeParser extends Abst
throws IOException, SAXException, TikaException {
TikaInputStream tis = TikaInputStream.cast(stream);
- // Until PDFBOX-1749 is fixed, if we can, use AWT to verify
- // that the file is valid (otherwise FontBox could hang)
- // See TIKA-1182 for details
- if (tis != null) {
- try {
- if (tis.hasFile()) {
- Font.createFont(Font.TRUETYPE_FONT, tis.getFile());
- } else {
- tis.mark(0);
- Font.createFont(Font.TRUETYPE_FONT, stream);
- tis.reset();
- }
- } catch (FontFormatException ex) {
- throw new TikaException("Bad TrueType font.");
- }
- }
-
// Ask FontBox to parse the file for us
TrueTypeFont font;
TTFParser parser = new TTFParser();
@@ -92,7 +73,8 @@ public class TrueTypeParser extends Abst
metadata.set(
TikaCoreProperties.MODIFIED,
font.getHeader().getModified().getTime());
-
+
+ // For now, we only output metadata, no textual contents
XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
xhtml.startDocument();
xhtml.endDocument();