phantom_svg 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18f99a7628287a82ef66f940b39600f89297d9e2
-  data.tar.gz: c2bd3e70192b8e27330905329355a86794e64e9a
+  metadata.gz: c6580bef212ec7f4f1d43dc3405e0243b95ae9fd
+  data.tar.gz: 11c27a5533bb0c7ae2e05f95cc1782878d4200fb
 SHA512:
-  metadata.gz: 350c5c93b3691d385b5b4c8152cbb488b36869c66b2e89c5c479084cb6f76d5985c17b8575b5ced6b72a437dc801d0b2fddb33658353a759a9e2884f0440028f
-  data.tar.gz: ef0dcd3d8ffb2ea1a77db9ca7bff109c1ca7f65d31be7a4352599a97d8c8cf2ee753e3ad4a85817a7632100ce4ed6104442a064f60b5da3fee7da4ed154d6253
+  metadata.gz: 17d4cdb9a98c7aa7e9397fb1ddae4ab4370b375de8f703252e1022b9067aff5cca3966054b7493be1eef64e7d5f5c0f1dd17792cdcdbd5d68a6d0e541901e621
+  data.tar.gz: fd59d981ca5e03034e333f8586d130114e9b35b886f5e172b6f78abefe384ac0602cc665359f4df2344f4b84621a6b60255365a99eec5c9325879d933bf76fb6

data/lib/phantom/frame.rb

@@ -27,7 +27,7 @@ module Phantom
 
         def set_from_text(text)
           values = text.split(' ', 4)
-          initialize(values[0], values[1], values[2], values[3])
+          initialize(values[0].to_i, values[1].to_i, values[2].to_i, values[3].to_i)
           self
         end
 

data/lib/phantom/parser/abstract_image_reader.rb

@@ -0,0 +1,34 @@
+
+module Phantom
+  module SVG
+    module Parser
+      # Image reader.
+      class AbstractImageReader
+        attr_reader :frames, :width, :height, :loops, :skip_first, :has_animation
+        alias_method :has_animation?, :has_animation
+
+        # Construct AbstractImageReader object.
+        def initialize(path = nil, options = {})
+          read(path, options)
+        end
+
+        # Read image file from path.
+        def read(path, options = {})
+          fail 'Called abstract method.'
+        end
+
+        private
+
+        # Reset SVGReader object.
+        def reset
+          @frames = []
+          @width = nil
+          @height = nil
+          @loops = nil
+          @skip_first = nil
+          @has_animation = false
+        end
+      end # class AbstractImageReader
+    end # module Parser
+  end # module SVG
+end # module Phantom

data/lib/phantom/parser/abstract_image_writer.rb

@@ -0,0 +1,20 @@
+
+module Phantom
+  module SVG
+    module Parser
+      # Image writer.
+      class AbstractImageWriter
+        # Construct AbstractImageWriter object.
+        def initialize(path = nil, object = nil)
+          write(path, object)
+        end
+
+        # Write image file from object to path.
+        # Return write size.
+        def write(path, object)
+          fail 'Called abstract method.'
+        end
+      end # class AbstractImageWriter
+    end # module Parser
+  end # module SVG
+end # module Phantom

data/lib/phantom/parser/gif_reader.rb

