gd2 1.1 → 1.1.1

data/COPYRIGHT

@@ -1,6 +1,6 @@
 
  Ruby/GD2 - Ruby binding for gd 2.x graphics library
- Copyright (C) 2005 Robert Leslie
+ Copyright (C) 2005-2006 Robert Leslie
 
  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/README

@@ -1,6 +1,6 @@
 
 Ruby/GD2 - Ruby binding for Thomas Boutell's gd 2.x graphics library
-Copyright (C) 2005 Robert Leslie <rob@mars.org>
+Copyright (C) 2005-2006 Robert Leslie <rob@mars.org>
 
 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

data/lib/gd2.rb

@@ -1,7 +1,7 @@
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #
-# Copyright © 2005 Robert Leslie
+# Copyright © 2005-2006 Robert Leslie
 #
 # This file is part of Ruby/GD2.
 #
@@ -24,10 +24,38 @@ require 'dl'
 require 'rbconfig'
 
 module GD2
-  VERSION = '1.1'.freeze
+  VERSION = '1.1.1'.freeze
+
+  def self.gd_library_name
+    case Config::CONFIG['arch']
+    when /darwin/
+      'libgd.2.dylib'
+    when /mswin32/, /cygwin/
+      'bgd.dll'
+    else
+      'libgd.so.2'
+    end
+  end
+
+  def self.name_for_symbol(symbol, signature)
+    case Config::CONFIG['arch']
+    when /mswin32/, /cygwin/
+      sum = -4
+      signature.each_byte do |char|
+        sum += case char
+          when ?D: 8
+          else     4
+        end
+      end
+      "#{symbol}@#{sum}"
+    else
+      symbol.to_s
+    end
+  end
+
+  private_class_method :gd_library_name, :name_for_symbol
 
-  LIB = DL.dlopen(Config::CONFIG['arch'].include?('powerpc-darwin') ?
-    'libgd.2.dylib' : 'libgd.so.2')
+  LIB = DL.dlopen(gd_library_name)
   SYM = {
     :gdImageCreate                      => 'PII',
     :gdImageCreateTrueColor             => 'PII',
@@ -119,7 +147,7 @@ module GD2
     :gdFontCacheShutdown                => '0',
     :gdFTUseFontConfig                  => 'II',
     :gdFree                             => '0P'
-  }.inject({}) { |x, (k, v)| x[k] = LIB[k.to_s, v]; x }
+  }.inject({}) { |x, (k, v)| x[k] = LIB[name_for_symbol(k, v), v]; x }
 
   # Bit flags for Image#compare
 

data/lib/gd2/image.rb

@@ -1,7 +1,7 @@
 #
 # Ruby/GD2 -- Ruby binding for gd 2 graphics library
 #
-# Copyright © 2005 Robert Leslie
+# Copyright © 2005-2006 Robert Leslie
 #
 # This file is part of Ruby/GD2.
 #
@@ -172,7 +172,7 @@ module GD2
           options.empty?
         raise ArgumentError, 'Missing required option :width' if width.nil?
         raise ArgumentError, 'Missing required option :height' if height.nil?
-        ptr = File.open(filename) do |file|
+        ptr = File.open(filename, 'rb') do |file|
           SYM[:gdImageCreateFromGd2Part].call(file, x, y, width, height)[0]
         end
       else
@@ -190,7 +190,7 @@ module GD2
         }[format]
         raise UnrecognizedImageTypeError,
           'Format (or file extension) is not recognized' unless create_sym
-        ptr = File.open(filename) { |file| SYM[create_sym].call(file)[0] }
+        ptr = File.open(filename, 'rb') { |file| SYM[create_sym].call(file)[0] }
       end
       raise LibraryError unless ptr
 
@@ -302,7 +302,7 @@ module GD2
 
     # Return the pixel value at image location (+x+, +y+).
     def get_pixel(x, y)
-      SYM[:gdImageGetPixel].call(@image_ptr, x, y)[0]
+      SYM[:gdImageGetPixel].call(@image_ptr, x, y).at(0)
     end
     alias pixel get_pixel
 
@@ -480,7 +480,7 @@ module GD2
       raise ArgumentError, "Unrecognized options #{options.inspect}" unless
         options.empty?
 
-      File.open(filename, 'w') do |file|
+      File.open(filename, 'wb') do |file|
         args[args[0].nil? ? 0 : 1] = file
         SYM[write_sym].call(image_ptr, *args)
         file.pos

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gd2
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2006-03-03 00:00:00 -08:00
+  version: 1.1.1
+date: 2006-05-12 00:00:00 -07:00
 summary: Ruby interface to gd 2 library.
 require_paths: 
   - lib
@@ -40,7 +40,6 @@ files:
   - lib/gd2/image.rb
   - lib/gd2/palette.rb
 test_files: 
-  - test/dl.rb
   - test/image.rb
 rdoc_options: 
   - "--title"

data/test/dl.rb

@@ -1,11 +0,0 @@
-require 'test/unit'
-require 'dl'
-
-class DLTest < Test::Unit::TestCase
-  def test_dlopen
-    assert_nothing_raised {
-      DL.dlopen(Config::CONFIG['arch'].include?('powerpc-darwin') ?
-        'libgd.2.dylib' : 'libgd.so.2')
-    }
-  end
-end