gd2-ffij 0.0.4 → 0.0.5

data/.gitignore

@@ -0,0 +1,15 @@
+*.kpf
+*.komodoproject
+*~
+.DS_Store
+*tmp*
+pkg/
+doc/
+*.orig
+*.patch
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock

data/COPYRIGHT

@@ -1,6 +1,7 @@
 
  Ruby/GD2 - Ruby binding for gd 2.x graphics library
- Copyright (C) 2005-2006 Robert Leslie, 2010 J Smith <dark.panda@gmail.com>
+ Copyright (C) 2005-2006 Robert Leslie
+ Copyright (C) 2010-2012 J Smith <dark.panda@gmail.com>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/{README → README.rdoc}

@@ -1,22 +1,14 @@
 
-Ruby/GD2 - Ruby binding for Thomas Boutell's gd 2.x graphics library
-Copyright (C) 2005-2006 Robert Leslie <rob@mars.org>
+= gd2-ffij - Ruby FFI Bindings for Thomas Boutell's gd 2.x Graphics Library
 
-FFI modifications copyright (C) 2010-2012 J Smith <dark.panda@gmail.com>
-
-Robert's Notes:
-
-I wrote this Ruby library because I wasn't satisfied with the existing
-Ruby/GD extension library. Among other things, it had no support for
-creating images from PNG or JPEG data already in memory.
+Original dl-based code copyright (C) 2005-2006 Robert Leslie <rob@mars.org>
 
-Ruby/GD2 is 100% Ruby and uses dl to link with the gd shared library. Most
-of the gd API is supported in some way, however the interface is quite
-different so that we can do things The Ruby Way as much as possible.
+FFI modifications copyright (C) 2010-2012 J Smith <dark.panda@gmail.com>
 
-Most of the documentation for this library is now in RDoc form.
+The gd2-ffij project page can be found at
+http://github.com/dark-panda/gd2-ffij .
 
-J's Notes:
+== Why FFI
 
 DL just doesn't want to work correctly on my x86_64 linux boxes and on
 OSX, so here's a refactoring using FFI.
@@ -25,10 +17,31 @@ These modifications were partly inspired by Patrick Stenmark's
 work, which can be found at http://github.com/spatrik/gd2-ffi/,
 although the goal of these modifications are a complete GD2 Ruby
 library using FFI. I've also included the beginning of a test suite,
-although coverage isn't quite complete yet..
+although coverage isn't quite complete yet.
 
 This GD2 library should "just work" as a replacement for Robert's
 original GD2 library, although without a complete test suite and
 the time and resources to do complete testing, it is difficult to
 know for sure. Reports on successful test runs are welcomed.
 
+== Robert's Original Notes
+
+"I wrote this Ruby library because I wasn't satisfied with the existing
+Ruby/GD extension library. Among other things, it had no support for
+creating images from PNG or JPEG data already in memory.
+
+Ruby/GD2 is 100% Ruby and uses dl to link with the gd shared library. Most
+of the gd API is supported in some way, however the interface is quite
+different so that we can do things The Ruby Way as much as possible.
+
+Most of the documentation for this library is now in RDoc form."
+
+== Contributing
+
+Patches, bug reports, pull requests, and all other good stuff can be performed
+via the project GitHub page at http://github.com/dark-panda/gd2-ffij .
+
+== License
+
+See the COPYRIGHT file for details, but the gist of it is that this gem is
+covered under the terms of the GPL version 2 or above.

data/Rakefile

@@ -1,9 +1,13 @@
 # -*- ruby -*-
 
 require 'rubygems'
+
+gem 'rdoc', '~> 3.12'
+
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'bundler/gem_tasks'
 
 if RUBY_VERSION >= '1.9'
   begin
@@ -15,35 +19,19 @@ end
 
 $:.push 'lib'
 
-version = File.read('VERSION') rescue ''
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = "gd2-ffij"
-    gem.summary     = "gd2-ffij is a refactoring of the Ruby/GD2 library implemented with FFI"
-    gem.description = gem.summary
-    gem.email       = "dark.panda@gmail.com"
-    gem.homepage    = "http://github.com/dark-panda/gd2-ffij"
-    gem.authors =    [ "J Smith" ]
-    gem.add_dependency "ffi", "~> 1.0.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+version = GD2::VERSION
 
 desc 'Test GD2 interface'
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_tests.rb']
   t.verbose = !!ENV['VERBOSE_TESTS']
