You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/04/08 16:03:04 UTC
svn commit: r1888524 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff:
CFFExpertCharset.java CFFExpertSubsetCharset.java CFFISOAdobeCharset.java
Author: lehmi
Date: Thu Apr 8 16:03:04 2021
New Revision: 1888524
URL: http://svn.apache.org/viewvc?rev=1888524&view=rev
Log:
PDFBOX-5143: move code from static code block to empty private constructor
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java?rev=1888524&r1=1888523&r2=1888524&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java Thu Apr 8 16:03:04 2021
@@ -200,7 +200,11 @@ public final class CFFExpertCharset exte
private CFFExpertCharset()
{
- // empty
+ int gid = 0;
+ for (Object[] charsetEntry : CFF_EXPERT_CHARSET_TABLE)
+ {
+ addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
+ }
}
/**
@@ -214,12 +218,4 @@ public final class CFFExpertCharset exte
private static final CFFExpertCharset INSTANCE = new CFFExpertCharset();
- static
- {
- int gid = 0;
- for (Object[] charsetEntry : CFF_EXPERT_CHARSET_TABLE)
- {
- INSTANCE.addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
- }
- }
}
\ No newline at end of file
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java?rev=1888524&r1=1888523&r2=1888524&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java Thu Apr 8 16:03:04 2021
@@ -123,7 +123,11 @@ public final class CFFExpertSubsetCharse
private CFFExpertSubsetCharset()
{
- // empty
+ int gid = 0;
+ for (Object[] charsetEntry : CFF_EXPERT_SUBSET_CHARSET_TABLE)
+ {
+ addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
+ }
}
/**
@@ -137,12 +141,4 @@ public final class CFFExpertSubsetCharse
private static final CFFExpertSubsetCharset INSTANCE = new CFFExpertSubsetCharset();
- static
- {
- int gid = 0;
- for (Object[] charsetEntry : CFF_EXPERT_SUBSET_CHARSET_TABLE)
- {
- INSTANCE.addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
- }
- }
}
\ No newline at end of file
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java?rev=1888524&r1=1888523&r2=1888524&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java Thu Apr 8 16:03:04 2021
@@ -264,7 +264,11 @@ public final class CFFISOAdobeCharset ex
private CFFISOAdobeCharset()
{
- // empty
+ int gid = 0;
+ for (Object[] charsetEntry : CFF_ISO_ADOBE_CHARSET_TABLE)
+ {
+ addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
+ }
}
/**
@@ -278,12 +282,4 @@ public final class CFFISOAdobeCharset ex
private static final CFFISOAdobeCharset INSTANCE = new CFFISOAdobeCharset();
- static
- {
- int gid = 0;
- for (Object[] charsetEntry : CFF_ISO_ADOBE_CHARSET_TABLE)
- {
- INSTANCE.addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
- }
- }
}
\ No newline at end of file