Author: tilman
Date: Fri Mar 19 19:42:29 2021
New Revision: 1887824
URL: http://svn.apache.org/viewvc?rev=1887824&view=rev
Log:
PDFBOX-5135: remove method that isn't used (and doesn't contain the bugfix);
simplify API
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java?rev=1887824&r1=1887823&r2=1887824&view=diff
==============================================================================
---
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
(original)
+++
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
Fri Mar 19 19:42:29 2021
@@ -59,7 +59,7 @@ public class GlyfCompositeDescript exten
*/
GlyfCompositeDescript(TTFDataStream bais, GlyphTable glyphTable) throws
IOException
{
- super((short) -1, bais);
+ super((short) -1);
this.glyphTable = glyphTable;
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java?rev=1887824&r1=1887823&r2=1887824&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java
(original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java
Fri Mar 19 19:42:29 2021
@@ -72,10 +72,8 @@ public abstract class GlyfDescript imple
* Constructor.
*
* @param numberOfContours the number of contours
- * @param bais the stream to be read
- * @throws IOException is thrown if something went wrong
*/
- GlyfDescript(short numberOfContours, TTFDataStream bais) throws
IOException
+ GlyfDescript(short numberOfContours)
{
contourCount = numberOfContours;
}
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java?rev=1887824&r1=1887823&r2=1887824&view=diff
==============================================================================
---
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java
(original)
+++
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java
Fri Mar 19 19:42:29 2021
@@ -45,9 +45,9 @@ public class GlyfSimpleDescript extends
*
* @throws IOException is thrown if something went wrong
*/
- GlyfSimpleDescript() throws IOException
+ GlyfSimpleDescript()
{
- super((short) 0, null);
+ super((short) 0);
pointCount = 0;
}
@@ -61,7 +61,7 @@ public class GlyfSimpleDescript extends
*/
GlyfSimpleDescript(short numberOfContours, TTFDataStream bais, short x0)
throws IOException
{
- super(numberOfContours, bais);
+ super(numberOfContours);
/*
* https://developer.apple.com/fonts/TTRefMan/RM06/Chap6glyf.html
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java?rev=1887824&r1=1887823&r2=1887824&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
(original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
Fri Mar 19 19:42:29 2021
@@ -68,10 +68,8 @@ public class GlyphData
/**
* Initialize an empty glyph record.
- *
- * @throws IOException
*/
- void initEmptyData() throws IOException
+ void initEmptyData()
{
glyphDescription = new GlyfSimpleDescript();
boundingBox = new BoundingBox();
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java?rev=1887824&r1=1887823&r2=1887824&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java
(original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java
Fri Mar 19 19:42:29 2021
@@ -79,66 +79,6 @@ public class GlyphTable extends TTFTable
}
/**
- * Returns all glyphs. This method can be very slow.
- *
- * @throws IOException If there is an error reading the data.
- * @deprecated use {@link #getGlyph(int)} instead. This will be removed in
3.0. If you need this
- * method, please create an issue in JIRA.
- */
- @Deprecated
- public GlyphData[] getGlyphs() throws IOException
- {
- // PDFBOX-4219: synchronize on data because it is accessed by several
threads
- // when PDFBox is accessing a standard 14 font for the first time
- synchronized (data)
- {
- // the glyph offsets
- long[] offsets = loca.getOffsets();
-
- // the end of the glyph table
- // should not be 0, but sometimes is, see PDFBOX-2044
- // structure of this table: see
- // https://developer.apple.com/fonts/TTRefMan/RM06/Chap6loca.html
- long endOfGlyphs = offsets[numGlyphs];
- long offset = getOffset();
- if (glyphs == null)
- {
- glyphs = new GlyphData[numGlyphs];
- }
-
- for (int gid = 0; gid < numGlyphs; gid++)
- {
- // end of glyphs reached?
- if (endOfGlyphs != 0 && endOfGlyphs == offsets[gid])
- {
- break;
- }
- // the current glyph isn't defined
- // if the next offset is equal or smaller to the current offset
- if (offsets[gid + 1] <= offsets[gid])
- {
- continue;
- }
- if (glyphs[gid] != null)
- {
- // already cached
- continue;
- }
-
- data.seek(offset + offsets[gid]);
-
- if (glyphs[gid] == null)
- {
- ++cached;
- }
- glyphs[gid] = getGlyphData(gid);
- }
- initialized = true;
- return glyphs;
- }
- }
-
- /**
* @param glyphsValue The glyphs to set.
*/
public void setGlyphs(GlyphData[] glyphsValue)
