Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix comparations for image colorspace literals #132

Merged
merged 6 commits into from
Oct 15, 2019
Merged

Fix comparations for image colorspace literals #132

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c44bba
Fix comparations for image colorspace literals
bashkirtsevich Mar 25, 2018
b013d9d
Added: test for extracting images from pdfs
pietermarsman Oct 15, 2019
e7bf910
Merge branch 'develop' into master
pietermarsman Oct 15, 2019
cd1462a
Use absolute path to test pdfs in new test
pietermarsman Oct 15, 2019
5868e3d
Merge branch 'master' of github.com:bashkirtsevich/pdfminer.six
pietermarsman Oct 15, 2019
eb5f717
Use mkdtemp and shutil instead of TemporaryDirectory to make python2 …
pietermarsman Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pdfminer/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def export_image(self, image):
if len(filters) == 1 and filters[0][0] in LITERALS_DCT_DECODE:
ext = '.jpg'
elif (image.bits == 1 or
image.bits == 8 and image.colorspace in (LITERAL_DEVICE_RGB, LITERAL_DEVICE_GRAY)):
image.bits == 8 and (LITERAL_DEVICE_RGB in image.colorspace or LITERAL_DEVICE_GRAY in image.colorspace)):
ext = '.%dx%d.bmp' % (width, height)
else:
ext = '.%d.%dx%d.img' % (image.bits, width, height)
Expand All @@ -101,15 +101,15 @@ def export_image(self, image):
for y in range(height):
bmp.write_line(y, data[i:i+width])
i += width
elif image.bits == 8 and image.colorspace is LITERAL_DEVICE_RGB:
elif image.bits == 8 and LITERAL_DEVICE_RGB in image.colorspace:
bmp = BMPWriter(fp, 24, width, height)
data = stream.get_data()
i = 0
width = width*3
for y in range(height):
bmp.write_line(y, data[i:i+width])
i += width
elif image.bits == 8 and image.colorspace is LITERAL_DEVICE_GRAY:
elif image.bits == 8 and LITERAL_DEVICE_GRAY in image.colorspace:
bmp = BMPWriter(fp, 8, width, height)
data = stream.get_data()
i = 0
Expand Down