@@ -0,0 +1,66 @@
+require 'rexml/document'
+require 'RMagick'
+require 'rsvg2'
+
+require_relative '../frame'
+require_relative 'abstract_image_reader'
+
+module Phantom
+  module SVG
+    module Parser
+      # GIF reader.
+      class GIFReader < AbstractImageReader
+        include Magick
+        # Read gif file from path.
+        def read(path, options = {})
+          reset
+
+          return if path.nil? || path.empty?
+
+          frames = create_frames(path)
+          @frames += frames
+          @width = "#{frames.first.width}px"
+          @height = "#{frames.first.height}px"
+        end
+
+        private
+
+        # Create frames for each frame in the gif.
+        def create_frames(path, duration = nil)
+          frames = []
+          lst = ImageList.new path
+
+          lst.each do |img|
+            frame = Phantom::SVG::Frame.new
+            frame.width = "#{img.columns}px"
+            frame.height = "#{img.rows}px"
+            frame.viewbox.set_from_text("0 0 #{img.columns} #{img.rows}")
+            frame.surfaces = create_surfaces(path, img.columns, img.rows)
+            frame.duration = img.delay * 10.0 unless img.delay.nil?
+            frame.namespaces = {
+              'xmlns' => 'http://www.w3.org/2000/svg',
+              'xlink' => 'http://www.w3.org/1999/xlink'
+            }
+            frames << frame
+          end
+         frames
+        end
+
+        # Create surfaces.
+        def create_surfaces(path, width, height)
+          bin = File.binread(path)
+          base64 = [bin].pack('m')
+
+          image = REXML::Element.new('image')
+          image.add_attributes(
+            'width' => width,
+            'height' => height,
+            'xlink:href' => "data:image/gif;base64,#{base64}"
+          )
+
+          [image]
+        end
+      end # class GIFReader
+    end # module Parser
+  end # module SVG
+end # module Phantom

data/lib/phantom/parser/jpeg_reader.rb

@@ -0,0 +1,61 @@
+require 'rsvg2'
+require 'rexml/document'
+
+require_relative '../frame'
+require_relative 'abstract_image_reader'
+
+module Phantom
+  module SVG
+    module Parser
+      # JPEG reader.
+      class JPEGReader < AbstractImageReader
+        # Read jpeg file from path.
+        def read(path, options = {})
+          reset
+
+          return if path.nil? || path.empty?
+
+          frame = create_frame(path)
+          @frames << frame
+          @width = "#{frame.width}px"
+          @height = "#{frame.height}px"
+        end
+
+        private
+
+        # Create frame.
+        def create_frame(path, duration = nil)
+          pixbuf = Gdk::Pixbuf.new(path)
+
+          frame = Phantom::SVG::Frame.new
+          frame.width = "#{pixbuf.width}px"
+          frame.height = "#{pixbuf.height}px"
+          frame.viewbox.set_from_text("0 0 #{pixbuf.width} #{pixbuf.height}")
+          frame.surfaces = create_surfaces(path, pixbuf.width, pixbuf.height)
+          frame.duration = duration unless duration.nil?
+          frame.namespaces = {
+            'xmlns' => 'http://www.w3.org/2000/svg',
+            'xlink' => 'http://www.w3.org/1999/xlink'
+          }
+
+          frame
+        end
+
+        # Create surfaces.
+        def create_surfaces(path, width, height)
+          bin = File.binread(path)
+          base64 = [bin].pack('m')
+
+          image = REXML::Element.new('image')
+          image.add_attributes(
+            'width' => width,
+            'height' => height,
+            'xlink:href' => "data:image/jpeg;base64,#{base64}"
+          )
+
+          [image]
+        end
+      end # class JPEGReader
+    end # module Parser
+  end # module SVG
+end # module Phantom

data/lib/phantom/parser/png_reader.rb

