Rollup of v0.13.x fixes

See v0.13-fixes branch for individual fixes

Conflicts:
	CHANGELOG.md
	lib/squib/version.rb
	squib.gemspec
This commit is contained in:
Andy Meneely
2017-07-17 11:31:53 -04:00
parent d94a3e676b
commit 10e63c845f
24 changed files with 577 additions and 569 deletions
+2 -2
View File
@@ -88,11 +88,11 @@ module Squib
cc.operator = paint.blend unless paint.blend == :none
if paint.mask.to_s.empty?
cc.render_rsvg_handle(svg, svg_args.id)
cc.render_rsvg_handle(svg, id: svg_args.id)
else
tmp = Cairo::ImageSurface.new(box.width / scale_width, box.height / scale_height)
tmp_cc = Cairo::Context.new(tmp)
tmp_cc.render_rsvg_handle(svg, svg_args.id)
tmp_cc.render_rsvg_handle(svg, id: svg_args.id)
cc.set_source_squibcolor(paint.mask)
cc.mask(tmp, 0, 0)
end
+1 -1
View File
@@ -30,7 +30,7 @@ module Squib
card.cairo_surface.finish
cc.save
cc.scale(0.8, 0.8) # I really don't know why I needed to do this at all. But 0.8 is the magic number to get this to scale right
cc.render_rsvg_handle(RSVG::Handle.new_from_file(card.svgfile), nil)
cc.render_rsvg_handle(Rsvg::Handle.new_from_file(card.svgfile))
cc.restore
else
abort "No such back end supported for save_pdf: #{backend}"