You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/08/07 17:51:20 UTC
svn commit: r1864651 - in
/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf:
CmapSubtable.java GlyfCompositeComp.java GlyfDescript.java
GlyfSimpleDescript.java GlyphData.java KerningSubtable.java
Author: tilman
Date: Wed Aug 7 17:51:20 2019
New Revision: 1864651
URL: http://svn.apache.org/viewvc?rev=1864651&view=rev
Log:
PDFBOX-4625: remove public when parameter class is package-private
Modified:
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeComp.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/KerningSubtable.java
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java?rev=1864651&r1=1864650&r2=1864651&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java Wed Aug 7 17:51:20 2019
@@ -53,7 +53,7 @@ public class CmapSubtable implements Cma
* @param data The stream to read the data from.
* @throws IOException If there is an error reading the data.
*/
- public void initData(TTFDataStream data) throws IOException
+ void initData(TTFDataStream data) throws IOException
{
platformId = data.readUnsignedShort();
platformEncodingId = data.readUnsignedShort();
@@ -68,7 +68,7 @@ public class CmapSubtable implements Cma
* @param data The stream to read the data from.
* @throws IOException If there is an error reading the data.
*/
- public void initSubtable(CmapTable cmap, int numGlyphs, TTFDataStream data) throws IOException
+ void initSubtable(CmapTable cmap, int numGlyphs, TTFDataStream data) throws IOException
{
data.seek(cmap.getOffset() + subTableOffset);
int subtableFormat = data.readUnsignedShort();
@@ -128,7 +128,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype8(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype8(TTFDataStream data, int numGlyphs) throws IOException
{
// --- is32 is a 65536 BITS array ( = 8192 BYTES)
int[] is32 = data.readUnsignedByteArray(8192);
@@ -202,7 +202,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype10(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype10(TTFDataStream data, int numGlyphs) throws IOException
{
long startCode = data.readUnsignedInt();
long numChars = data.readUnsignedInt();
@@ -226,7 +226,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype12(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype12(TTFDataStream data, int numGlyphs) throws IOException
{
long nbGroups = data.readUnsignedInt();
glyphIdToCharacterCode = newGlyphIdToCharacterCode(numGlyphs);
@@ -277,7 +277,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype13(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype13(TTFDataStream data, int numGlyphs) throws IOException
{
long nbGroups = data.readUnsignedInt();
glyphIdToCharacterCode = newGlyphIdToCharacterCode(numGlyphs);
@@ -330,7 +330,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype14(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype14(TTFDataStream data, int numGlyphs) throws IOException
{
// Unicode Variation Sequences (UVS)
// see http://blogs.adobe.com/CCJKType/2013/05/opentype-cmap-table-ramblings.html
@@ -344,7 +344,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype6(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype6(TTFDataStream data, int numGlyphs) throws IOException
{
int firstCode = data.readUnsignedShort();
int entryCount = data.readUnsignedShort();
@@ -371,7 +371,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype4(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype4(TTFDataStream data, int numGlyphs) throws IOException
{
int segCountX2 = data.readUnsignedShort();
int segCount = segCountX2 / 2;
@@ -467,7 +467,7 @@ public class CmapSubtable implements Cma
* @param numGlyphs number of glyphs to be read
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype2(TTFDataStream data, int numGlyphs) throws IOException
+ void processSubtype2(TTFDataStream data, int numGlyphs) throws IOException
{
int[] subHeaderKeys = new int[256];
// ---- keep the Max Index of the SubHeader array to know its length
@@ -538,7 +538,7 @@ public class CmapSubtable implements Cma
* @param data the data stream of the to be parsed ttf font
* @throws IOException If there is an error parsing the true type font.
*/
- protected void processSubtype0(TTFDataStream data) throws IOException
+ void processSubtype0(TTFDataStream data) throws IOException
{
byte[] glyphMapping = data.read(256);
glyphIdToCharacterCode = newGlyphIdToCharacterCode(256);
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeComp.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeComp.java?rev=1864651&r1=1864650&r2=1864651&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeComp.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeComp.java Wed Aug 7 17:51:20 2019
@@ -87,7 +87,7 @@ public class GlyfCompositeComp
* @param bais the stream to be read
* @throws IOException is thrown if something went wrong
*/
- protected GlyfCompositeComp(TTFDataStream bais) throws IOException
+ GlyfCompositeComp(TTFDataStream bais) throws IOException
{
flags = bais.readSignedShort();
glyphIndex = bais.readUnsignedShort();// number of glyph in a font is uint16
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java?rev=1864651&r1=1864650&r2=1864651&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfDescript.java Wed Aug 7 17:51:20 2019
@@ -75,7 +75,7 @@ public abstract class GlyfDescript imple
* @param bais the stream to be read
* @throws IOException is thrown if something went wrong
*/
- protected GlyfDescript(short numberOfContours, TTFDataStream bais) throws IOException
+ GlyfDescript(short numberOfContours, TTFDataStream bais) throws IOException
{
contourCount = numberOfContours;
}
@@ -112,7 +112,7 @@ public abstract class GlyfDescript imple
* @param count the number of instructions to be read
* @throws IOException is thrown if something went wrong
*/
- protected void readInstructions(TTFDataStream bais, int count) throws IOException
+ void readInstructions(TTFDataStream bais, int count) throws IOException
{
instructions = bais.readUnsignedByteArray(count);
}
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java?rev=1864651&r1=1864650&r2=1864651&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfSimpleDescript.java Wed Aug 7 17:51:20 2019
@@ -48,7 +48,7 @@ public class GlyfSimpleDescript extends
* @param x0 the initial X-position
* @throws IOException is thrown if something went wrong
*/
- public GlyfSimpleDescript(short numberOfContours, TTFDataStream bais, short x0) throws IOException
+ GlyfSimpleDescript(short numberOfContours, TTFDataStream bais, short x0) throws IOException
{
super(numberOfContours, bais);
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java?rev=1864651&r1=1864650&r2=1864651&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java Wed Aug 7 17:51:20 2019
@@ -44,7 +44,7 @@ public class GlyphData
* @param leftSideBearing The left side bearing for this glyph.
* @throws IOException If there is an error reading the data.
*/
- public void initData( GlyphTable glyphTable, TTFDataStream data, int leftSideBearing ) throws IOException
+ void initData( GlyphTable glyphTable, TTFDataStream data, int leftSideBearing ) throws IOException
{
numberOfContours = data.readSignedShort();
xMin = data.readSignedShort();
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/KerningSubtable.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/KerningSubtable.java?rev=1864651&r1=1864650&r2=1864651&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/KerningSubtable.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/KerningSubtable.java Wed Aug 7 17:51:20 2019
@@ -63,7 +63,7 @@ public class KerningSubtable
* @param version The version of the table to be read
* @throws IOException If there is an error reading the data.
*/
- public void read(TTFDataStream data, int version) throws IOException
+ void read(TTFDataStream data, int version) throws IOException
{
if (version == 0)
{