Removed created/modified requirement from ttxTools - Fixes Errors 109…

…, 115, 116, 117, 119, 135, 136, 143, 145, 154, 155, 156, 157, 159, 160, and 161.
MitchTalmadge · Sep 18, 2015 · 4d706d6 · 4d706d6
1 parent e30216b
commit 4d706d6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/src/main/java/me/MitchT/EmojiTools/EmojiTools.java b/src/main/java/me/MitchT/EmojiTools/EmojiTools.java
@@ -14,7 +14,7 @@
  */
 public class EmojiTools {
 
-    public static final String VERSION_STRING = "V1.6";
+    public static final String VERSION_STRING = "V1.6.5";
     public static final int PROJECT_ID = 1; //Used in AptiAPI
 
     private static final Image logoImage = new ImageIcon(EmojiTools.class.getResource("/Images/EmojiToolsLogo.png")).getImage();

diff --git a/src/main/resources/FontTemplates/NotoColorEmoji.tmpl.ttx b/src/main/resources/FontTemplates/NotoColorEmoji.tmpl.ttx
@@ -14,8 +14,6 @@
     <magicNumber value="0x5f0f3cf5"/>
     <flags value="00000000 00001011"/>
     <unitsPerEm value="2048"/>
-    <created value="Wed May 22 20:00:43 2013"/>
-    <modified value="Thu Jan 09 07:11:49 2014"/>
     <xMin value="0"/>
     <yMin value="-500"/>
     <xMax value="2550"/>

diff --git a/src/main/resources/PythonScripts/fontTools/merge.py b/src/main/resources/PythonScripts/fontTools/merge.py
@@ -199,8 +199,6 @@ def merge(self, m, tables):
     'magicNumber': equal,
     'flags': mergeBits(headFlagsMergeBitMap),
     'unitsPerEm': equal,
-    'created': current_time,
-    'modified': current_time,
     'xMin': min,
     'yMin': min,
     'xMax': max,

diff --git a/src/main/resources/PythonScripts/fontTools/ttLib/tables/_h_e_a_d.py b/src/main/resources/PythonScripts/fontTools/ttLib/tables/_h_e_a_d.py
@@ -3,8 +3,6 @@
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval, num2binary, binary2num
 from . import DefaultTable
-import time
-import calendar
 
 headFormat = """
 		>	# big endian
@@ -14,8 +12,6 @@
 		magicNumber:        I
 		flags:              H
 		unitsPerEm:         H
-		created:            Q
-		modified:           Q
 		xMin:               h
 		yMin:               h
 		xMax:               h
@@ -38,8 +34,6 @@ def decompile(self, data, ttFont):
             assert rest == "\0\0"
 
     def compile(self, ttFont):
-        if ttFont.recalcTimestamp:
-            self.modified = int(time.time() - mac_epoch_diff)
         data = sstruct.pack(headFormat, self)
         return data
 
@@ -49,11 +43,6 @@ def toXML(self, writer, ttFont):
         formatstring, names, fixes = sstruct.getformat(headFormat)
         for name in names:
             value = getattr(self, name)
-            if name in ("created", "modified"):
-                try:
-                    value = time.asctime(time.gmtime(max(0, value + mac_epoch_diff)))
-                except ValueError:
-                    value = time.asctime(time.gmtime(0))
             if name in ("magicNumber", "checkSumAdjustment"):
                 if value < 0:
                     value = value + 0x100000000
@@ -67,13 +56,8 @@ def toXML(self, writer, ttFont):
 
     def fromXML(self, name, attrs, content, ttFont):
         value = attrs["value"]
-        if name in ("created", "modified"):
-            value = calendar.timegm(time.strptime(value)) - mac_epoch_diff
-        elif name in ("macStyle", "flags"):
+        if name in ("macStyle", "flags"):
             value = binary2num(value)
         else:
             value = safeEval(value)
-        setattr(self, name, value)
-
-# Difference between the original Mac epoch (1904) to the epoch on this machine.
-mac_epoch_diff = calendar.timegm((1904, 1, 1, 0, 0, 0, 0, 0, 0))
+        setattr(self, name, value)