@@ -0,0 +1,98 @@
+
+require 'rapngasm'
+require 'rsvg2'
+require 'tmpdir'
+require 'rexml/document'
+
+require_relative '../frame.rb'
+require_relative 'abstract_image_reader.rb'
+
+module Phantom
+  module SVG
+    module Parser
+      # PNG reader.
+      class PNGReader < AbstractImageReader
+        # Read png file from path.
+        def read(path, options = {})
+          reset
+
+          return if path.nil? || path.empty?
+
+          apngasm = APNGAsm.new
+          apngasm.disassemble(path)
+
+          if apngasm.frame_count == 1
+            read_png(path)
+          else
+            read_apng(apngasm)
+          end
+        end
+
+        private
+
+        def read_png(path)
+          frame = create_frame(path)
+          @frames << frame
+          @width = "#{frame.width}px"
+          @height = "#{frame.height}px"
+        end
+
+        def read_apng(apngasm)
+          @width = @height = 0
+          Dir.mktmpdir(nil, File.dirname(__FILE__)) do |dir|
+            # Create temporary file.
+            apngasm.save_pngs(dir)
+
+            # Create frames.
+            apngasm.get_frames.each_with_index do |png_frame, index|
+              @width = png_frame.width if @width < png_frame.width
+              @height = png_frame.height if @height < png_frame.height
+              duration = png_frame.delay_numerator.to_f / png_frame.delay_denominator.to_f
+              @frames << create_frame("#{dir}/#{index}.png", duration)
+            end
+          end
+
+          @width = "#{@width}px"
+          @height = "#{@height}px"
+          @loops = apngasm.get_loops
+          @skip_first = apngasm.is_skip_first
+          @has_animation = true
+        end
+
+        # Create frame.
+        def create_frame(path, duration = nil)
+          pixbuf = Gdk::Pixbuf.new(path)
+
+          frame = Phantom::SVG::Frame.new
+          frame.width = "#{pixbuf.width}px"
+          frame.height = "#{pixbuf.height}px"
+          frame.viewbox.set_from_text("0 0 #{pixbuf.width} #{pixbuf.height}")
+          frame.surfaces = create_surfaces(path, pixbuf.width, pixbuf.height)
+          frame.duration = duration unless duration.nil?
+          frame.namespaces = {
+            'xmlns' => 'http://www.w3.org/2000/svg',
+            'xlink' => 'http://www.w3.org/1999/xlink'
+          }
+
+          frame
+        end
+
+        # Create surfaces.
+        def create_surfaces(path, width, height)
+          bin = File.binread(path)
+          base64 = [bin].pack('m')
+
+          image = REXML::Element.new('image')
+          image.add_attributes(
+            'width' => width,
+            'height' => height,
+            'xlink:href' => "data:image/png;base64,#{base64}"
+          )
+
+          [image]
+        end
+
+      end # class PNGReader
+    end # Parser
+  end # SVG
+end # Phantom

data/lib/phantom/parser/png_writer.rb

@@ -0,0 +1,57 @@
+
+require 'tmpdir'
+require 'rapngasm'
+require 'cairo'
+
+require_relative 'svg_writer.rb'
+require_relative 'abstract_image_writer.rb'
+
+module Phantom
+  module SVG
+    module Parser
+      # Image writer.
+      class PNGWriter < AbstractImageWriter
+        # Write png file from object to path.
+        # Return write size.
+        def write(path, object)
+          return 0 if path.nil? || path.empty? || object.nil?
+
+          object.set_size
+
+          apngasm = APNGAsm.new
+          convert_frames(apngasm, object)
+          result = apngasm.assemble(path)
+
+          result
+        end
+
+        private
+
+        def convert_frames(apngasm, object)
+          apngasm.set_loops(object.loops)
+          apngasm.set_skip_first(object.skip_first)
+
+          Dir.mktmpdir(nil, File.dirname(__FILE__)) do |dir|
+            object.frames.each_with_index do |frame, index|
+              tmp_file_path = "#{dir}/tmp#{index}"
+              create_temporary_file(tmp_file_path, frame, object.width.to_i, object.height.to_i)
+              apngasm.add_frame_file("#{tmp_file_path}.png", frame.duration.to_f * 1000, 1000)
+            end
+          end
+        end
+
+        def create_temporary_file(path, frame, width, height)
+          Parser::SVGWriter.new.write("#{path}.svg", frame)
+
+          handle = RSVG::Handle.new_from_file("#{path}.svg")
+          surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32, width, height)
+          context = Cairo::Context.new(surface)
+          context.scale(width.to_f / handle.dimensions.width, height.to_f / handle.dimensions.height)
+          context.render_rsvg_handle(handle)
+          surface.write_to_png("#{path}.png")
+          surface.finish
+        end
+      end # class PNGWriter
+    end # module Parser
+  end # module SVG
+end # module Phantom

data/lib/phantom/parser/svg_reader.rb

