mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-28 04:19:59 +00:00
Code Issues Releases Wiki Activity

Solve inverted image pdf import (#1068)

Browse Source
This commit is contained in:
Ozzieisaacs 2019-10-21 19:12:22 +02:00
parent 2145be6db2
commit f758a1cc64
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cps/uploader.py
View File

@ -68,7 +68,7 @@ except ImportError as e:
use_fb2_meta = False use_fb2_meta = False
try: try:
from PIL import Image from PIL import Image, ImageOps
from PIL import __version__ as PILversion from PIL import __version__ as PILversion
use_PIL = True use_PIL = True
except ImportError as e: except ImportError as e:
@ -145,6 +145,10 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
languages="") languages="")
def CMYKInvert(img):
return Image.merge(img.mode,[ImageOps.invert(b.convert('L')) for b in img.split()])
def pdf_preview(tmp_file_path, tmp_dir): def pdf_preview(tmp_file_path, tmp_dir):
if use_generic_pdf_cover: if use_generic_pdf_cover:
return None return None
@ -159,10 +163,11 @@ def pdf_preview(tmp_file_path, tmp_dir):
if xObject[obj]['/Subtype'] == '/Image': if xObject[obj]['/Subtype'] == '/Image':
size = (xObject[obj]['/Width'], xObject[obj]['/Height']) size = (xObject[obj]['/Width'], xObject[obj]['/Height'])
data = xObject[obj]._data # xObject[obj].getData() data = xObject[obj]._data # xObject[obj].getData()
mode = "P"
if xObject[obj]['/ColorSpace'] == '/DeviceRGB': if xObject[obj]['/ColorSpace'] == '/DeviceRGB':
mode = "RGB" mode = "RGB"
else: if xObject[obj]['/ColorSpace'] == '/DeviceCMYK':
mode = "P" mode = "CMYK"
if '/Filter' in xObject[obj]: if '/Filter' in xObject[obj]:
if xObject[obj]['/Filter'] == '/FlateDecode': if xObject[obj]['/Filter'] == '/FlateDecode':
img = Image.frombytes(mode, size, data) img = Image.frombytes(mode, size, data)
@ -175,12 +180,20 @@ def pdf_preview(tmp_file_path, tmp_dir):
img = open(cover_file_name, "wb") img = open(cover_file_name, "wb")
img.write(data) img.write(data)
img.close() img.close()
if mode == 'CMYK':
img2 = Image.open(cover_file_name)# .convert('RGB')
img2 = CMYKInvert(img2)
img2.save(cover_file_name)
return cover_file_name return cover_file_name
elif xObject[obj]['/Filter'] == '/JPXDecode': elif xObject[obj]['/Filter'] == '/JPXDecode':
cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jp2" cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jp2"
img = open(cover_file_name, "wb") img = open(cover_file_name, "wb")
img.write(data) img.write(data)
img.close() img.close()
if mode == 'CMYK':
img2 = Image.open(cover_file_name)# .convert('RGB')
img2 = CMYKInvert(img2)
img2.save(cover_file_name)
return cover_file_name return cover_file_name
else: else:
img = Image.frombytes(mode, size, data) img = Image.frombytes(mode, size, data)