Author: lehmi Date: Thu May 9 11:45:40 2024 New Revision: 1917615 URL: http://svn.apache.org/viewvc?rev=1917615&view=rev Log: PDFBOX-5469: reformat source
Modified: pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java Modified: pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java?rev=1917615&r1=1917614&r2=1917615&view=diff ============================================================================== --- pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java (original) +++ pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java Thu May 9 11:45:40 2024 @@ -24,6 +24,7 @@ import org.apache.fontbox.cff.CharString /** * This class represents a converter for a mapping into a Type2-sequence. + * * @author Villu Ruusmann */ public class Type2CharStringParser @@ -64,12 +65,12 @@ public class Type2CharStringParser } private void parseSequence(byte[] bytes, byte[][] globalSubrIndex, byte[][] localSubrIndex, - GlyphData glyphData) - throws IOException + GlyphData glyphData) throws IOException { DataInput input = new DataInputByteArray(bytes); boolean localSubroutineIndexProvided = localSubrIndex != null && localSubrIndex.length > 0; - boolean globalSubroutineIndexProvided = globalSubrIndex != null && globalSubrIndex.length > 0; + boolean globalSubroutineIndexProvided = globalSubrIndex != null + && globalSubrIndex.length > 0; while (input.hasRemaining()) { @@ -82,14 +83,14 @@ public class Type2CharStringParser { processCallSubr(globalSubrIndex, localSubrIndex, globalSubrIndex, glyphData); } - else if ( (b0 >= 0 && b0 <= 27) || (b0 >= 29 && b0 <= 31)) + else if ((b0 >= 0 && b0 <= 27) || (b0 >= 29 && b0 <= 31)) { glyphData.sequence.add(readCommand(b0, input, glyphData)); - } + } else if (b0 == 28 || (b0 >= 32 && b0 <= 255)) { glyphData.sequence.add(readNumber(b0, input)); - } + } else { throw new IllegalArgumentException(); @@ -98,8 +99,7 @@ public class Type2CharStringParser } private void processCallSubr(byte[][] globalSubrIndex, byte[][] localSubrIndex, - byte[][] subrIndex, GlyphData glyphData) - throws IOException + byte[][] subrIndex, GlyphData glyphData) throws IOException { int subrNumber = calculateSubrNumber( (Integer) glyphData.sequence.remove(glyphData.sequence.size() - 1), @@ -168,17 +168,17 @@ public class Type2CharStringParser if (b0 == 28) { return (int) input.readShort(); - } + } else if (b0 >= 32 && b0 <= 246) { return b0 - 139; - } + } else if (b0 >= 247 && b0 <= 250) { int b1 = input.readUnsignedByte(); return (b0 - 247) * 256 + b1 + 108; - } + } else if (b0 >= 251 && b0 <= 254) { int b1 = input.readUnsignedByte(); @@ -191,7 +191,7 @@ public class Type2CharStringParser // The lower bytes are representing the digits after the decimal point double fraction = input.readUnsignedShort() / 65535d; return value + fraction; - } + } else { throw new IllegalArgumentException(); @@ -201,7 +201,7 @@ public class Type2CharStringParser private int getMaskLength(int hstemCount, int vstemCount) { int hintCount = hstemCount + vstemCount; - int length = hintCount / 8; + int length = hintCount / 8; if (hintCount % 8 > 0) { length++;