@@ -2,20 +2,13 @@
 require 'rexml/document'
 
 require_relative '../frame.rb'
+require_relative 'abstract_image_reader.rb'
 
 module Phantom
   module SVG
     module Parser
       # SVG reader.
-      class SVGReader
-        attr_reader :frames, :width, :height, :loops, :skip_first, :has_animation
-        alias_method :has_animation?, :has_animation
-
-        # Construct SVGReader object.
-        def initialize(path = nil, options = {})
-          read(path, options)
-        end
-
+      class SVGReader < AbstractImageReader
         # Read svg file from path.
         def read(path, options = {})
           reset
@@ -35,16 +28,6 @@ module Phantom
 
         private
 
-        # Reset SVGReader object.
-        def reset
-          @frames = []
-          @width = nil
-          @height = nil
-          @loops = nil
-          @skip_first = nil
-          @has_animation = false
-        end
-
         # Read no animation svg.
         def read_svg(options)
           read_images(@root, options)
@@ -66,13 +49,13 @@ module Phantom
         def read_size(node, dest, options = {})
           dest.viewbox.set_from_text(choice_value(node.attributes['viewBox'], options[:viewbox]).to_s) unless node.attributes['viewBox'].nil?
 
-          if node.attributes['width'].nil? then
+          if node.attributes['width'].nil?
             dest.instance_variable_set(:@width, choice_value("#{dest.viewbox.width}px", options[:width]))
           else
             dest.instance_variable_set(:@width, choice_value(node.attributes['width'], options[:width]))
           end
 
-          if node.attributes['height'].nil? then
+          if node.attributes['height'].nil?
             dest.instance_variable_set(:@height, choice_value("#{dest.viewbox.height}px", options[:height]))
           else
             dest.instance_variable_set(:@height, choice_value(node.attributes['height'], options[:height]))

data/lib/phantom/parser/svg_writer.rb

@@ -1,16 +1,13 @@
 
 require 'rexml/document'
 
+require_relative 'abstract_image_writer.rb'
+
 module Phantom
   module SVG
     module Parser
       # SVG writer.
-      class SVGWriter
-        # Construct SVGWriter object.
-        def initialize(path = nil, object = nil)
-          write(path, object)
-        end
-
+      class SVGWriter < AbstractImageWriter
         # Write svg file from object to path.
         # Return write size.
         def write(path, object)

data/lib/phantom/svg.rb

@@ -1,15 +1,17 @@
 
-require_relative 'frame.rb'
-require_relative 'parser/raster.rb'
-require_relative 'parser/svg_reader.rb'
-require_relative 'parser/svg_writer.rb'
-require_relative 'parser/json_animation_reader.rb'
-require_relative 'parser/xml_animation_reader.rb'
+require_relative 'frame'
+require_relative 'parser/png_reader'
+require_relative 'parser/png_writer'
+require_relative 'parser/svg_reader'
+require_relative 'parser/svg_writer'
+require_relative 'parser/jpeg_reader'
+require_relative 'parser/gif_reader'
+require_relative 'parser/json_animation_reader'
+require_relative 'parser/xml_animation_reader'
 
 module Phantom
   module SVG
     class Base
-      include Parser::Raster
       attr_accessor :frames, :width, :height, :loops, :skip_first
 
       def initialize(path = nil, options = {})
@@ -31,6 +33,9 @@ module Phantom
           case File.extname(file)
           when '.svg'   then  load_from_svg(file, options)
           when '.png'   then  load_from_png(file, options)
+          when '.jpg'   then  load_from_jpeg(file, options)
+          when '.jpeg'  then  load_from_jpeg(file, options)
+          when '.gif'   then  load_from_gif(file, options)
           when '.json'  then  load_from_json(file, options)
           when '.xml'   then  load_from_xml(file, options)
           end
@@ -47,17 +52,42 @@ module Phantom
         end
       end
 
