From 8d9b9bdb3c332661e80831e861f157c5794d7bd1 Mon Sep 17 00:00:00 2001 From: ac79b0c6 <105047743+ac79b0c6@users.noreply.github.com> Date: Sat, 7 May 2022 17:05:55 +0800 Subject: update mkvlib:fix fallback bug --- mkvlib/ass.go | 8 ++++---- mkvlib/shared.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mkvlib') diff --git a/mkvlib/ass.go b/mkvlib/ass.go index 3396ee2..826c484 100644 --- a/mkvlib/ass.go +++ b/mkvlib/ass.go @@ -442,7 +442,7 @@ func (self *assProcessor) matchFonts() bool { if self.m[k].file != "" { continue } - if f, i := self.matchCache(fmt.Sprintf("%s^%s", _k[0], _k[1])); f != "" { + if f, i := self.matchCache(fmt.Sprintf("%s^%s", _k[0], _k[1]), k); f != "" { self.m[k].file, self.m[k].index = f, i n := self.fg[_k[0]] if n == "" { @@ -822,7 +822,7 @@ func (self *assProcessor) copyFontsFromCache() bool { l := len(self.m) i := 0 for k, _ := range self.m { - ok, _ := self.matchCache(k) + ok, _ := self.matchCache(k, k) if ok != "" { _, fn, _, _ := splitPath(ok) fn = path.Join(self.output, fn) @@ -872,7 +872,7 @@ func (self *assProcessor) loadCache(ccs []string) { } } -func (self *assProcessor) matchCache(k string) (string, int) { +func (self *assProcessor) matchCache(k, o string) (string, int) { ok := "" i := -1 _count := 0 @@ -886,7 +886,7 @@ func (self *assProcessor) matchCache(k string) (string, int) { names := self.getFontName(v.File) if len(names) > 0 { _count++ - if !self.checkFontMissing(self.m[k], _count, true) && self.strict { + if !self.checkFontMissing(self.m[o], _count, true) && self.strict { ok = "" i = 0 continue diff --git a/mkvlib/shared.go b/mkvlib/shared.go index 108a9f5..0c63916 100644 --- a/mkvlib/shared.go +++ b/mkvlib/shared.go @@ -11,7 +11,7 @@ import ( ) const libName = "mkvlib" -const libVer = "v1.9.0" +const libVer = "v1.9.1" const LibFName = libName + " " + libVer -- cgit v1.2.1