src/img2pdf.py: add more rationale behind palette encoding

This commit is contained in:
Johannes 'josch' Schauer 2018-08-20 10:21:18 +02:00
parent c0ed810036
commit 6c44d8cea6
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -317,6 +317,10 @@ if PY3:
string = string.encode('ascii') string = string.encode('ascii')
except UnicodeEncodeError: except UnicodeEncodeError:
string = b"\xfe\xff"+string.encode("utf-16-be") string = b"\xfe\xff"+string.encode("utf-16-be")
# We should probably encode more here because at least
# ghostscript interpretes a carriage return byte (0x0D) as a
# new line byte (0x0A)
# PDF supports: \n, \r, \t, \b and \f
string = string.replace(b'\\', b'\\\\') string = string.replace(b'\\', b'\\\\')
string = string.replace(b'(', b'\\(') string = string.replace(b'(', b'\\(')
string = string.replace(b')', b'\\)') string = string.replace(b')', b'\\)')
@ -780,6 +784,15 @@ def parse_png(rawdata):
if rawdata[i-4:i] == b"IDAT": if rawdata[i-4:i] == b"IDAT":
pngidat += rawdata[i:i+n] pngidat += rawdata[i:i+n]
elif rawdata[i-4:i] == b"PLTE": elif rawdata[i-4:i] == b"PLTE":
# This could be as simple as saying "palette = rawdata[i:i+n]" but
# pdfrw does only escape parenthesis and backslashes in the raw
# byte stream. But raw carriage return bytes are interpreted as
# line feed bytes by ghostscript. So instead we use the hex string
# format. pdfrw cannot write it but at least ghostscript is happy
# with it. We would also write out the palette in binary format
# (and escape more bytes) but since we cannot use pdfrw anyways,
# we choose the more human readable variant.
# See https://github.com/pmaupin/pdfrw/issues/147
for j in range(i, i+n, 3): for j in range(i, i+n, 3):
# with int.from_bytes() we would not have to prepend extra # with int.from_bytes() we would not have to prepend extra
# zeroes # zeroes