diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-10-29 07:14:40 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-10-29 07:14:40 +0100 |
| commit | 4f053696e1813fde4bd6cebbb77ff2a1e1f6800b (patch) | |
| tree | 308ec3223eec7744136e95c40284602ba35efacc /src/fontloader/misc/fontloader-font-otp.lua | |
| parent | d7a36a33d8d57a5aec9232364cf0bd307523281c (diff) | |
| download | luaotfload-4f053696e1813fde4bd6cebbb77ff2a1e1f6800b.tar.gz | |
[fontloader] sync with Context as of 2015-10-29
Diffstat (limited to 'src/fontloader/misc/fontloader-font-otp.lua')
| -rw-r--r-- | src/fontloader/misc/fontloader-font-otp.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fontloader/misc/fontloader-font-otp.lua b/src/fontloader/misc/fontloader-font-otp.lua index ebf36ed..91bd05b 100644 --- a/src/fontloader/misc/fontloader-font-otp.lua +++ b/src/fontloader/misc/fontloader-font-otp.lua @@ -12,9 +12,8 @@ if not modules then modules = { } end modules ['font-otp'] = { -- -- unless we sort all hashes we can get a different pack order (no big deal but size can differ) -local next, type = next, type +local next, type, tostring = next, type, tostring local sort, concat = table.sort, table.concat -local sortedhash = table.sortedhash local trace_packing = false trackers.register("otf.packing", function(v) trace_packing = v end) local trace_loading = false trackers.register("otf.loading", function(v) trace_loading = v end) @@ -148,6 +147,7 @@ end -- we then need to sort more thanks to random hashing local function packdata(data) + if data then -- stripdata(data) local h, t, c = { }, { }, { } @@ -537,6 +537,7 @@ local unpacked_mt = { } local function unpackdata(data) + if data then local tables = data.tables if tables then |