Fix a regression in 4.0 that broke rendering of PDF covers for PDF files that used JPEG2000 compression. Fixes #1847567 [Cover generation from PDF files is not working](https://bugs.launchpad.net/calibre/+bug/1847567)

This commit is contained in:
Kovid Goyal 2019-10-17 11:10:42 +05:30
parent 6abbf2221e
commit 10d5d8b6bc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 11 additions and 2 deletions

View File

@ -40,7 +40,7 @@ def binary_includes():
j(PREFIX, 'private', 'mozjpeg', 'bin', x) for x in ('jpegtran', 'cjpeg')] + [
] + list(map(
get_dll_path,
('usb-1.0 mtp expat sqlite3 ffi z poppler dbus-1 iconv xml2 xslt jpeg png16'
('usb-1.0 mtp expat sqlite3 ffi z openjp2 poppler dbus-1 iconv xml2 xslt jpeg png16'
' webp webpmux webpdemux exslt ncursesw readline chm hunspell-1.7'
' icudata icui18n icuuc icuio gcrypt gpg-error'
' gobject-2.0 glib-2.0 gthread-2.0 gmodule-2.0 gio-2.0 dbus-glib-1').split()

View File

@ -457,7 +457,7 @@ class Freeze(object):
@flush
def add_poppler(self):
print('\nAdding poppler')
for x in ('libpoppler.87.dylib',):
for x in ('libopenjp2.7.dylib', 'libpoppler.87.dylib',):
self.install_dylib(join(PREFIX, 'lib', x))
for x in ('pdftohtml', 'pdftoppm', 'pdfinfo'):
self.install_dylib(

View File

@ -306,6 +306,15 @@
}
},
{
"name": "openjpeg",
"unix": {
"filename": "openjpeg-2.3.1.tar.gz",
"hash": "sha256:63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9",
"urls": ["https://github.com/uclouvain/openjpeg/archive/v2.3.1/{filename}"]
}
},
{
"name": "poppler",
"unix": {