Fonts, io refactoring for autoport.

Author: pavel-alay

io/src/main/java/com/itextpdf/io/font/Type1Font.java

@@ -132,7 +132,7 @@ public String getCharacterSet() {
      */
     @Override
     public boolean hasKernPairs() {
-        return !kernPairs.isEmpty();
+        return kernPairs.size() > 0;
     }
 
     @Override

io/src/main/java/com/itextpdf/io/font/otf/Glyph.java

@@ -231,14 +231,7 @@ public boolean equals(Object obj) {
             return false;
         }
         Glyph other = (Glyph) obj;
-        if (chars == null) {
-            if (other.chars != null) {
-                return false;
-            }
-        } else if (!Arrays.equals(chars, other.chars)) {
-            return false;
-        }
-        return code == other.code && width == other.width;
+        return Arrays.equals(chars, other.chars) && code == other.code && width == other.width;
     }
 
     public String toString() {
@@ -249,7 +242,7 @@ public String toString() {
     private static int codePoint(char[] a) {
         if (a != null) {
             if (a.length == 1 && Character.isValidCodePoint(a[0])) {
-                return (int) a[0];
+                return a[0];
             } else if (a.length == 2 && Character.isHighSurrogate(a[0]) && Character.isLowSurrogate(a[1])) {
                 return Character.toCodePoint(a[0], a[1]);
             }

io/src/main/java/com/itextpdf/io/font/otf/Language.java

@@ -88,10 +88,10 @@ protected int getGlyphWidth(int index) {
         }
     }
 
-    public Integer getGlyphToCharacter(int index) {
+    public int getGlyphToCharacter(int index) {
         Glyph glyph = indexGlyphMap.get(index);
         if (glyph == null) {
-            return null;
+            return -1;
         } else {
             return glyph.getUnicode();
         }

io/src/main/java/com/itextpdf/io/font/otf/OpenTypeFontTableReader.java

@@ -47,6 +47,9 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.IOException;
 import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.io.source.ByteArrayOutputStream;
+import com.itextpdf.io.source.RandomAccessFileOrArray;
+import com.itextpdf.io.source.RandomAccessSourceFactory;
+import com.itextpdf.io.util.StreamUtil;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -57,6 +60,10 @@ This file is part of the iText (R) project.
 public final class BmpImageHelper {
 
     private static class BmpParameters {
+        public BmpParameters(BmpImage image) {
+            this.image = image;
+        }
+
         BmpImage image;
         int width;
         int height;
@@ -117,19 +124,14 @@ public static void processImage(Image image, ByteArrayOutputStream stream) {
         if (stream == null) {
             stream = new ByteArrayOutputStream();
         }
-        BmpParameters bmp = new BmpParameters();
-        bmp.image = (BmpImage)image;
-        InputStream bmpStream = null;
+        BmpParameters bmp = new BmpParameters((BmpImage)image);
+        InputStream bmpStream;
         try {
             if (bmp.image.getUrl() != null) {
-                bmpStream = bmp.image.getUrl().openStream();
-                int read;
-                byte[] bytes = new byte[4096];
-                while ((read = bmpStream.read(bytes)) != -1) {
-                    stream.write(bytes, 0, read);
-                }
+                RandomAccessFileOrArray raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().createSource(bmp.image.getUrl()));
+                StreamUtil.transferBytes(raf, stream);
+                raf.close();
                 image.imageSize = stream.toByteArray().length;
-                bmpStream.close();
                 bmpStream = new ByteArrayInputStream(stream.toByteArray());
             } else {
                 bmpStream = new ByteArrayInputStream(bmp.image.getData());
@@ -143,12 +145,6 @@ public static void processImage(Image image, ByteArrayOutputStream stream) {
             }
         } catch (java.io.IOException e){
             throw new IOException(IOException.BmpImageException, e);
-        } finally {
-            if (bmpStream != null) {
-                try {
-                    bmpStream.close();
-                } catch (java.io.IOException ignored) { }
-            }
         }
         updateStream(bmp, stream);
     }

io/src/main/java/com/itextpdf/io/image/BmpImageHelper.java

@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.source.ByteBuffer;
 import com.itextpdf.io.source.ByteUtils;
 import com.itextpdf.io.source.OutputStream;
+import com.itextpdf.io.source.RandomAccessFileOrArray;
 import com.itextpdf.io.source.RandomAccessSource;
 
 import java.io.ByteArrayOutputStream;
@@ -173,6 +174,18 @@ public static void transferBytes(InputStream input, java.io.OutputStream output)
         }
     }
 
+    public static void transferBytes(RandomAccessFileOrArray input, java.io.OutputStream output) throws java.io.IOException {
+        byte[] buffer = new byte[transferSize];
+        for (; ; ) {
+            int len = input.read(buffer, 0, transferSize);
+            if (len > 0) {
+                output.write(buffer, 0, len);
+            } else {
+                break;
+            }
+        }
+    }
+
     /**
      * Reads the full content of a stream and returns them in a byte array
      *