+  t.warning = !!ENV['WARNINGS']
 end
 
 desc 'Build docs'
 Rake::RDocTask.new do |t|
-  require 'rdoc'
   t.title = "gd2-ffij #{version}"
-  t.main = 'README'
+  t.main = 'README.rdoc'
   t.rdoc_dir = 'doc'
-  t.rdoc_files.include('README', 'COPYING', 'COPYRIGHT', 'lib/**/*.rb')
+  t.rdoc_files.include('README.rdoc', 'COPYING', 'COPYRIGHT', 'lib/**/*.rb')
 end

data/gd2-ffij.gemspec

@@ -1,92 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+require File.expand_path('../lib/gd2/version', __FILE__)
+
 Gem::Specification.new do |s|
   s.name = "gd2-ffij"
-  s.version = "0.0.4"
+  s.version = GD2::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = "2012-01-03"
   s.description = "gd2-ffij is a refactoring of the Ruby/GD2 library implemented with FFI"
+  s.summary = s.description
   s.email = "dark.panda@gmail.com"
   s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "COPYING",
-    "COPYRIGHT",
-    "README",
-    "Rakefile",
-    "VERSION",
-    "gd2-ffij.gemspec",
-    "lib/gd2-ffij.rb",
-    "lib/gd2/canvas.rb",
-    "lib/gd2/color.rb",
-    "lib/gd2/ffi_struct.rb",
-    "lib/gd2/font.rb",
-    "lib/gd2/image.rb",
-    "lib/gd2/palette.rb",
-    "test/canvas_tests.rb",
-    "test/image_tests.rb",
-    "test/images/test.bmp",
-    "test/images/test.gd",
-    "test/images/test.gd2",
-    "test/images/test.gif",
-    "test/images/test.jpg",
-    "test/images/test.png",
-    "test/images/test.wbmp",
-    "test/images/test.xbm",
-    "test/images/test.xcf",
-    "test/images/test.xpm",
-    "test/images/test_arc.gd2",
-    "test/images/test_canvas_filled_polygon.gd2",
-    "test/images/test_canvas_filled_rectangle.gd2",
-    "test/images/test_canvas_line.gd2",
-    "test/images/test_canvas_move_to_and_line_to.gd2",
-    "test/images/test_canvas_polygon.gd2",
-    "test/images/test_canvas_rectangle.gd2",
-    "test/images/test_circle.gd2",
-    "test/images/test_color.gd2",
-    "test/images/test_color.png",
-    "test/images/test_color.xcf",
-    "test/images/test_color_indexed.gd2",
-    "test/images/test_color_sharpened.gd2",
-    "test/images/test_cropped.gd2",
-    "test/images/test_ellipse.gd2",
-    "test/images/test_fill.gd2",
-    "test/images/test_fill_to.gd2",
-    "test/images/test_filled_circle.gd2",
-    "test/images/test_filled_ellipse.gd2",
-    "test/images/test_filled_wedge.gd2",
-    "test/images/test_polar_transform.gd2",
-    "test/images/test_resampled.gd2",
-    "test/images/test_resized.gd2",
-    "test/images/test_rotated_180.gd2",
-    "test/images/test_text.gd2",
-    "test/images/test_text_circle.gd2",
-    "test/images/test_wedge.gd2",
-    "test/test_helper.rb",
-    "vendor/fonts/ttf/DejaVuSans.ttf",
-    "vendor/fonts/ttf/LICENSE"
+    "README.rdoc"
   ]
