gd2-ffij 0.0.5 → 0.0.6

data/gd2-ffij.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/dark-panda/gd2-ffij"
   s.require_paths = ["lib"]
 
-  s.add_dependency("ffi", ["~> 1.0.0"])
+  s.add_dependency("ffi", [">= 1.0.0"])
   s.add_dependency("rdoc")
   s.add_dependency("rake", ["~> 0.9"])
 end

data/lib/gd2-ffij.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #

data/lib/gd2/canvas.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #

data/lib/gd2/color.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #

data/lib/gd2/ffi_struct.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #

data/lib/gd2/font.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #

data/lib/gd2/image.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #
@@ -88,17 +89,17 @@ module GD2
     # automatically (JPEG, PNG, GIF, WBMP, or GD2). The resulting image will be
     # either of class Image::TrueColor or Image::IndexedColor.
     def self.load(src)
-      src = src.force_encoding("BINARY") if src.respond_to? :force_encoding
+      src = src.force_encoding("ASCII-8BIT") if src.respond_to? :force_encoding
       case src
       when File
         pos = src.pos
         magic = src.read(4)
         src.pos = pos
         data = src.read
-        data = data.force_encoding("BINARY") if data.respond_to? :force_encoding
+        data = data.force_encoding("ASCII-8BIT") if data.respond_to? :force_encoding
         args = [ data.length, data ]
       when String
-        magic = src
+        magic = src.slice(0, 4)
         args = [ src.length, src ]
       else
         raise TypeError, 'Unexpected argument type'
@@ -125,24 +126,17 @@ module GD2
       block_given? ? yield(image) : image
     end
 
-    def self.data_type(str)
-      ct = 0
-      mgc = ""
-      str.each_byte do |byte|
-        break if ct == 4
-        mgc << byte.to_s
-        ct += 1
-      end
-      case mgc
-      when "255216255224"
+    def self.data_type(magic)
+      case magic
+      when /^\xff\xd8/
         :jpeg
-      when "137807871"
+      when /^\x89PNG/
         :png
-      when "71737056"
+      when /^GIF8/
         :gif
-      when "001300"
+      when /^\x00/
         :wbmp
-      when "103100500"
+      when /^gd2/
         :gd2
       end
     end
@@ -200,7 +194,7 @@ module GD2
           'Format (or file extension) is not recognized' unless create_sym
 
         file = File.read(filename)
-        file = file.force_encoding("BINARY") if file.respond_to? :force_encoding
+        file = file.force_encoding("ASCII-8BIT") if file.respond_to? :force_encoding
         file_ptr = FFI::MemoryPointer.new(file.size, 1, false)
         file_ptr.put_bytes(0, file)
 
@@ -408,9 +402,7 @@ module GD2
     def with_clipping(x1, y1, x2, y2)   #:yields: image
       clip = clipping
       begin
-        p clipping
         ::GD2::GD2FFI.send(:gdImageSetClip, image_ptr, x1.to_i, y1.to_i, x2.to_i, y2.to_i)
-        p clipping
         yield self
         self
       ensure

data/lib/gd2/palette.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #

data/lib/gd2/version.rb

@@ -1,5 +1,6 @@
+# encoding: ASCII-8BIT
 
 module GD2
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/test/canvas_tests.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 
 require './test/test_helper'
 

data/test/image_tests.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 
 require './test/test_helper'
 

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 
 require 'test/unit'
 require 'tmpdir'

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gd2-ffij
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: !binary |-
+    MC4wLjY=
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +10,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -24,7 +25,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency