-
Notifications
You must be signed in to change notification settings - Fork 867
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PDFBOX-5847: Improve performance of FileSystemFontProvider.scanFonts(…
…) by introducing an "only headers" mode for the font parsers where each table reads as little information as possible, by Mykola Bohdiuk git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1918773 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
Showing
14 changed files
with
938 additions
and
214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
197 changes: 110 additions & 87 deletions
197
fontbox/src/main/java/org/apache/fontbox/ttf/CFFTable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,110 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.fontbox.ttf; | ||
|
|
||
| import java.io.IOException; | ||
| import org.apache.fontbox.cff.CFFFont; | ||
| import org.apache.fontbox.cff.CFFParser; | ||
|
|
||
| /** | ||
| * PostScript font program (compact font format). | ||
| */ | ||
| public class CFFTable extends TTFTable | ||
| { | ||
| /** | ||
| * A tag that identifies this table type. | ||
| */ | ||
| public static final String TAG = "CFF "; | ||
|
|
||
| private CFFFont cffFont; | ||
|
|
||
| CFFTable() | ||
| { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * This will read the required data from the stream. | ||
| * | ||
| * @param ttf The font that is being read. | ||
| * @param data The stream to read the data from. | ||
| * @throws java.io.IOException If there is an error reading the data. | ||
| */ | ||
| @Override | ||
| void read(TrueTypeFont ttf, TTFDataStream data) throws IOException | ||
| { | ||
| byte[] bytes = data.read((int)getLength()); | ||
|
|
||
| CFFParser parser = new CFFParser(); | ||
| cffFont = parser.parse(bytes, new CFFBytesource(ttf)).get(0); | ||
|
|
||
| initialized = true; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the CFF font, which is a compact representation of a PostScript Type 1, or CIDFont | ||
| * | ||
| * @return the associated CFF font | ||
| */ | ||
| public CFFFont getFont() | ||
| { | ||
| return cffFont; | ||
| } | ||
|
|
||
| /** | ||
| * Allows bytes to be re-read later by CFFParser. | ||
| */ | ||
| private static class CFFBytesource implements CFFParser.ByteSource | ||
| { | ||
| private final TrueTypeFont ttf; | ||
|
|
||
| CFFBytesource(TrueTypeFont ttf) | ||
| { | ||
| this.ttf = ttf; | ||
| } | ||
|
|
||
| @Override | ||
| public byte[] getBytes() throws IOException | ||
| { | ||
| return ttf.getTableBytes(ttf.getTableMap().get(CFFTable.TAG)); | ||
| } | ||
| } | ||
| } | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.fontbox.ttf; | ||
|
|
||
| import java.io.IOException; | ||
| import org.apache.fontbox.cff.CFFFont; | ||
| import org.apache.fontbox.cff.CFFParser; | ||
| import org.apache.pdfbox.io.RandomAccessRead; | ||
| import org.apache.pdfbox.io.RandomAccessReadBuffer; | ||
|
|
||
| /** | ||
| * PostScript font program (compact font format). | ||
| */ | ||
| public class CFFTable extends TTFTable | ||
| { | ||
| /** | ||
| * A tag that identifies this table type. | ||
| */ | ||
| public static final String TAG = "CFF "; | ||
|
|
||
| private CFFFont cffFont; | ||
|
|
||
| CFFTable() | ||
| { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * This will read the required data from the stream. | ||
| * | ||
| * @param ttf The font that is being read. | ||
| * @param data The stream to read the data from. | ||
| * @throws java.io.IOException If there is an error reading the data. | ||
| */ | ||
| @Override | ||
| void read(TrueTypeFont ttf, TTFDataStream data) throws IOException | ||
| { | ||
| byte[] bytes = data.read((int)getLength()); | ||
|
|
||
| CFFParser parser = new CFFParser(); | ||
| cffFont = parser.parse(bytes, new CFFBytesource(ttf)).get(0); | ||
|
|
||
| initialized = true; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| void readHeaders(TrueTypeFont ttf, TTFDataStream data, FontHeaders outHeaders) throws IOException | ||
| { | ||
| try (RandomAccessRead subReader = data.createSubView(getLength())) | ||
| { | ||
| RandomAccessRead reader; | ||
| if (subReader != null) | ||
| { | ||
| reader = subReader; | ||
| } | ||
| else | ||
| { | ||
| assert false : "It is inefficient to read TTFDataStream into an array"; | ||
| byte[] bytes = data.read((int)getLength()); | ||
| reader = new RandomAccessReadBuffer(bytes); | ||
| } | ||
| new CFFParser().parseFirstSubFontROS(reader, outHeaders); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the CFF font, which is a compact representation of a PostScript Type 1, or CIDFont | ||
| * | ||
| * @return the associated CFF font | ||
| */ | ||
| public CFFFont getFont() | ||
| { | ||
| return cffFont; | ||
| } | ||
|
|
||
| /** | ||
| * Allows bytes to be re-read later by CFFParser. | ||
| */ | ||
| private static class CFFBytesource implements CFFParser.ByteSource | ||
| { | ||
| private final TrueTypeFont ttf; | ||
|
|
||
| CFFBytesource(TrueTypeFont ttf) | ||
| { | ||
| this.ttf = ttf; | ||
| } | ||
|
|
||
| @Override | ||
| public byte[] getBytes() throws IOException | ||
| { | ||
| return ttf.getTableBytes(ttf.getTableMap().get(CFFTable.TAG)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.