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 2015/02/25 18:29:03 UTC
svn commit: r1662280 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java
Author: tilman
Date: Wed Feb 25 17:29:02 2015
New Revision: 1662280
URL: http://svn.apache.org/r1662280
Log:
PDFBOX-2576: use enums instead of constants
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java?rev=1662280&r1=1662279&r2=1662280&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java Wed Feb 25 17:29:02 2015
@@ -93,6 +93,7 @@ final class PDCIDFontType2Embedder exten
/**
* Rebuild a font subset.
*/
+ @Override
protected void buildSubset(InputStream ttfSubset, String tag, Map<Integer, Integer> gidToCid)
throws IOException
{
@@ -311,6 +312,11 @@ final class PDCIDFontType2Embedder exten
cidFont.setItem(COSName.W, getWidths(gidwidths));
}
+
+ enum State
+ {
+ FIRST, BRACKET, SERIAL
+ }
private COSArray getWidths(int[] widths) throws IOException
{
@@ -328,8 +334,7 @@ final class PDCIDFontType2Embedder exten
COSArray outer = new COSArray();
outer.add(COSInteger.get(lastCid));
- final int FIRST = 0, BRACKET = 1, SERIAL = 2;
- int state = FIRST;
+ State state = State.FIRST;
for (int i = 2; i < widths.length; i += 2)
{
@@ -341,11 +346,11 @@ final class PDCIDFontType2Embedder exten
case FIRST:
if (cid == lastCid + 1 && value == lastValue)
{
- state = SERIAL;
+ state = State.SERIAL;
}
else if (cid == lastCid + 1)
{
- state = BRACKET;
+ state = State.BRACKET;
inner = new COSArray();
inner.add(COSInteger.get(lastValue));
}
@@ -360,7 +365,7 @@ final class PDCIDFontType2Embedder exten
case BRACKET:
if (cid == lastCid + 1 && value == lastValue)
{
- state = SERIAL;
+ state = State.SERIAL;
outer.add(inner);
outer.add(COSInteger.get(lastCid));
}
@@ -370,7 +375,7 @@ final class PDCIDFontType2Embedder exten
}
else
{
- state = FIRST;
+ state = State.FIRST;
inner.add(COSInteger.get(lastValue));
outer.add(inner);
outer.add(COSInteger.get(cid));
@@ -382,7 +387,7 @@ final class PDCIDFontType2Embedder exten
outer.add(COSInteger.get(lastCid));
outer.add(COSInteger.get(lastValue));
outer.add(COSInteger.get(cid));
- state = FIRST;
+ state = State.FIRST;
}
break;
}