-      def set_size
-        @width = 0
-        @height = 0
-        frames.each do |frame|
-          @width = frame.width.to_i if frame.width.to_i > @width
-          @height = frame.height.to_i if frame.height.to_i > @height
+      def set_size(width = nil, height = nil)
+        # width
+        if width.nil? then
+          if @width.nil? || @width == 0 then
+            frames.each do |frame|
+              @width = frame.width.to_i if frame.width.to_i > @width
+            end
+          end
+        else
+          @width = width
+        end
+
+        # height
+        if height.nil? then
+          if @height.nil? || @height == 0 then
+            frames.each do |frame|
+              @height = frame.height.to_i if frame.height.to_i > @height
+            end
+          end
+        else
+          @height = height
         end
       end
 
+      def scale_w(width)
+        @height = (@height.to_i * width.to_i / @width.to_i).to_i
+        @width = width.to_i
+      end
+
+      def scale_h(height)
+        @width = (@width.to_i * height.to_i / @height.to_i).to_i
+        @height = height.to_i
+      end
+
       def save_svg(path)
-        set_size if @width.to_i == 0 || @height.to_i == 0
+        set_size
 
         Parser::SVGWriter.new.write(path, self)
       end
@@ -77,7 +107,7 @@ module Phantom
       end
 
       def save_apng(path)
-        save_rasterized(path)
+        Parser::PNGWriter.new.write(path, self)
       end
 
       # Calculate and return total duration.
@@ -105,7 +135,39 @@ module Phantom
       end
 
       def load_from_png(path, options)
-        load_raster(path, @frames.size)
+        reader = Parser::PNGReader.new(path, options)
+        if reader.has_animation?
+          @width = reader.width
+          @height = reader.height
+          @loops = reader.loops
+          @skip_first = reader.skip_first
+        end
+
+        @frames += reader.frames
+      end
+
+      def load_from_jpeg(path, options)
+        reader = Parser::JPEGReader.new(path, options)
+        if reader.has_animation?
+          @width = reader.width
+          @height = reader.height
+          @loops = reader.loops
+          @skip_first = reader.skip_first
+        end
+
+        @frames += reader.frames
+      end
+
+      def load_from_gif(path, option)
+        reader = Parser::GIFReader.new(path, option)
+        if reader.has_animation?
+          @width = reader.width
+          @height = reader.height
+          @loops = reader.loops
+          @skip_first = reader.skip_first
+        end
+
+        @frames += reader.frames
       end
 
       def load_from_json(path, options)

data/phantom_svg.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = 'phantom_svg'
-  s.version       = '1.0.4'
+  s.version       = '1.0.5'
   s.license       = 'LGPL-3.0'
   s.summary       = 'Hight end SVG manipulation tools for Ruby'
   s.description   = 'Hight end SVG manipulation tools for Ruby.\n' \
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'cairo', '~> 1.12'
   s.add_dependency 'rapngasm', '~> 3.1'
   s.add_dependency 'rsvg2', '~> 2.2'
+  s.add_dependency 'rmagick', '~> 2.13'
 end

data/spec/phantom/svg_spec.rb

@@ -227,8 +227,8 @@ describe Phantom::SVG::Base do
     it 'loads and saves PNG.' do
       @loader.add_frame_from_file("#{SPEC_SOURCE_DIR}/test_raster.png")
       expect(@loader.frames.size).to eq(1)
-      expect(@loader.frames.first.width).to eq("256px")
-      expect(@loader.frames.first.height).to eq("128px")
+      expect(@loader.frames.first.width).to eq('256px')
+      expect(@loader.frames.first.height).to eq('128px')
       expect(@loader.frames.first.viewbox.width).to eq(256)
       expect(@loader.frames.first.viewbox.height).to eq(128)
 
@@ -243,8 +243,8 @@ describe Phantom::SVG::Base do
     it 'loads and saves an irrigularly proportioned PNG' do
       @loader.add_frame_from_file("#{SPEC_SOURCE_DIR}/small_v_raster.png")
       expect(@loader.frames.size).to eq(1)
