freetype 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c2f7532d91429764270bdc7316fc3ee03a4a8d
-  data.tar.gz: cf42c742f3acbcc1f8cda8a7902e105e119c1adc
+  metadata.gz: 099515f5fe4f9754fb7aa4417465c70ac6c12a58
+  data.tar.gz: 6d877f7464b31d97bf396af910e3a5f2612c41d2
 SHA512:
-  metadata.gz: abe501704c8749c4b2c4adb158bc72fdaf753c7fc96060d6abddc13636cb7122f195e64db7b32c0988e0168e00cd565d928536146c5de7b6ccf2caf6bd8c46d7
-  data.tar.gz: 426bb5fee8d00fa3724f89d4da492f0be9eb80b5106fef7ce58e22c62227d17944f14a7663a4208478a3cc9863c2b9c79226c8faa2d4be3c779e6c54e44e1d39
+  metadata.gz: b054d86d64169dfe0861e19b9a04ff33a6ad2e24e8859f472c03cd8947aeb9eb2d28fb37a4c3748c2c77585f78620f120437c848048d2d4d6e572e3832bb4f8f
+  data.tar.gz: 774ead96dff55241ecc59273ab2ea215b6c89fbbaaf8640627db664f59dfa3e3d8a3a153691147483952c31ab18152b829d11ab41a54c40796e73273cd012b9e

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.8
+  - 2.1.7 # ffi is not support to 2.1.8
   - 2.2.4
   - 2.3.0
 matrix:
@@ -9,4 +9,4 @@ matrix:
     - rvm: ruby-head
 notifications:
   email: false
-before_install: gem install bundler -v 1.10.6
+before_install: gem install bundler -v 1.11.2

data/lib/freetype/api.rb

@@ -204,6 +204,33 @@ module FreeType
         return [] if @outline[:n_points] == 0
         @outline[:tags].get_array_of_char(0, @outline[:n_points])
       end
+
+      def svg_path_data
+        commands = []
+        outline_funcs = FreeType::C::FT_Outline_Funcs.new
+        outline_funcs[:move_to] = proc do |to|
+          commands << [:M, to[:x], -to[:y]]
+          0
+        end
+        outline_funcs[:line_to] = proc do |to|
+          commands << [:L, to[:x], -to[:y]]
+          0
+        end
+        outline_funcs[:conic_to] = proc do |ctrl, to|
+          commands << [:Q, ctrl[:x], -ctrl[:y], to[:x], -to[:y]]
+          0
+        end
+        outline_funcs[:cubic_to] = proc do |ctrl1, ctrl2, to|
+          commands << [:C, ctrl1[:x], -ctrl1[:y], ctrl2[:x], -ctrl2[:y], to[:x], -to[:y]]
+          0
+        end
+        err = FreeType::C::FT_Outline_Decompose(@outline, outline_funcs, nil)
+        if err != 0
+          raise FreeType::Error.find(err)
+        end
+        commands << [:Z] if commands.empty?.!
+        commands
+      end
     end
 
     Point = Struct.new(:tag, :x, :y) do

data/lib/freetype/api_test.rb

@@ -134,6 +134,10 @@ module FreeTypeApiTest
           t.error('Got values miss assigned from ffi')
         end
 
+        unless outline.svg_path_data.empty?.!
+          t.error('Could not get svg path data form outline')
+        end
+
         table[char] = outline.points.map(&:x)
       end
       if table.values.uniq.length != table.length

data/lib/freetype/c.rb

@@ -78,43 +78,43 @@ module FreeType
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-basic_types.html#FT_Bitmap
     class FT_Bitmap < ::FFI::Struct
-      layout rows: :uint,
-             width: :uint,
-             pitch: :int,
-             buffer: :pointer,
-             num_grays: :ushort,
-             pixel_mode: :char,
+      layout rows:         :uint,
+             width:        :uint,
+             pitch:        :int,
+             buffer:       :pointer,
+             num_grays:    :ushort,
+             pixel_mode:   :char,
              palette_mode: :char,
-             palette: :pointer
+             palette:      :pointer
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-basic_types.html#FT_Generic
     class FT_Generic < ::FFI::Struct
-      layout data: :pointer,
+      layout data:      :pointer,
              finalizer: :pointer
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Glyph_Metrics
     class FT_Glyph_Metrics < ::FFI::Struct
-      layout width: :FT_Pos,
-             height: :FT_Pos,
+      layout width:        :FT_Pos,
+             height:       :FT_Pos,
              horiBearingX: :FT_Pos,
              horiBearingY: :FT_Pos,
