Merge branch 'master' of github.com:rupor-github/fb2mobi

rupor-github · Jan 21, 2018 · 041355d · 041355d
2 parents 4e95aab + fc9ada8
commit 041355d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ui/fontdb.py b/ui/fontdb.py
@@ -19,10 +19,7 @@ def update_db(self):
 				if os.path.splitext(file)[1].lower() in ['.ttf', '.otf']:
 					font_file = os.path.join(self.fonts_path, file)
 					try:
-						if sys.platform == 'win32':
-							font = ImageFont.truetype(font_file.encode('cp1251'), 10)
-						else:	
-							font = ImageFont.truetype(font_file, 10)
+						font = ImageFont.truetype(font_file, 10)
 						if font.font.family not in self.families:
 							self.families[font.font.family] = {}
 						self.families[font.font.family][font.font.style] = file

diff --git a/version.py b/version.py
@@ -4,5 +4,5 @@
 
 WINDOWS = platform.system().lower() == "windows"
 
-VERSION = u'3.6.46'
+VERSION = u'3.6.45'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,5 +4,5 @@

		WINDOWS = platform.system().lower() == "windows"

		VERSION = u'3.6.46'
		VERSION = u'3.6.45'