-      expect(@loader.frames.first.width).to eq("33px")
-      expect(@loader.frames.first.height).to eq("54px")
+      expect(@loader.frames.first.width).to eq('33px')
+      expect(@loader.frames.first.height).to eq('54px')
       expect(@loader.frames.first.viewbox.width).to eq(33)
       expect(@loader.frames.first.viewbox.height).to eq(54)
 
@@ -502,4 +502,66 @@ describe Phantom::SVG::Base do
       expect(@loader.frames[1].duration).to eq(0.05)
     end
   end
+
+  describe 'creating an animated SVG file from a JPEG files.' do
+    before(:all) do
+      @image_name = 'jpeg_test'
+      @source_dir = "#{SPEC_SOURCE_DIR}/#{@image_name}"
+      @destination_dir = SPEC_TEMP_DIR
+    end
+
+    before do
+      @loader = Phantom::SVG::Base.new
+    end
+
+    it "loads frames." do
+      test_name = 'jpeg_test'
+      @loader.add_frame_from_file("#{@source_dir}/*.jpg")
+      expect(@loader.frames.size).to eq(34)
+      @loader.frames.each do |frame|
+        expect(frame.duration.instance_of?(Float)).to eq(true)
+        expect(frame.width).to eq('64px')
+        expect(frame.height).to eq('64px')
+        expect(frame.surfaces).not_to be_nil
+        expect(frame.surfaces).not_to be_empty
+        expect(frame.surfaces.to_s.length).not_to eq(1)
+        expect(frame.namespaces).not_to be_empty
+      end
+      write_size = @loader.save_svg("#{@destination_dir}/#{test_name}.svg")
+      expect(write_size).not_to eq(0)
+      write_size = @loader.save_apng("#{@destination_dir}/#{test_name}.png")
+      expect(write_size).not_to eq(0)
+    end
+  end
+
+  describe 'creating an animated SVG file from a GIF files.' do
+    before(:all) do
+      @image_name = 'apngasm'
+      @source = "#{SPEC_SOURCE_DIR}/#{@image_name}.gif"
+      @destination_dir = SPEC_TEMP_DIR
+    end
+
+    before do
+      @loader = Phantom::SVG::Base.new
+    end
+
+    it "loads frames / saves to SVG and PNG" do
+      test_name = 'gif_test'
+      @loader.add_frame_from_file(@source)
+      expect(@loader.frames.size).to eq(34)
+      @loader.frames.each do |frame|
+        expect(frame.duration.instance_of?(Float)).to eq(true)
+        expect(frame.width).to eq('64px')
+        expect(frame.height).to eq('64px')
+        expect(frame.surfaces).not_to be_nil
+        expect(frame.surfaces).not_to be_empty
+        expect(frame.surfaces.to_s.length).not_to eq(1)
+        expect(frame.namespaces).not_to be_empty
+      end
+      write_size = @loader.save_svg("#{@destination_dir}/#{test_name}.svg")
+      expect(write_size).not_to eq(0)
+      write_size = @loader.save_apng("#{@destination_dir}/#{test_name}.png")
+      expect(write_size).not_to eq(0)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom_svg
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Rika Yoshida
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -54,6 +54,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
 description: Hight end SVG manipulation tools for Ruby.\nIncludes chained keyframe
   generation, (A)PNG conversion and more.
 email: info@genshin.org
@@ -71,16 +85,56 @@ files:
 - README.md
 - lib/phantom/frame.rb
 - lib/phantom/parser/abstract_animation_reader.rb
+- lib/phantom/parser/abstract_image_reader.rb
+- lib/phantom/parser/abstract_image_writer.rb
+- lib/phantom/parser/gif_reader.rb
+- lib/phantom/parser/jpeg_reader.rb
 - lib/phantom/parser/json_animation_reader.rb
-- lib/phantom/parser/raster.rb
+- lib/phantom/parser/png_reader.rb
+- lib/phantom/parser/png_writer.rb
 - lib/phantom/parser/svg_reader.rb
 - lib/phantom/parser/svg_writer.rb
 - lib/phantom/parser/xml_animation_reader.rb
 - lib/phantom/svg.rb
 - lib/phantom_svg.rb
 - phantom_svg.gemspec
