Kozea/WeasyPrint
1
1
Fork 0
mirror of https://github.com/Kozea/WeasyPrint.git synced 2024-10-05 00:21:15 +03:00
Code Issues Projects Releases Wiki Activity

Do not crash on SVG images without an intrinsic size.

Browse Source
This commit is contained in:
Simon Sapin 2012-06-04 09:02:47 +02:00
parent 86bb8eede8
commit a8efed1bf1
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
weasyprint/images.py
View File

@ -84,6 +84,9 @@ def cairosvg_handler(file_like, uri):
# Draw to a cairo surface but do not write to a file
tree = Tree(bytestring=bytestring, url=uri)
surface = ScaledSVGSurface(tree, output=None, dpi=96)
if not (surface.width > 0 and surface.height > 0):
raise ValueError(
'Images without an intrinsic size are not supported.')
pattern = cairo.SurfacePattern(surface.cairo)
return pattern, surface.width, surface.height

34
weasyprint/tests/test_draw.py
View File

@ -991,31 +991,29 @@ def test_images():
''')
with capture_logs() as logs:
assert_same_rendering(200, 30, [
('image_alt_text_reference', '''
(name, '''
<style>
@page { -weasy-size: 200px 30px }
body { margin: 0; background: #fff }
</style>
<div>Hello, world!</div>
'''),
('image_alt_text_not_found', '''
<style>
@page { -weasy-size: 200px 30px }
body { margin: 0; background: #fff }
</style>
<div><img src="inexistent2.png" alt="Hello, world!"></div>
'''),
('image_alt_text_no_src', '''
<style>
@page { -weasy-size: 200px 30px }
body { margin: 0; background: #fff }
</style>
<div><img alt="Hello, world!"></div>
'''),
<div>%s</div>
''' % html)
for name, html in [
('image_alt_text_reference', 'Hello, world!'),
('image_alt_text_not_found',
'<img src="inexistent2.png" alt="Hello, world!">'),
('image_alt_text_no_src',
'<img alt="Hello, world!">'),
('image_svg_no_intrinsic_size',
'''<img src="data:image/svg+xml,<svg></svg>"
alt="Hello, world!">'''),
]
])
assert len(logs) == 1
assert len(logs) == 2
assert 'WARNING: Error for image' in logs[0]
assert 'inexistent2.png' in logs[0]
assert 'WARNING: Error for image at data:image/svg+xml' in logs[1]
assert 'intrinsic size' in logs[1]
assert_pixels('image_0x1', 8, 8, no_image, '''
<style>