-             horiAdvance: :FT_Pos,
+             horiAdvance:  :FT_Pos,
              vertBearingX: :FT_Pos,
              vertBearingY: :FT_Pos,
-             vertAdvance: :FT_Pos
+             vertAdvance:  :FT_Pos
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-outline_processing.html#FT_Outline
     class FT_Outline < ::FFI::Struct
       layout n_contours: :short,
-             n_points: :short,
-             points: :pointer, # FT_Vector* (n_points)
-             tags: :pointer, # char * (n_points)
-             contours: :pointer, # short * (n_contours)
+             n_points:   :short,
+             points:     :pointer, # FT_Vector* (n_points)
+             tags:       :pointer, # char * (n_points)
+             contours:   :pointer, # short * (n_contours)
              # http://www.freetype.org/freetype2/docs/reference/ft2-outline_processing.html#FT_OUTLINE_XXX
-             flags: :int
+             flags:      :int
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-basic_types.html#FT_Vector
@@ -132,83 +132,92 @@ module FreeType
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_GlyphSlotRec
     class FT_GlyphSlotRec < ::FFI::Struct
-      layout library: :pointer,
-             face: :pointer,
-             next: :pointer,
-             reserved: :uint,
-             generic: FT_Generic,
-             metrics: FT_Glyph_Metrics,
+      layout library:           :pointer,
+             face:              :pointer,
+             next:              :pointer,
+             reserved:          :uint,
+             generic:           FT_Generic,
+             metrics:           FT_Glyph_Metrics,
              linearHoriAdvance: :FT_Fixed,
              linearVertAdvance: :FT_Fixed,
-             advance: FT_Vector,
-             format: FT_Glyph_Format,
-             bitmap: FT_Bitmap,
-             bitmap_left: :int,
-             bitmap_top: :int,
-             outline: FT_Outline,
-             num_subglyphs: :uint,
-             subglyphs: :pointer, # FT_SubGlyph
-             control_data: :pointer, # void *
-             control_len: :long,
-             lsb_delta: :FT_Pos,
-             rsb_delta: :FT_Pos,
-             other: :pointer, # void *
-             internal: :pointer #  FT_Slot_Internal
+             advance:           FT_Vector,
+             format:            FT_Glyph_Format,
+             bitmap:            FT_Bitmap,
+             bitmap_left:       :int,
+             bitmap_top:        :int,
+             outline:           FT_Outline,
+             num_subglyphs:     :uint,
+             subglyphs:         :pointer, # FT_SubGlyph
+             control_data:      :pointer, # void *
+             control_len:       :long,
+             lsb_delta:         :FT_Pos,
+             rsb_delta:         :FT_Pos,
+             other:             :pointer, # void *
+             internal:          :pointer #  FT_Slot_Internal
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Size_Metrics
     class FT_Size_Metrics < ::FFI::Struct
-      layout x_ppem: :ushort,
-             y_ppem: :ushort,
-             x_scale: :FT_Fixed,
-             y_scale: :FT_Fixed,
-             ascender: :FT_Pos,
-             descender: :FT_Pos,
-             height: :FT_Pos,
+      layout x_ppem:      :ushort,
+             y_ppem:      :ushort,
+             x_scale:     :FT_Fixed,
+             y_scale:     :FT_Fixed,
+             ascender:    :FT_Pos,
+             descender:   :FT_Pos,
+             height:      :FT_Pos,
              max_advance: :FT_Pos
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_SizeRec
     class FT_SizeRec < ::FFI::Struct
-      layout face: :pointer, # FT_Face
-             generic: FT_Generic,
-             metrics: FT_Size_Metrics,
+      layout face:     :pointer, # FT_Face
+             generic:  FT_Generic,
+             metrics:  FT_Size_Metrics,
              internal: :pointer # FT_Size_Internal
     end
 
     class FT_CharMapRec < ::FFI::Struct
-      layout face: :pointer,
-             encoding: FT_Encoding,
+      layout face:        :pointer,
+             encoding:    FT_Encoding,
              platform_id: :ushort,
              encoding_id: :ushort
     end
 
     # http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec
     class FT_FaceRec < ::FFI::Struct