+- spec/images/apngasm.gif
 - spec/images/apngasm.png
 - spec/images/compiled.svg
+- spec/images/jpeg_test/1.jpg
+- spec/images/jpeg_test/10.jpg
+- spec/images/jpeg_test/11.jpg
+- spec/images/jpeg_test/12.jpg
+- spec/images/jpeg_test/13.jpg
+- spec/images/jpeg_test/14.jpg
+- spec/images/jpeg_test/15.jpg
+- spec/images/jpeg_test/16.jpg
+- spec/images/jpeg_test/17.jpg
+- spec/images/jpeg_test/18.jpg
+- spec/images/jpeg_test/19.jpg
+- spec/images/jpeg_test/2.jpg
+- spec/images/jpeg_test/20.jpg
+- spec/images/jpeg_test/21.jpg
+- spec/images/jpeg_test/22.jpg
+- spec/images/jpeg_test/23.jpg
+- spec/images/jpeg_test/24.jpg
+- spec/images/jpeg_test/25.jpg
+- spec/images/jpeg_test/26.jpg
+- spec/images/jpeg_test/27.jpg
+- spec/images/jpeg_test/28.jpg
+- spec/images/jpeg_test/29.jpg
+- spec/images/jpeg_test/3.jpg
+- spec/images/jpeg_test/30.jpg
+- spec/images/jpeg_test/31.jpg
+- spec/images/jpeg_test/32.jpg
+- spec/images/jpeg_test/33.jpg
+- spec/images/jpeg_test/34.jpg
+- spec/images/jpeg_test/4.jpg
+- spec/images/jpeg_test/5.jpg
+- spec/images/jpeg_test/6.jpg
+- spec/images/jpeg_test/7.jpg
+- spec/images/jpeg_test/8.jpg
+- spec/images/jpeg_test/9.jpg
 - spec/images/plain.svg
 - spec/images/small_v_raster.png
 - spec/images/test_frames/0.svg
@@ -132,8 +186,43 @@ signing_key:
 specification_version: 4
 summary: Hight end SVG manipulation tools for Ruby
 test_files:
+- spec/images/apngasm.gif
 - spec/images/apngasm.png
 - spec/images/compiled.svg
+- spec/images/jpeg_test/1.jpg
+- spec/images/jpeg_test/10.jpg
+- spec/images/jpeg_test/11.jpg
+- spec/images/jpeg_test/12.jpg
+- spec/images/jpeg_test/13.jpg
+- spec/images/jpeg_test/14.jpg
+- spec/images/jpeg_test/15.jpg
+- spec/images/jpeg_test/16.jpg
+- spec/images/jpeg_test/17.jpg
+- spec/images/jpeg_test/18.jpg
+- spec/images/jpeg_test/19.jpg
+- spec/images/jpeg_test/2.jpg
+- spec/images/jpeg_test/20.jpg
+- spec/images/jpeg_test/21.jpg
+- spec/images/jpeg_test/22.jpg
+- spec/images/jpeg_test/23.jpg
+- spec/images/jpeg_test/24.jpg
+- spec/images/jpeg_test/25.jpg
+- spec/images/jpeg_test/26.jpg
+- spec/images/jpeg_test/27.jpg
+- spec/images/jpeg_test/28.jpg
+- spec/images/jpeg_test/29.jpg
+- spec/images/jpeg_test/3.jpg
+- spec/images/jpeg_test/30.jpg
+- spec/images/jpeg_test/31.jpg
+- spec/images/jpeg_test/32.jpg
+- spec/images/jpeg_test/33.jpg
+- spec/images/jpeg_test/34.jpg
+- spec/images/jpeg_test/4.jpg
+- spec/images/jpeg_test/5.jpg
+- spec/images/jpeg_test/6.jpg
+- spec/images/jpeg_test/7.jpg
+- spec/images/jpeg_test/8.jpg
+- spec/images/jpeg_test/9.jpg
 - spec/images/plain.svg
 - spec/images/small_v_raster.png
 - spec/images/test_frames/0.svg

