Updates to Apr. 16th (abd064d)

Author: TomRoush

.gitignore

@@ -15,6 +15,9 @@ lib/
 res/
 tmp/
 
+# Test output directory
+target/
+
 # Local configuration file (sdk path, etc)
 local.properties
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 

gradle.properties

@@ -19,4 +19,4 @@ VERSION_CODE=1
 ANDROID_BUILD_MIN_SDK_VERSION=9
 ANDROID_BUILD_TARGET_SDK_VERSION=21
 ANDROID_BUILD_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=24.0.3
+ANDROID_BUILD_TOOLS_VERSION=25.0.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 21 00:40:32 CDT 2016
+#Fri Mar 03 19:16:32 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

library/src/main/java/com/tom_roush/fontbox/afm/AFMParser.java

@@ -16,14 +16,14 @@
  */
 package com.tom_roush.fontbox.afm;
 
+import com.tom_roush.fontbox.util.BoundingBox;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.StringTokenizer;
 
-import com.tom_roush.fontbox.util.BoundingBox;
-
 /**
  * This class is used to parse AFM(Adobe Font Metrics) documents.
  *
@@ -674,7 +674,7 @@ else if( KERN_PAIR_KPY.equals( cmd ) )
      *
      * @throws IOException If the string is in an invalid format.
      */
