You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2022/05/22 13:07:10 UTC
svn commit: r1901122 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf: RandomAccessReadDataStream.java TTFDataStream.java
Author: lehmi
Date: Sun May 22 13:07:10 2022
New Revision: 1901122
URL: http://svn.apache.org/viewvc?rev=1901122&view=rev
Log:
PDFBOX-5435: remove unused methode, move some code to abstract class
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/RandomAccessReadDataStream.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/RandomAccessReadDataStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/RandomAccessReadDataStream.java?rev=1901122&r1=1901121&r2=1901122&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/RandomAccessReadDataStream.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/RandomAccessReadDataStream.java Sun May 22 13:07:10 2022
@@ -54,18 +54,6 @@ class RandomAccessReadDataStream extends
}
/**
- * Read a signed short.
- *
- * @return An signed short.
- * @throws IOException If there is an error reading the data.
- */
- @Override
- public short readSignedShort() throws IOException
- {
- return (short) readUnsignedShort();
- }
-
- /**
* Get the current position in the stream.
* @return The current position in the stream.
* @throws IOException If an error occurs while reading the stream.
@@ -99,19 +87,6 @@ class RandomAccessReadDataStream extends
}
/**
- * Read an unsigned short.
- *
- * @return An unsigned short.
- * @throws IOException If there is an error reading the data.
- */
- public int readUnsignedShort() throws IOException
- {
- int b1 = read();
- int b2 = read();
- return (b1 << 8) + b2;
- }
-
- /**
* Read a signed 64-bit integer.
*
* @return eight bytes interpreted as a long.
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java?rev=1901122&r1=1901121&r2=1901122&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Sun May 22 13:07:10 2022
@@ -26,7 +26,7 @@ import java.util.Calendar;
import java.util.TimeZone;
/**
- * An interface into a data stream.
+ * An abstract class to read a data stream.
*
* @author Ben Litchfield
*/
@@ -69,25 +69,11 @@ abstract class TTFDataStream implements
* @return A string of the desired length.
* @throws IOException If there is an error reading the data.
*/
- public String readString(int length, String charset) throws IOException
- {
- byte[] buffer = read(length);
- return new String(buffer, charset);
- }
-
- /**
- * Read a fixed length string.
- *
- * @param length The length of the string to read in bytes.
- * @param charset The expected character set of the string.
- * @return A string of the desired length.
- * @throws IOException If there is an error reading the data.
- */
public String readString(int length, Charset charset) throws IOException
{
- byte[] buffer = read(length);
- return new String(buffer, charset);
+ return new String(read(length), charset);
}
+
/**
* Read an unsigned byte.
*
@@ -157,7 +143,12 @@ abstract class TTFDataStream implements
* @return An unsigned short.
* @throws IOException If there is an error reading the data.
*/
- public abstract int readUnsignedShort() throws IOException;
+ public int readUnsignedShort() throws IOException
+ {
+ int b1 = read();
+ int b2 = read();
+ return (b1 << 8) + b2;
+ }
/**
* Read an unsigned byte array.
@@ -199,7 +190,10 @@ abstract class TTFDataStream implements
* @return An signed short.
* @throws IOException If there is an error reading the data.
*/
- public abstract short readSignedShort() throws IOException;
+ public short readSignedShort() throws IOException
+ {
+ return (short) readUnsignedShort();
+ }
/**
* Read an eight byte international date.