data/lib/phantom/parser/raster.rb

@@ -1,115 +0,0 @@
-require 'rapngasm'
-require 'rsvg2'
-require 'tmpdir'
-require 'cairo'
-
-require_relative '../frame.rb'
-
-module Phantom
-  module SVG
-    module Parser
-      module Raster
-        def load_raster(path, id)
-          apngasm = APNGAsm.new
-          apngasm.disassemble(path)
-
-          if apngasm.frame_count == 1 
-            @frames << create_frame_from_png(path, id)
-          else
-            create_frame_from_apng(apngasm, id)
-          end
-
-          apngasm.reset
-        end
-
-        def create_frame_from_png(path, id, duration = nil)
-          pixbuf = Gdk::Pixbuf.new(path)
-
-          frame = Phantom::SVG::Frame.new( { width: pixbuf.width, height: pixbuf.height } )
-          frame.width = "#{pixbuf.width}px"
-          frame.height = "#{pixbuf.height}px"
-          frame.surfaces = create_surfaces(path, pixbuf.width, pixbuf.height)
-          frame.duration = duration unless duration.nil?
-          frame.namespaces = {
-            'xmlns' => 'http://www.w3.org/2000/svg',
-            'xlink' => 'http://www.w3.org/1999/xlink'
-          }
-
-          frame
-        end
-
-        def create_frame_from_apng(apngasm, id)
-          png_frames = apngasm.get_frames
-          width = 0
-          height = 0
-          Dir::mktmpdir(nil, File.dirname(__FILE__)) do |dir|
-            apngasm.save_pngs(dir)
-            png_frames.each_with_index do |png_frame, i|
-              width = png_frame.width if width < png_frame.width
-              height = png_frame.height if height < png_frame.height
-              duration = png_frame.delay_numerator.to_f / png_frame.delay_denominator.to_f
-              @frames << create_frame_from_png("#{dir}/#{i}.png", id, duration)
-            end
-          end
-          @width = "#{width}px"
-          @height = "#{height}px"
-          @loops = apngasm.get_loops
-          @skip_first = apngasm.is_skip_first
-        end
-
-        def create_surfaces(path, width, height)
-          bin = File.binread(path)
-          base64 = [bin].pack('m')
-
-          image = REXML::Element.new('image')
-          image.add_attributes(
-            'width' => width,
-            'height' => height,
-            'xlink:href' => "data:image/png;base64,#{base64}"
-          )
-
-          [image]
-        end
-
-        def save_rasterized(path)
-          set_size if @width.to_i == 0 || @height.to_i == 0
-
-          apngasm = APNGAsm.new
-          apngasm.set_loops(@loops)
-          apngasm.set_skip_first(@skip_first)
-
-          Dir::mktmpdir(nil, File.dirname(__FILE__)) do |dir|
-            @frames.each_with_index do |frame, i|
-              create_tmp_file("#{dir}/tmp#{i}", frame)
-              apngasm.add_frame_file("#{dir}/tmp#{i}.png", frame.duration.to_f * 1000, 1000)
-            end
-          end
-
-          result = apngasm.assemble(path)
-          apngasm.reset
-
-          result
-        end
-
-        def create_tmp_file(path, frame)
-          save_svg_frame("#{path}.svg", frame, @width, @height)
-          convert_to_png(path, frame)
-        end
-
-        def convert_to_png(path, frame)
-          handle = RSVG::Handle.new_from_file("#{path}.svg")
-
-          w = @width.to_i
-          h = @height.to_i
-          surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32, w, h)
-          context = Cairo::Context.new(surface)
-          context.scale(w / handle.dimensions.width, h / handle.dimensions.height)
-          context.render_rsvg_handle(handle)
-
-          surface.write_to_png("#{path}.png")
-          surface.finish
-        end
-      end
-    end
-  end
-end