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 2017/03/03 22:17:20 UTC
svn commit: r1785409 -
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringParser.java
Author: tilman
Date: Fri Mar 3 22:17:20 2017
New Revision: 1785409
URL: http://svn.apache.org/viewvc?rev=1785409&view=rev
Log:
PDFBOX-2852: use switch
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringParser.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringParser.java?rev=1785409&r1=1785408&r2=1785409&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringParser.java Fri Mar 3 22:17:20 2017
@@ -123,33 +123,32 @@ public class Type1CharStringParser
// othersubrs 0-3 have their own semantics
Stack<Integer> results = new Stack<Integer>();
- if (othersubrNum == 0)
+ switch (othersubrNum)
{
- results.push(removeInteger(sequence));
- results.push(removeInteger(sequence));
- sequence.remove(sequence.size() - 1);
- // end flex
- sequence.add(0);
- sequence.add(new CharStringCommand(TWO_BYTE, CALLOTHERSUBR));
- }
- else if (othersubrNum == 1)
- {
- // begin flex
- sequence.add(1);
- sequence.add(new CharStringCommand(TWO_BYTE, CALLOTHERSUBR));
- }
- else if (othersubrNum == 3)
- {
- // allows hint replacement
- results.push(removeInteger(sequence));
- }
- else
- {
- // all remaining othersubrs use this fallback mechanism
- for (int i = 0; i < numArgs; i++)
- {
+ case 0:
+ results.push(removeInteger(sequence));
+ results.push(removeInteger(sequence));
+ sequence.remove(sequence.size() - 1);
+ // end flex
+ sequence.add(0);
+ sequence.add(new CharStringCommand(TWO_BYTE, CALLOTHERSUBR));
+ break;
+ case 1:
+ // begin flex
+ sequence.add(1);
+ sequence.add(new CharStringCommand(TWO_BYTE, CALLOTHERSUBR));
+ break;
+ case 3:
+ // allows hint replacement
results.push(removeInteger(sequence));
- }
+ break;
+ default:
+ // all remaining othersubrs use this fallback mechanism
+ for (int i = 0; i < numArgs; i++)
+ {
+ results.push(removeInteger(sequence));
+ }
+ break;
}
// pop must follow immediately