-    private static String hexToString( String hexString ) throws IOException
+    private String hexToString( String hexString ) throws IOException
     {
         if( hexString.length() < 2 )
         {
@@ -917,7 +917,7 @@ else if( nextCommand.equals( CHARMETRICS_L ) )
      *
      * @throws IOException If the semicolon is missing.
      */
-    private static void verifySemicolon( StringTokenizer tokenizer ) throws IOException
+    private void verifySemicolon( StringTokenizer tokenizer ) throws IOException
     {
         if( tokenizer.hasMoreTokens() )
         {
@@ -1033,7 +1033,7 @@ private String readString() throws IOException
      *
      * @return true If the character is whitespace as defined by the AFM spec.
      */
-    private static boolean isEOL( int character )
+    private boolean isEOL( int character )
     {
         return character == 0x0D ||
                character == 0x0A;
@@ -1046,7 +1046,7 @@ private static boolean isEOL( int character )
      *
      * @return true If the character is whitespace as defined by the AFM spec.
      */
-    private static boolean isWhitespace( int character )
+    private boolean isWhitespace( int character )
     {
         return character == ' ' ||
                character == '\t' ||

library/src/main/java/com/tom_roush/fontbox/cff/Type2CharStringParser.java

@@ -207,7 +207,7 @@ else if (b0 == 19 || b0 == 20)
         return new CharStringCommand(b0);
     }
 
-    private static Integer readNumber(int b0, DataInput input) throws IOException
+    private Integer readNumber(int b0, DataInput input) throws IOException
     {
 
         if (b0 == 28)

library/src/main/java/com/tom_roush/fontbox/cmap/CMap.java

@@ -169,7 +169,7 @@ else if (range.getStart().length < match.getStart().length)
     /**
      * Returns an int given a List<Byte>
      */
-    private static int toInt(List<Byte> data)
+    private int toInt(List<Byte> data)
     {
         int code = 0;
         for (byte b : data)
@@ -210,7 +210,7 @@ public int toCID(int code)
      * @param length The length of the data we are getting.
      * @return the resulting integer
      */
-    private static int getCodeFromArray( byte[] data, int offset, int length )
+    private int getCodeFromArray( byte[] data, int offset, int length )
     {
         int code = 0;
         for( int i=0; i<length; i++ )

library/src/main/java/com/tom_roush/fontbox/cmap/CMapParser.java

@@ -16,6 +16,8 @@
  */
 package com.tom_roush.fontbox.cmap;
 
+import com.tom_roush.pdfbox.util.PDFBoxResourceLoader;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -27,8 +29,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.tom_roush.pdfbox.util.PDFBoxResourceLoader;
-
 /**
  * Parses a CMap stream.
  *
@@ -638,7 +638,7 @@ else if (isWhitespaceOrEOF(theNextByte))
         return retval;
     }
 
-    private static void readUntilEndOfLine(InputStream is, StringBuffer buf) throws IOException
+    private void readUntilEndOfLine(InputStream is, StringBuffer buf) throws IOException
     {
         int nextByte = is.read();
         while (nextByte != -1 && nextByte != 0x0D && nextByte != 0x0A)
@@ -648,13 +648,13 @@ private static void readUntilEndOfLine(InputStream is, StringBuffer buf) throws
         }
     }
 
-    private static boolean isWhitespaceOrEOF(int aByte)
+    private boolean isWhitespaceOrEOF(int aByte)
     {
         return aByte == -1 || aByte == 0x20 || aByte == 0x0D || aByte == 0x0A;
     }
 
     /** Is this a standard PDF delimiter character? */
-    private static boolean isDelimiter(int aByte) 
+    private boolean isDelimiter(int aByte)
     {
         switch (aByte) 
         {
@@ -692,7 +692,7 @@ private void increment(byte[] data, int position)
         }
     }
 
-    private static int createIntFromBytes(byte[] bytes)
+    private int createIntFromBytes(byte[] bytes)
     {
         int intValue = (bytes[0] + 256) % 256;
         if (bytes.length == 2)
@@ -703,7 +703,7 @@ private static int createIntFromBytes(byte[] bytes)
         return intValue;
     }
 
-    private static String createStringFromBytes(byte[] bytes) throws IOException
+    private String createStringFromBytes(byte[] bytes) throws IOException
     {
         String retval;
         if (bytes.length == 1)
@@ -717,7 +717,7 @@ private static String createStringFromBytes(byte[] bytes) throws IOException
         return retval;
     }
 
-    private static int compare(byte[] first, byte[] second)
+    private int compare(byte[] first, byte[] second)
     {
         int retval = 1;
         int firstLength = first.length;

library/src/main/java/com/tom_roush/fontbox/ttf/MemoryTTFDataStream.java

@@ -28,7 +28,7 @@
  * @author Ben Litchfield
  * 
  */
-public class MemoryTTFDataStream extends TTFDataStream 
+class MemoryTTFDataStream extends TTFDataStream
 {
     private byte[] data = null;
     private int currentPosition = 0;
@@ -38,7 +38,7 @@ public class MemoryTTFDataStream extends TTFDataStream
      * @param is The stream of read from.
      * @throws IOException If an error occurs while reading from the stream.
      */
-    public MemoryTTFDataStream( InputStream is ) throws IOException
+    MemoryTTFDataStream( InputStream is ) throws IOException
     {
         try
         {
@@ -60,8 +60,6 @@ public MemoryTTFDataStream( InputStream is ) throws IOException
         }
     }
 
-
-    
     /**
      * Read an unsigned byte.
      * @return An unsigned byte.

library/src/main/java/com/tom_roush/fontbox/ttf/OTFParser.java

@@ -24,7 +24,7 @@
 /**
  * OpenType font file parser.
  */
-public class OTFParser extends TTFParser
+public final class OTFParser extends TTFParser
 {
     /**
      * Constructor.
@@ -74,13 +74,13 @@ public OpenTypeFont parse(InputStream data) throws IOException
     }
 
     @Override
-    public OpenTypeFont parse(TTFDataStream raf) throws IOException
+    protected OpenTypeFont parse(TTFDataStream raf) throws IOException
     {
         return (OpenTypeFont)super.parse(raf);
     }
 
     @Override
-    protected OpenTypeFont newFont(TTFDataStream raf)
+    OpenTypeFont newFont(TTFDataStream raf)
     {
         return new OpenTypeFont(raf);
     }

library/src/main/java/com/tom_roush/fontbox/ttf/RAFDataStream.java

@@ -28,7 +28,7 @@
  * 
  * @author Ben Litchfield
  */
-public class RAFDataStream extends TTFDataStream 
+class RAFDataStream extends TTFDataStream
 {
     private RandomAccessFile raf = null;
     private File ttfFile = null;
@@ -43,7 +43,7 @@ public class RAFDataStream extends TTFDataStream
      * 
      * @see RandomAccessFile#RandomAccessFile( String, String )
      */
-    public RAFDataStream(String name, String mode) throws FileNotFoundException
+    RAFDataStream(String name, String mode) throws FileNotFoundException
     {
         this( new File( name ), mode );
     }
@@ -58,7 +58,7 @@ public RAFDataStream(String name, String mode) throws FileNotFoundException
      * 
      * @see RandomAccessFile#RandomAccessFile( File, String )
      */
-    public RAFDataStream(File file, String mode) throws FileNotFoundException
+    RAFDataStream(File file, String mode) throws FileNotFoundException
     {
         raf = new RandomAccessFile( file, mode );
         ttfFile = file;

library/src/main/java/com/tom_roush/fontbox/ttf/TTCDataStream.java

@@ -0,0 +1,91 @@
+/*
+ * 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 com.tom_roush.fontbox.ttf;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A wrapper for a TTF stream inside a TTC file, does not close the underlying shared stream.
+ *
+ * @author John Hewson
+ */
+class TTCDataStream extends TTFDataStream
+{
+    private final TTFDataStream stream;
+
+    TTCDataStream(TTFDataStream stream)
+    {
+        this.stream = stream;
+    }
+
+    @Override
+    public int read() throws IOException
+    {
+        return stream.read();
+    }
+
+    @Override
+    public long readLong() throws IOException
+    {
+        return stream.readLong();
+    }
+
+    @Override
+    public int readUnsignedShort() throws IOException
+    {
+        return stream.readUnsignedShort();
+    }
+
+    @Override
+    public short readSignedShort() throws IOException
+    {
+        return stream.readSignedShort();
+    }
+
+    @Override
+    public void close() throws IOException
+    {
+        // don't close the underlying stream, as it is shared by all fonts from the same TTC
+        // TrueTypeCollection.close() must be called instead
+    }
+
+    @Override
+    public void seek(long pos) throws IOException
+    {
+        stream.seek(pos);
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException
+    {
+        return stream.read(b, off, len);
+    }
+
+    @Override
+    public long getCurrentPosition() throws IOException
+    {
+        return stream.getCurrentPosition();
+    }
+
+    @Override
+    public InputStream getOriginalData() throws IOException
+    {
+        return stream.getOriginalData();
+    }
+}

library/src/main/java/com/tom_roush/fontbox/ttf/TTFDataStream.java

@@ -29,8 +29,11 @@
  * 
  * @author Ben Litchfield
  */
-public abstract class TTFDataStream implements Closeable
+abstract class TTFDataStream implements Closeable
 {
+    TTFDataStream()
+    {
+    }
 
     /**
      * Read a 16.16 fixed value, where the first 16 bits are the decimal and the last 16 bits are the fraction.
@@ -203,6 +206,15 @@ public Calendar readInternationalDate() throws IOException
         return cal;
     }
 
+    /**
+     * Reads a tag, an arrau of four uint8s used to identify a script, language system, feature,
+     * or baseline.
+     */
+    public String readTag() throws IOException
+    {
+        return new String(read(4), "US-ASCII");
+    }
+
     /**
      * Close the underlying resources.
      *