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 2023/08/10 04:28:19 UTC
svn commit: r1911582 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf: TTFDataStream.java TTFSubsetter.java
Author: tilman
Date: Thu Aug 10 04:28:19 2023
New Revision: 1911582
URL: http://svn.apache.org/viewvc?rev=1911582&view=rev
Log:
PDFBOX-5645: make UTC TZ static final, as suggested by Daniel Gredler
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java?rev=1911582&r1=1911581&r2=1911582&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Thu Aug 10 04:28:19 2023
@@ -32,6 +32,8 @@ import java.util.TimeZone;
*/
abstract class TTFDataStream implements Closeable
{
+ private static final TimeZone TIMEZONE_UTC = TimeZone.getTimeZone("UTC");
+
TTFDataStream()
{
}
@@ -208,7 +210,7 @@ abstract class TTFDataStream implements
public Calendar readInternationalDate() throws IOException
{
long secondsSince1904 = readLong();
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Calendar cal = Calendar.getInstance(TIMEZONE_UTC);
cal.set(1904, 0, 1, 0, 0, 0);
cal.set(Calendar.MILLISECOND, 0);
long millisFor1904 = cal.getTimeInMillis();
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java?rev=1911582&r1=1911581&r2=1911582&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Thu Aug 10 04:28:19 2023
@@ -54,6 +54,8 @@ public final class TTFSubsetter
private static final byte[] PAD_BUF = new byte[] { 0, 0, 0 };
+ private static final TimeZone TIMEZONE_UTC = TimeZone.getTimeZone("UTC");
+
private final TrueTypeFont ttf;
private final CmapLookup unicodeCmap;
private final SortedMap<Integer, Integer> uniToGID;
@@ -1084,7 +1086,7 @@ public final class TTFSubsetter
private void writeLongDateTime(DataOutputStream out, Calendar calendar) throws IOException
{
// inverse operation of TTFDataStream.readInternationalDate()
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Calendar cal = Calendar.getInstance(TIMEZONE_UTC);
cal.set(1904, 0, 1, 0, 0, 0);
cal.set(Calendar.MILLISECOND, 0);
long millisFor1904 = cal.getTimeInMillis();