Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions main/java/BitsNPicas/src/com/kreative/bitsnpicas/Font.java
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ public void autoFillNames() {
if (sourceDateEpochEnv != null) {
long sourceDateEpoch = Long.parseLong(sourceDateEpochEnv);
now.setTimeInMillis(sourceDateEpoch * 1000L);
now.setTimeZone(TimeZone.getTimeZone("UTC"));
}
names.put(NAME_UNIQUE_ID, "BitsNPicas: " + pname + ": " + now.get(Calendar.YEAR));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.GregorianCalendar;
import java.util.List;
import java.util.TimeZone;
import com.kreative.bitsnpicas.BitmapFontGlyph;
import com.kreative.bitsnpicas.Font;

Expand All @@ -17,6 +18,7 @@ public Result generate(Font<BitmapFontGlyph> font, List<GlyphLocator<BitmapFontG
if (sourceDateEpochEnv != null) {
long sourceDateEpoch = Long.parseLong(sourceDateEpochEnv);
now.setTimeInMillis(sourceDateEpoch * 1000L);
now.setTimeZone(TimeZone.getTimeZone("UTC"));
}

BitmapFontGlyph[] glyphs = getTimestampGlyphs(font, now);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import com.kreative.bitsnpicas.BitmapFont;
import com.kreative.bitsnpicas.BitmapFontExporter;
import com.kreative.bitsnpicas.BitmapFontGlyph;
Expand Down Expand Up @@ -256,6 +257,7 @@ private static final HeadTable makeHeadTable(BitmapFont bf, ThingsToKeepTrackOf
if (sourceDateEpochEnv != null) {
long sourceDateEpoch = Long.parseLong(sourceDateEpochEnv);
now.setTimeInMillis(sourceDateEpoch * 1000L);
now.setTimeZone(TimeZone.getTimeZone("UTC"));
}

double fontVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;
import com.kreative.bitsnpicas.BitmapFont;
import com.kreative.bitsnpicas.BitmapFontExporter;
import com.kreative.bitsnpicas.BitmapFontGlyph;
Expand Down Expand Up @@ -234,6 +235,7 @@ private static final HeadTable makeHeadTable(BitmapFont bf, ThingsToKeepTrackOf
if (sourceDateEpochEnv != null) {
long sourceDateEpoch = Long.parseLong(sourceDateEpochEnv);
now.setTimeInMillis(sourceDateEpoch * 1000L);
now.setTimeZone(TimeZone.getTimeZone("UTC"));
}

double fontVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.io.UnsupportedEncodingException;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;

public class CBMDirectoryBlock implements CBMConstants {
public static final String COMMENT_PRG = "PRG formatted GEOS file";
Expand Down Expand Up @@ -53,6 +54,7 @@ public void clear() {
if (sourceDateEpochEnv != null) {
long sourceDateEpoch = Long.parseLong(sourceDateEpochEnv);
now.setTimeInMillis(sourceDateEpoch * 1000L);
now.setTimeZone(TimeZone.getTimeZone("UTC"));
}

year = now.get(Calendar.YEAR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
import java.util.TimeZone;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import com.kreative.bitsnpicas.BitmapFont;
Expand Down Expand Up @@ -582,6 +583,7 @@ private static void transformFont(BitmapFont font, Options o) {
if (sourceDateEpochEnv != null) {
long sourceDateEpoch = Long.parseLong(sourceDateEpochEnv);
now.setTimeInMillis(sourceDateEpoch * 1000L);
now.setTimeZone(TimeZone.getTimeZone("UTC"));
}

BitmapFontGlyph[] glyphs = TimestampGlyphGenerator.getTimestampGlyphs(font, now);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class HeadTable extends TrueTypeTable {
public static final int FLAGS_DEFINED_BY_ADOBE_2 = 0x1000;
public static final int FLAGS_DEFINED_BY_ADOBE_3 = 0x2000;
public static final int FLAGS_GENERIC_SYMBOLS_FOR_CODE_POINT_RANGES = 0x4000;
public static final long DATE_EPOCH = new GregorianCalendar(1904, Calendar.JANUARY, 1, 0, 0, 0).getTimeInMillis();
public static final long DATE_EPOCH_1904 = 2082844800L * 1000L; // Milliseconds between 1904-01-01 00:00:00 UTC and Unix epoch
public static final int MAC_STYLE_PLAIN = 0x00;
public static final int MAC_STYLE_BOLD = 0x01;
public static final int MAC_STYLE_ITALIC = 0x02;
Expand Down Expand Up @@ -81,23 +81,23 @@ public void setFontRevisionDouble(double revision) {
}

public GregorianCalendar getDateCreatedCalendar() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeInMillis(DATE_EPOCH + (dateCreated * 1000L));
GregorianCalendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
cal.setTimeInMillis((dateCreated * 1000L) - DATE_EPOCH_1904);
return cal;
}

public void setDateCreatedCalendar(Calendar cal) {
dateCreated = (cal.getTimeInMillis() - DATE_EPOCH) / 1000L;
dateCreated = (cal.getTimeInMillis() + DATE_EPOCH_1904) / 1000L;
}

public GregorianCalendar getDateModifiedCalendar() {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeInMillis(DATE_EPOCH + (dateModified * 1000L));
GregorianCalendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
cal.setTimeInMillis((dateModified * 1000L) - DATE_EPOCH_1904);
return cal;
}

public void setDateModifiedCalendar(Calendar cal) {
dateModified = (cal.getTimeInMillis() - DATE_EPOCH) / 1000L;
dateModified = (cal.getTimeInMillis() + DATE_EPOCH_1904) / 1000L;
}

@Override
Expand Down