+  s.files = `git ls-files`.split($\)
+  s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.homepage = "http://github.com/dark-panda/gd2-ffij"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "gd2-ffij is a refactoring of the Ruby/GD2 library implemented with FFI"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, ["~> 1.0.0"])
-    else
-      s.add_dependency(%q<ffi>, ["~> 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<ffi>, ["~> 1.0.0"])
-  end
+  s.add_dependency("ffi", ["~> 1.0.0"])
+  s.add_dependency("rdoc")
+  s.add_dependency("rake", ["~> 0.9"])
 end
 

data/lib/gd2-ffij.rb

@@ -22,21 +22,20 @@
 
 require 'ffi'
 require 'rbconfig'
+require 'gd2/version'
 
 module GD2
-  VERSION = File.read(File.join(File.dirname(__FILE__), %w{ .. VERSION })).strip
-
   module GD2FFI
     def self.gd_library_name
-      return @gd_library_name if @gd_library_name
+      return @gd_library_name if defined?(@gd_library_name)
 
       @gd_library_name = if RbConfig::CONFIG['host_os'] == 'cygwin'
         'cyggd-2.dll'
       else
         paths = if ENV['GD2_LIBRARY_PATH']
-          ENV['GD2_LIBRARY_PATH']
+          [ ENV['GD2_LIBRARY_PATH'] ]
         else
-          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}' ]
+          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/x86_64-linux-gnu' ]
         end
 
         lib = if [

data/lib/gd2/canvas.rb

@@ -58,7 +58,7 @@ module GD2
       end
 
       def draw(image, mode)
-        GD2FFI.send(:gdImageLine, image.image_ptr,
+        ::GD2::GD2FFI.send(:gdImageLine, image.image_ptr,
           @p1.x.to_i, @p1.y.to_i, @p2.x.to_i, @p2.y.to_i, mode.to_i)
         nil
       end
@@ -70,7 +70,7 @@ module GD2
       end
 
       def draw(image, mode)
-        GD2FFI.send(draw_sym, image.image_ptr, @p1.x.to_i, @p1.y.to_i, @p2.x.to_i, @p2.y.to_i, mode.to_i)
+        ::GD2::GD2FFI.send(draw_sym, image.image_ptr, @p1.x.to_i, @p1.y.to_i, @p2.x.to_i, @p2.y.to_i, mode.to_i)
         nil
       end
 
@@ -91,7 +91,7 @@ module GD2
       end
 
       def draw(image, mode)
-        GD2FFI.send(draw_sym, image.image_ptr, @points.map { |point|
+        ::GD2::GD2FFI.send(draw_sym, image.image_ptr, @points.map { |point|
           point.coordinates.pack('i_i_')
         }.join(''), @points.length, mode.to_i)
         nil
@@ -122,7 +122,7 @@ module GD2
       end
 
       def draw(image, mode)
-        GD2FFI.send(:gdImageArc, image.image_ptr, @center.x.to_i, @center.y.to_i,
+        ::GD2::GD2FFI.send(:gdImageArc, image.image_ptr, @center.x.to_i, @center.y.to_i,
           @width.to_i, @height.to_i,
           @range.begin.to_degrees.round.to_i, @range.end.to_degrees.round.to_i, mode.to_i)
         nil
@@ -144,7 +144,7 @@ module GD2
       end
 
       def draw(image, mode)
-        GD2FFI.send(:gdImageFilledArc, image.image_ptr, @center.x.to_i, @center.y.to_i,
+        ::GD2::GD2FFI.send(:gdImageFilledArc, image.image_ptr, @center.x.to_i, @center.y.to_i,
           @width.to_i, @height.to_i,
           @range.begin.to_degrees.round.to_i, @range.end.to_degrees.round.to_i,
           mode.to_i, style.to_i)
@@ -168,7 +168,7 @@ module GD2
       end
 
       def draw(image, mode)
-        GD2FFI.send(:gdImageArc, image.image_ptr, @center.x.to_i, @center.y.to_i,
+        ::GD2::GD2FFI.send(:gdImageArc, image.image_ptr, @center.x.to_i, @center.y.to_i,
           @width.to_i, @height.to_i, 0, 360, mode.to_i)
         nil
       end
@@ -176,7 +176,7 @@ module GD2
 
     class FilledEllipse < Ellipse
       def draw(image, mode)
-        GD2FFI.send(:gdImageFilledEllipse, image.image_ptr, @center.x.to_i, @center.y.to_i,
+        ::GD2::GD2FFI.send(:gdImageFilledEllipse, image.image_ptr, @center.x.to_i, @center.y.to_i,
           @width.to_i, @height.to_i, mode.to_i)
       end
     end
@@ -240,12 +240,12 @@ module GD2
     end
 
     def thickness=(thickness)
-      GD2FFI.send(:gdImageSetThickness, @image.image_ptr, @thickness = thickness.to_i)
+      ::GD2::GD2FFI.send(:gdImageSetThickness, @image.image_ptr, @thickness = thickness.to_i)
     end
 
     def style=(ary)
       if @style = ary
-        GD2FFI.send(:gdImageSetStyle, @image.image_ptr,
+        ::GD2::GD2FFI.send(:gdImageSetStyle, @image.image_ptr,
           ary.map { |c|
             !c ? TRANSPARENT : true == c ? -1 : @image.color2pixel(c)
           }, ary.length)
@@ -254,13 +254,13 @@ module GD2
 
     def brush=(image)
       if @brush = image
-        GD2FFI.send(:gdImageSetBrush, @image.image_ptr, image.image_ptr)
+        ::GD2::GD2FFI.send(:gdImageSetBrush, @image.image_ptr, image.image_ptr)
       end
     end
 
     def tile=(image)
       if @tile = image
-        GD2FFI.send(:gdImageSetTile, @image.image_ptr, image.image_ptr)
+        ::GD2::GD2FFI.send(:gdImageSetTile, @image.image_ptr, image.image_ptr)
       end
     end
 
@@ -339,13 +339,13 @@ module GD2
     end
 
     def fill
-      GD2FFI.send(:gdImageFill, @image.image_ptr, @point.x.to_i, @point.y.to_i, fill_pixel.to_i)
+      ::GD2::GD2FFI.send(:gdImageFill, @image.image_ptr, @point.x.to_i, @point.y.to_i, fill_pixel.to_i)
       self
     end
 
     def fill_to(border)
       # An apparent bug in gd prevents us from using fill_pixel
-      GD2FFI.send(:gdImageFillToBorder, @image.image_ptr, @point.x.to_i, @point.y.to_i,
+      ::GD2::GD2FFI.send(:gdImageFillToBorder, @image.image_ptr, @point.x.to_i, @point.y.to_i,
         @image.color2pixel(border), pixel.to_i)
       self
     end
@@ -412,10 +412,10 @@ module GD2
         BRUSHED
       elsif anti_aliasing?
         if @dont_blend
-          GD2FFI.send(:gdImageSetAntiAliasedDontBlend, @image.image_ptr,
+          ::GD2::GD2FFI.send(:gdImageSetAntiAliasedDontBlend, @image.image_ptr,
             pixel.to_i, @dont_blend.to_i)
         else
-          GD2FFI.send(:gdImageSetAntiAliased, @image.image_ptr, pixel.to_i)
+          ::GD2::GD2FFI.send(:gdImageSetAntiAliased, @image.image_ptr, pixel.to_i)
         end
         ANTI_ALIASED
       else
@@ -424,7 +424,7 @@ module GD2
     end
 
     def fill_pixel
-      @tile ? TILED : pixel
+      defined?(@tile) ? TILED : pixel
     end
   end
 end

data/lib/gd2/color.rb

@@ -215,7 +215,7 @@ module GD2
     # Alpha blend this color with the given color. If this color is associated
     # with a palette entry, this also modifies the palette.
     def alpha_blend!(other)
-      self.rgba = GD2FFI.send(:gdAlphaBlend, rgba.to_i, other.rgba.to_i)
+      self.rgba = ::GD2::GD2FFI.send(:gdAlphaBlend, rgba.to_i, other.rgba.to_i)
       self
     end
     alias << alpha_blend!

data/lib/gd2/ffi_struct.rb

@@ -70,7 +70,7 @@ module GD2::FFIStruct
     )
 
     def self.release(ptr)
-      GD2FFI.gdImageDestroy(ptr)
+      ::GD2::GD2FFI.gdImageDestroy(ptr)
     end
   end
 end

data/lib/gd2/font.rb

@@ -50,14 +50,14 @@ module GD2
     private_class_method :new
 
     def self.font_ptr   #:nodoc:
-      GD2FFI.send(font_sym)
+      ::GD2::GD2FFI.send(font_sym)
     end
 
     def self.draw(image_ptr, x, y, angle, string, fg)   #:nodoc:
       raise ArgumentError, "Angle #{angle} not supported for #{self}" unless
         angle == 0.degrees || angle == 90.degrees
 
-      GD2FFI.send(angle > 0 ? :gdImageStringUp : :gdImageString, image_ptr,
+      ::GD2::GD2FFI.send(angle > 0 ? :gdImageStringUp : :gdImageString, image_ptr,
         font_ptr, x.to_i, y.to_i, string, fg.to_i)
       nil
     end
@@ -110,21 +110,16 @@ module GD2
     FTEX_FONTCONFIG           =  64
     FTEX_RETURNFONTPATHNAME   = 128
 
-    @@fontcount = 0
-    @@fontconfig = false
+    def self.register(font) #:nodoc:
+      Thread.current[:fontcount] ||= 0
+      Thread.current[:fontcount] += 1
 
-    def self.register(font)   #:nodoc:
-      Thread.exclusive do
-        count = @@fontcount
-        @@fontcount += 1
-
-        if count.zero?
-          raise FreeTypeError, 'FreeType library failed to initialize' unless
-            GD2FFI.send(:gdFontCacheSetup).zero?
-        end
-
-        ObjectSpace.define_finalizer(font, font_finalizer)
+      if Thread.current[:fontcount].zero?
+        raise FreeTypeError, 'FreeType library failed to initialize' unless
+          ::GD2::GD2FFI.send(:gdFontCacheSetup).zero?
       end
+
+      ObjectSpace.define_finalizer(font, font_finalizer)
     end
 
     def self.font_finalizer
@@ -132,16 +127,23 @@ module GD2
     end
 
     def self.unregister
-      Thread.exclusive do
-        @@fontcount -= 1
-        GD2FFI.send(:gdFontCacheShutdown) if @@fontcount.zero?
+      if Thread.current[:fontcount]
+        Thread.current[:fontcount] -= 1
+      else
+        Thread.current[:fontcount] = 0
       end
+
+      ::GD2::GD2FFI.send(:gdFontCacheShutdown) if Thread.current[:fontcount].zero?
     end
 
     private_class_method :font_finalizer, :unregister
 
-    def self.fontconfig   #:nodoc:
-      @@fontconfig
+    def self.fontconfig #:nodoc:
+      if Thread.current[:fontconfig].nil?
+        Thread.current[:fontconfig] = false
+      end
+
+      Thread.current[:fontconfig]
     end
 
     # Return a boolean indicating whether fontconfig support has been enabled.
@@ -154,9 +156,9 @@ module GD2
     # library must have been built with fontconfig support. Raises an error if
     # fontconfig support is unavailable.
     def self.fontconfig=(want)
-      avail = !GD2FFI.send(:gdFTUseFontConfig, want ? 1 : 0).zero?
+      avail = !::GD2::GD2FFI.send(:gdFTUseFontConfig, want ? 1 : 0).zero?
       raise FontconfigError, 'Fontconfig not available' if want && !avail
-      @@fontconfig = want
+      Thread.current[:fontconfig] = !!want
     end
 
     class << self
@@ -228,12 +230,12 @@ module GD2
 
       strex = strex(false, true)
       args = [ nil, nil, 0, @fontname, @ptsize, 0.0, 0, 0, '', strex ]
-      r = GD2FFI.send(:gdImageStringFTEx, *args)
+      r = ::GD2::GD2FFI.send(:gdImageStringFTEx, *args)
 
       raise FreeTypeError.new(r.read_string) unless r.null?
       @fontpath = strex[:fontpath].read_string
     ensure
-      GD2FFI.send(:gdFree, strex[:fontpath])
+      ::GD2::GD2FFI.send(:gdFree, strex[:fontpath])
     end
 
     def inspect   #:nodoc:
@@ -251,7 +253,7 @@ module GD2
       strex = strex(true)
       args = [ image_ptr, brect, fg, @fontname, @ptsize, angle.to_f, x.to_i, y.to_i, string.gsub('&', '&amp;'), strex ]
 
-      r = GD2FFI.send(:gdImageStringFTEx, *args)
+      r = ::GD2::GD2FFI.send(:gdImageStringFTEx, *args)
       raise FreeTypeError.new(r.read_string) unless r.null?
       brect = brect.read_array_of_int(8)
 
@@ -259,7 +261,7 @@ module GD2
         begin
           xshow = xshow.read_string.split(' ').map { |e| e.to_f }
         ensure
-          GD2FFI.send(:gdFree, strex[:xshow])
+          ::GD2::GD2FFI.send(:gdFree, strex[:xshow])
         end
       else
         xshow = []
@@ -285,7 +287,7 @@ module GD2
       image_ptr, cx, cy, radius, text_radius, fill_portion,
       top, bottom, fgcolor
     ) #:nodoc:
-      r = GD2FFI.send(
+      r = ::GD2::GD2FFI.send(
         :gdImageStringFTCircle, image_ptr, cx.to_i, cy.to_i,
         radius.to_f, text_radius.to_f, fill_portion.to_f, @fontname, @ptsize,
         top || '', bottom || '', fgcolor.to_i