Anshorei/squib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Card - improve error message when reading invalid svg files

Browse Source 
Add a test file in samples/images - it's a simple 1x1 pixel white png
saved with a 'svg' extension.

Fix for #228

(cherry picked from commit 32fad2460753a72cc2b0100d0a132512b6eeed81)

# Conflicts:
#	lib/squib/graphics/image.rb
This commit is contained in:
Dave Schaefer
2017-10-05 10:33:00 -04:00
committed by Andy Meneely
parent 4e92b1ae31
commit 52920ab8f0
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/squib/graphics/image.rb
+6 -1
View File
@@ -67,7 +67,12 @@ module Squib
Squib.logger.warn 'Both an SVG file and SVG data were specified' unless file.to_s.empty? || svg_args.data.to_s.empty?
return if (file.nil? or file.eql? '') and svg_args.data.nil? # nothing specified TODO Move this out to arg validator
svg_args.data = File.read(file) if svg_args.data.to_s.empty?
svg = Rsvg::Handle.new_from_data(svg_args.data)
begin
svg = Rsvg::Handle.new_from_data(svg_args.data)
rescue Rsvg::Error::Failed
Squib.logger.error "Invalid SVG data. Is '#{file}' a valid svg file?"
return
end
box.width = svg.width if box.width == :native
box.height = svg.height if box.height == :native
box.width = svg.width.to_f * box.height.to_f / svg.height.to_f if box.width == :scale