-      layout num_faces: :long,
-             face_index: :long,
-             face_flags: :long,
-             style_flags: :long,
-             num_glyphs: :long,
-             family_name: :string,
-             style_name: :string,
-             num_fixed_sizes: :int,
-             available_sizes: :pointer, # FT_Bitmap_Size*
-             num_charmaps: :int,
-             charmaps: FT_CharMapRec.ptr,
-             generic: FT_Generic,
-             bbox: FT_BBox,
-             units_per_EM: :ushort,
-             ascender: :short,
-             descender: :short,
-             height: :short,
-             max_advance_width: :short,
-             max_advance_height: :short,
-             underline_position: :short,
+      layout num_faces:           :long,
+             face_index:          :long,
+             face_flags:          :long,
+             style_flags:         :long,
+             num_glyphs:          :long,
+             family_name:         :string,
+             style_name:          :string,
+             num_fixed_sizes:     :int,
+             available_sizes:     :pointer, # FT_Bitmap_Size*
+             num_charmaps:        :int,
+             charmaps:            FT_CharMapRec.ptr,
+             generic:             FT_Generic,
+             bbox:                FT_BBox,
+             units_per_EM:        :ushort,
+             ascender:            :short,
+             descender:           :short,
+             height:              :short,
+             max_advance_width:   :short,
+             max_advance_height:  :short,
+             underline_position:  :short,
              underline_thickness: :short,
-             glyph: FT_GlyphSlotRec.ptr,
-             size: FT_SizeRec.ptr,
-             charmap: :pointer
+             glyph:               FT_GlyphSlotRec.ptr,
+             size:                FT_SizeRec.ptr,
+             charmap:             :pointer
+    end
+
+    class FT_Outline_Funcs < ::FFI::Struct
+      layout move_to:  callback([FT_Vector.ptr, :pointer], :FT_Error), # FT_Outline_MoveToFunc
+             line_to:  callback([FT_Vector.ptr, :pointer], :FT_Error), # FT_Outline_LineToFunc
+             conic_to: callback([FT_Vector.ptr, FT_Vector.ptr, :pointer], :FT_Error), # FT_Outline_ConicToFunc
+             cubic_to: callback([FT_Vector.ptr, FT_Vector.ptr, FT_Vector.ptr, :pointer], :FT_Error), # FT_Outline_CubicToFunc
+             shift:    :int,
+             delta:    :FT_Pos
     end
 
     class << self
@@ -254,6 +263,8 @@ module FreeType
 
     attach_function :FT_GlyphSlot_Embolden, [FT_GlyphSlotRec.ptr], :void
     attach_function :FT_GlyphSlot_Oblique, [FT_GlyphSlotRec.ptr], :void
+
+    attach_function :FT_Outline_Decompose, [FT_Outline.ptr, FT_Outline_Funcs.ptr, :pointer], :FT_Error
     attach_function :FT_Outline_Embolden, [:pointer, :FT_Pos], :FT_Error
     attach_function :FT_Outline_Transform, [:pointer, FT_Matrix.ptr], :void
     attach_function :FT_Outline_Reverse, [:pointer], :void

data/lib/freetype/c_test.rb

@@ -114,6 +114,39 @@ module FFITest
     end
   end
 
+  def test_FT_Outline_Decompose(t)
+    libopen do |face|
+      t.error('err') if FT_Set_Char_Size(face, 0, 32, 300, 300) != 0
+      t.error('err') if FT_Load_Char(face, 'a'.ord, FreeType::C::FT_LOAD_DEFAULT) != 0
+
+      vectors = []
+      outline_funcs = FT_Outline_Funcs.new
+      outline_funcs[:move_to] = Proc.new { |to|
+        vectors << ['M', to[:x], to[:y]]
+        0
+      }
+      outline_funcs[:line_to] = Proc.new { |to|
+        vectors << ['L', to[:x], to[:y]]
+        0
+      }
+      outline_funcs[:conic_to] = Proc.new { |ctrl, to|
+        vectors << ['Q', ctrl[:x], ctrl[:y], to[:x], to[:y]]
+        0
+      }
+      outline_funcs[:cubic_to] = Proc.new { |ctrl1, ctrl2, to|
+        vectors << ['C', ctrl1[:x], ctrl1[:y], ctrl2[:x], ctrl2[:y], to[:x], to[:y]]
+        0
+      }
+      err = FT_Outline_Decompose(face[:glyph][:outline], outline_funcs, nil)
+      if err != 0
+        t.error FreeType::Error.find(err).message
+      end
+      if vectors.empty?
+        t.error "callbacks was not called"
+      end
+    end
+  end
+
   def test_FT_Outline_Embolden(t)
     libopen do |face|
       t.error('err') if FT_Set_Char_Size(face, 0, 32, 300, 300) != 0

data/lib/freetype/version.rb

@@ -1,3 +1,3 @@
 module FreeType
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freetype
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi