devil 0.1.6-x86-mswin32-60 → 0.1.7-x86-mswin32-60

data/README

@@ -1,29 +1,52 @@
-Devil version 0.1.6
-
-* Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
-* Current maintainer: John Mair (banisterfiend) http://banisterfiend.wordpress.com
-
-Ruby bindings for the Developer's Image Library
-You need DevIL installed to build this extension
-
-For debian:
-* install the libdevil and libdevil-dev packages
-
-For windows:
-* download devil.dll and ilu.dll from here http://openil.sourceforge.net
-* and copy devil.dll and ilu.dll to c:\windows\system\
-
-For other systems:
-* install libdevil and lib-devil-dev using your package manager
-* OR download and install the libraries from http://openil.sourceforge.net
-
-If you wish to use the Gosu and TexPlay extensions, it is necessary to also have:
-* the Gosu gem (gem install gosu)
-* the TexPlay gem (gem install texplay)
-* ruby-opengl (gem install ruby-opengl)
-
-For now, there is support for just a subset of DevIL functions, but it is enough
-for 95% things you may want to do.
-
-For example uses, see test/ directory
-
+Ruby Devil version 0.1.7
+========================
+
+* Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
+* Current maintainer: John Mair (banisterfiend) [http://banisterfiend.wordpress.com]
+
+Ruby bindings for the Developer's Image Library
+You need DevIL installed to use this extension
+
+The Ruby Devil Project page is here: [http://github.com/banister/devil]
+
+
+Installation Instructions:
+==========================
+
+For debian:
+
+* install the libdevil and libdevil-dev packages
+
+For Gentoo:
+
+* emerge "media-libs/devil"
+
+For windows:
+
+* download devil.dll and ilu.dll from [http://github.com/banister/devil/downloads]
+* and copy these files to c:\windows\system\
+
+For macosx:
+
+* sudo port install libdevil
+
+For other systems:
+
+* install libdevil and lib-devil-dev using your package manager
+* OR download and install the libraries from [http://openil.sourceforge.net]
+
+After you've installed the DevIL libraries you install the gem by going:
+
+* gem install devil
+
+If you wish to use the Gosu and TexPlay extensions, it is necessary to also have:
+
+* the Gosu gem (gem install gosu)
+* the TexPlay gem (gem install texplay)
+* ruby-opengl (gem install ruby-opengl)
+
+For now, there is support for just a subset of DevIL functions, but it is enough
+for 95% things you may want to do.
+
+For example uses, see test/ directory
+(note: that many of the examples use the Gosu library...this is often just for visualization purposes. Alot of the functionality does not depend on Gosu being present)

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake/clean'
-
-if RUBY_PLATFORM !~ /win/
+if RUBY_PLATFORM !~ /win32/
     require 'rake/extensiontask'
 end
 
@@ -8,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-DEVIL_VERSION = "0.1.6"
+DEVIL_VERSION = "0.1.7"
 
 dlext = Config::CONFIG['DLEXT']
 
@@ -26,23 +25,23 @@ spec = Gem::Specification.new do |s|
     s.require_path = 'lib'
     s.homepage = "http://banisterfiend.wordpress.com"
 
-    if RUBY_PLATFORM =~ /win/
+    if RUBY_PLATFORM =~ /win32/
         s.platform = Gem::Platform::CURRENT
     else
         s.platform = Gem::Platform::RUBY
     end
 
-    if RUBY_PLATFORM !~ /win/
+    if RUBY_PLATFORM !~ /win32/
         s.extensions = FileList["ext/**/extconf.rb"]
     end
     
     s.has_rdoc = true
-    s.extra_rdoc_files = ["README", "lib/devil/gosu.rb"]
+    s.extra_rdoc_files = ["README"]
     s.rdoc_options << '--main' << 'README'
     s.files = ["Rakefile", "README", "LICENSE", "lib/devil.rb", "lib/devil/gosu.rb"] +
-        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb", "test/*.jpg", "test/*.png"].to_a
+        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb", "test/*.png", "test/*.jpg"].to_a
 
-    if RUBY_PLATFORM =~ /win/
+    if RUBY_PLATFORM =~ /win32/
         s.files += ["lib/1.8/devil.so", "lib/1.9/devil.so"]
     end
 
@@ -55,7 +54,7 @@ end
 
 task :compile => :clean
 
-if RUBY_PLATFORM !~ /win/
+if RUBY_PLATFORM !~ /win32/
     Rake::ExtensionTask.new('devil', spec)  do |ext|
         ext.config_script = 'extconf.rb' 
         ext.cross_compile = true                

data/ext/devil/extconf.rb

@@ -3,10 +3,14 @@ require 'mkmf'
 if RUBY_PLATFORM =~ /mingw/
     $CFLAGS += ' -I/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/include/'
     $LDFLAGS += ' -L/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/lib/'
+elsif RUBY_PLATFORM =~ /darwin/
+
+    # this only works if you install devil via macports
+    $CFLAGS += ' -I/opt/local/include/'
+    $LDFLAGS += ' -L/opt/local/lib/'
 end
 
-puts "platform is #{RUBY_PLATFORM}"
-if RUBY_PLATFORM =~ /win/ || RUBY_PLATFORM =~ /mingw/
+if RUBY_PLATFORM =~ /(win32|mingw)/
     exit unless have_library("DevIL");
 else
     exit unless have_library("IL");

data/lib/devil.rb

@@ -1,226 +1,235 @@
-require 'rbconfig'
-
-direc = File.dirname(__FILE__)
-dlext = Config::CONFIG['DLEXT']
-begin
-    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
-        require "#{direc}/1.9/devil.#{dlext}"
-    else
-        require "#{direc}/1.8/devil.#{dlext}"
-    end
-rescue LoadError => e
-    require "#{direc}/devil.#{dlext}"
-end
-
-# Provides a high level wrapper for the low-level DevIL Ruby bindings
-module Devil
-    VERSION = '0.1.6'
-    
-    class << self
-
-        # loads +file+ and returns a new image
-        # Optionally accepts a block and yields the newly created image to the block.
-        def load_image(file, &block)
-            name = IL.GenImages(1).first
-            IL.BindImage(name)
-            IL.LoadImage(file)
-
-            img = Image.new(name, file)
-            if block
-                block.call(img)
-            end
-            
-            img
-        end
-
-        # convert an image +blob+ with +width+ and +height+
-        # to a bona fide image
-        def from_blob(blob, width, height)
-            Image.new(IL.FromBlob(blob, width, height), nil)
-        end
-
-        # initializes Devil and sets defaults
-        # This method should never need to be called directly.
-        def init
-            # initialize DevIL
-            IL.Init
-
-            # default options
-            IL.Enable(IL::FILE_OVERWRITE)
-            ILU.ImageParameter(ILU::FILTER, ILU::BILINEAR) 
-        end
-
-        alias_method :with_image, :load_image
-        alias_method :load, :load_image
-    end
-
-    class Image
-        attr_reader :name, :file
-
-        def initialize(name, file)
-            @name = name
-            @file = file
-
-            ObjectSpace.define_finalizer( self, proc { IL.DeleteImages(1, [name]) } )
-        end
-        
-        # returns the width of the image
-        def width
-            set_binding
-            IL.GetInteger(IL::IMAGE_WIDTH)
-        end
-
-        # returns the height of the image
-        def height
-            set_binding
-            IL.GetInteger(IL::IMAGE_HEIGHT)
-        end
-
-        # saves the image to +file+. If no +file+ is provided default to the opened file.
-        def save(file = @file)
-            set_binding
-            IL.SaveImage(file)
-            self
-        end
-        
-        # resize the image to +width+ and +height+. Aspect ratios of the image do not have to be the same.
-        def resize(width, height)
-            set_binding
-            ILU.Scale(width, height, 1)
-            self
-        end
-
-        # Creates a proportional thumbnail of the image scaled so its longest
-        # edge is resized to +size+ 
-        def thumbnail(size)
-            # this thumbnail code from image_science.rb
-            
-            w, h = width, height
-            scale = size.to_f / (w > h ? w : h)
-            resize((w * scale).to_i, (h * scale).to_i)
-            self
-        end
-
-        # return a deep copy of the current image
-        def dup
-            set_binding
-            Image.new(IL.CloneCurImage, nil)
-        end
-
-        # crop the current image
-        # +xoff+ number of pixels to skip in x direction
-        # +yoff+ number of pixels to skip in y direction
-        # +width+ number of pixels to preserve in x direction
-        # +height+ number of pixels to preserve in y direction
-        def crop(xoff, yoff, width, height)
-            set_binding
-            ILU.Crop(xoff, yoff, width, height)
-            self
-        end
-
-        # performs a gaussian blur on the image. The blur is performed +iter+ times.
-        def blur(iter)
-            set_binding
-            ILU.BlurGaussian(iter)
-            self
-        end
-
-        # 'pixelize' the image using a pixel size of +pixel_size+
-        def pixelize(pixel_size)
-            set_binding
-            ILU.Pixelize(pixel_size)
-            self
-        end
-
-        # add random noise to the image. +factor+ is the tolerance to use.
-        # accepeted values range from 0.0 - 1.0
-        def noisify(factor)
-            set_binding
-            ILU.Noisify(factor)
-            self
-        end
-
-        # The sharpening +factor+ must be in the range of 0.0 - 2.5. A value of 1.0 for the sharpening
-        # factor will have no effect on the image. Values in the range 1.0 - 2.5 will sharpen the
-        # image, with 2.5 having the most pronounced sharpening effect. Values from 0.0 to 1.0 do
-        # a type of reverse sharpening, blurring the image. Values outside of the 0.0 - 2.5 range
-        # produce undefined results.
-        #        
-        # The number of +iter+ (iterations) to perform will usually be 1, but to achieve more sharpening,
-        # increase the number of iterations. 
-        def sharpen(factor, iter)
-            set_binding
-            ILU.Sharpen(factor, iter)
-            self
-        end
-
-        # applies gamma correction to an image using an exponential curve.
-        # +factor+ is gamma correction factor to use.
-        # A value of 1.0 leaves the image unmodified.
-        # Values in the range 0.0 - 1.0 darken the image
-        # Values above 1.0 brighten the image.
-        def gamma_correct(factor)
-            set_binding
-            ILU.GammaCorrect(factor)
-            self
-        end
-
-        # invert the color of every pixel in the image.
-        def negative
-            set_binding
-            ILU.Negative
-            self
-        end
-
-        # +factor+ describes desired contrast to use
-        # A value of 1.0 has no effect on the image.
-        # Values between 1.0 and 1.7 increase the amount of contrast (values above 1.7 have no effect)
-        # Valid range of +factor+ is 0.0 - 1.7
-        def contrast(factor)
-            set_binding
-            ILU.Contrast(factor)
-            self
-        end
-
-        # darkens the bright colours and lightens the dark
-        # colours, reducing the contrast in an image or 'equalizing' it.
-        def equalize
-            set_binding
-            ILU.Equalize
-            self
-        end
-
-        # returns the image data in the form of a ruby string
-        # The image data is formatted to RGBA / UNSIGNED BYTE
-        def to_blob
-            set_binding
-            IL.ToBlob
-        end
-
-        # flip the image about its x axis
-        def flip
-            set_binding
-            ILU.FlipImage
-            self
-        end
-
-        # rotate an image about its central point by +angle+ degrees
-        def rotate(angle)
-            set_binding
-            ILU.Rotate(angle)
-            self
-        end
-
-        alias_method :columns, :width
-        alias_method :rows, :height
-
-        private
-        
-        def set_binding
-            IL.BindImage(@name)
-        end
-
-    end
-end
-
-Devil.init
+require 'rbconfig'
+
+direc = File.dirname(__FILE__)
+dlext = Config::CONFIG['DLEXT']
+begin
+    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
+        require "#{direc}/1.9/devil.#{dlext}"
+    else
+        require "#{direc}/1.8/devil.#{dlext}"
+    end
+rescue LoadError => e
+    require "#{direc}/devil.#{dlext}"
+end
+
+# Provides a high level wrapper for the low-level DevIL Ruby bindings
+module Devil
+    VERSION = '0.1.7'
+    
+    class << self
+
+        # loads +file+ and returns a new image
+        # Optionally accepts a block and yields the newly created image to the block.
+        def load_image(file, &block)
+            name = IL.GenImages(1).first
+            IL.BindImage(name)
+            IL.LoadImage(file)
+
+            if (error_code = IL.GetError) != IL::NO_ERROR
+                raise RuntimeError, "an error occured while trying to "+
+                    "load the image #{file}. Error code: #{error_code}"
+            end
+
+            img = Image.new(name, file)
+            if block
+                block.call(img)
+            end
+            
+            img
+        end
+
+        alias_method :with_image, :load_image
+        alias_method :load, :load_image
+
+        # convert an image +blob+ with +width+ and +height+
+        # to a bona fide image
+        def from_blob(blob, width, height)
+            Image.new(IL.FromBlob(blob, width, height), nil)
+        end
+
+        # initializes Devil and sets defaults
+        # This method should never need to be called directly.
+        def init
+            # initialize DevIL
+            IL.Init
+
+            # default options
+            IL.Enable(IL::FILE_OVERWRITE)
+            ILU.ImageParameter(ILU::FILTER, ILU::BILINEAR) 
+        end
+
+    end
+
+    class Image
+        attr_reader :name, :file
+
+        def initialize(name, file)
+            @name = name
+            @file = file
+
+            ObjectSpace.define_finalizer( self, proc { IL.DeleteImages(1, [name]) } )
+        end
+        
+        # returns the width of the image
+        def width
+            set_binding
+            IL.GetInteger(IL::IMAGE_WIDTH)
+        end
+
+        alias_method :columns, :width
+
+        # returns the height of the image
+        def height
+            set_binding
+            IL.GetInteger(IL::IMAGE_HEIGHT)
+        end
+
+        alias_method :rows, :height
+
+        # saves the image to +file+. If no +file+ is provided default to the opened file.
+        def save(file = @file)
+            set_binding
+            IL.SaveImage(file)
+            self
+        end
+        
+        # resize the image to +width+ and +height+. Aspect ratios of the image do not have to be the same.
+        def resize(width, height)
+            set_binding
+            ILU.Scale(width, height, 1)
+            self
+        end
+
+        # Creates a proportional thumbnail of the image scaled so its longest
+        # edge is resized to +size+ 
+        def thumbnail(size)
+            # this thumbnail code from image_science.rb
+            
+            w, h = width, height
+            scale = size.to_f / (w > h ? w : h)
+            resize((w * scale).to_i, (h * scale).to_i)
+            self
+        end
+
+        # return a deep copy of the current image
+        def dup
+            set_binding
+            Image.new(IL.CloneCurImage, nil)
+        end
+
+        alias_method :clone, :dup
+
+        # crop the current image
+        # +xoff+ number of pixels to skip in x direction
+        # +yoff+ number of pixels to skip in y direction
+        # +width+ number of pixels to preserve in x direction
+        # +height+ number of pixels to preserve in y direction
+        def crop(xoff, yoff, width, height)
+            set_binding
+            ILU.Crop(xoff, yoff, width, height)
+            self
+        end
+
+        # performs a gaussian blur on the image. The blur is performed +iter+ times.
+        def blur(iter)
+            set_binding
+            ILU.BlurGaussian(iter)
+            self
+        end
+
+        # 'pixelize' the image using a pixel size of +pixel_size+
+        def pixelize(pixel_size)
+            set_binding
+            ILU.Pixelize(pixel_size)
+            self
+        end
+
+        # add random noise to the image. +factor+ is the tolerance to use.
+        # accepeted values range from 0.0 - 1.0
+        def noisify(factor)
+            set_binding
+            ILU.Noisify(factor)
+            self
+        end
+
+        # The sharpening +factor+ must be in the range of 0.0 - 2.5. A value of 1.0 for the sharpening
+        # factor will have no effect on the image. Values in the range 1.0 - 2.5 will sharpen the
+        # image, with 2.5 having the most pronounced sharpening effect. Values from 0.0 to 1.0 do
+        # a type of reverse sharpening, blurring the image. Values outside of the 0.0 - 2.5 range
+        # produce undefined results.
+        #        
+        # The number of +iter+ (iterations) to perform will usually be 1, but to achieve more sharpening,
+        # increase the number of iterations. 
+        def sharpen(factor, iter)
+            set_binding
+            ILU.Sharpen(factor, iter)
+            self
+        end
+
+        # applies gamma correction to an image using an exponential curve.
+        # +factor+ is gamma correction factor to use.
+        # A value of 1.0 leaves the image unmodified.
+        # Values in the range 0.0 - 1.0 darken the image
+        # Values above 1.0 brighten the image.
+        def gamma_correct(factor)
+            set_binding
+            ILU.GammaCorrect(factor)
+            self
+        end
+
+        # invert the color of every pixel in the image.
+        def negative
+            set_binding
+            ILU.Negative
+            self
+        end
+
+        # +factor+ describes desired contrast to use
+        # A value of 1.0 has no effect on the image.
+        # Values between 1.0 and 1.7 increase the amount of contrast (values above 1.7 have no effect)
+        # Valid range of +factor+ is 0.0 - 1.7
+        def contrast(factor)
+            set_binding
+            ILU.Contrast(factor)
+            self
+        end
+
+        # darkens the bright colours and lightens the dark
+        # colours, reducing the contrast in an image or 'equalizing' it.
+        def equalize
+            set_binding
+            ILU.Equalize
+            self
+        end
+
+        # returns the image data in the form of a ruby string
+        # The image data is formatted to RGBA / UNSIGNED BYTE
+        def to_blob
+            set_binding
+            IL.ToBlob
+        end
+
+        # flip the image about its x axis
+        def flip
+            set_binding
+            ILU.FlipImage
+            self
+        end
+
+        # rotate an image about its central point by +angle+ degrees
+        def rotate(angle)
+            set_binding
+            ILU.Rotate(angle)
+            self
+        end
+
+        private
+        
+        def set_binding
+            IL.BindImage(@name)
+        end
+
+    end
+end
+
+Devil.init

data/lib/devil/gosu.rb

@@ -1,19 +1,18 @@
 require 'texplay'
 require 'devil'
 
+# monkey patches for TexPlay module (and by proxy the Gosu::Image class)
 module TexPlay
 
     # save a Gosu::Image to +file+
     # This method is only available if require 'devil/gosu' is used
     def save(file)
         capture { 
-            save_image = Devil.from_blob(self.to_blob, self.width, self.height)
-            save_image.flip
-            save_image.save(file)
+            to_devil.save(file)
         }
     end
 
-    # convert a Gosu::Image to a Devil::Image
+    # convert a Gosu::Image to a Devil::Image.
     # This method is only available if require 'devil/gosu' is used
     def to_devil
         devil_img = nil
@@ -25,9 +24,10 @@ module TexPlay
     end
 end
 
+# monkey patches for Gosu::Window class
 class Gosu::Window
 
-    # return a screenshot of the framebuffer as a Devil::Image
+    # return a screenshot of the framebuffer as a Devil::Image.
     # This method is only available if require 'devil/gosu' is used
     def screenshot
         require 'opengl'
@@ -54,10 +54,27 @@ class Gosu::Window
     end
 end
 
+class Gosu::Image
+    class << self
+        alias_method :original_new_redux, :new
+        
+        # monkey patching to support multiple image formats.
+        # This method is only available if require 'devil/gosu' is used
+        def new(window, file, *args, &block)
+            if file.respond_to?(:to_blob) || file =~ /\.(bmp|png)$/
+                original_new_redux(window, file, *args, &block)
+            else 
+                original_new_redux(window, Devil.load(file), *args, &block)
+            end
+        end
+    end
+end
+
 class Devil::Image
 
     # convert a Devil::Image to a Gosu::Image.
     # Must provide a +window+ parameter, as per Gosu::Image#new()
+    # This method is only available if require 'devil/gosu' is used
     def to_gosu(window)
         Gosu::Image.new(window, self)
     end
@@ -92,5 +109,4 @@ class Devil::Image
         
         @@window.show_list.push :image => Gosu::Image.new(@@window, self), :x => x, :y => y
     end
-
 end

data/test/test_clone_and_crop.rb

@@ -5,7 +5,7 @@ $LOAD_PATH.push("#{direc}/../lib/")
 require 'rubygems'
 require "devil/gosu"
 
-img = Devil.load_image("#{direc}/texture.png") 
+img = Devil.load_image("#{direc}/texture.jpg") 
 
 img.crop(100,100, 200, 200)
 img_dup = img.dup

data/test/test_gosu_load.rb

@@ -3,16 +3,13 @@ $direc = File.dirname(__FILE__)
 $LOAD_PATH.push("#{$direc}/../lib/")
 
 require 'rubygems'
-require 'gosu'
-require 'devil'
+require 'devil/gosu'
 
 class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
 
-        img = Devil.load_image("#{$direc}/texture.jpg")
-
-        @img = Gosu::Image.new(self, img)
+        @img = Gosu::Image.new(self, "#{$direc}/texture.jpg")
     end
     
     def draw

data/test/test_new_api.rb

@@ -16,7 +16,7 @@ bink = Devil.load_image("#{direc}/texture.png")
 img.gamma_correct(1.6)
 bink.resize(50, 50)
 
-img.save("#{direc}/texture_blur.png")
+img.save("#{direc}/texture_gamma.png")
 bink.save("#{direc}/texture_tiny.png")
 
 

data/test/test_screenshot.rb

@@ -1,33 +1,33 @@
-$direc = File.dirname(__FILE__)
-
-$LOAD_PATH.push("#{$direc}/../lib/")
-
-require 'rubygems'
-require 'devil/gosu'
-
-class W < Gosu::Window
-    def initialize
-        super(1024, 768, false, 20)
-
-        @img = Gosu::Image.new(self, "tank.png")
-        @img2 = @img.dup
-        @img.circle 100, 100, 50, :color => :purple, :filled => true
-    end
-    
-    def draw
-        @img.draw 100, 50,1
-        @img.draw 300, 50, 1
-        @img2.draw 300, 400, 1
-    end
-
-    def update
-        if button_down?(Gosu::KbEscape)
-            screenshot.rotate(45).save("screenshot.png")
-            exit
-        end
-    end
-end
-
-w = W.new
-w.show
-        
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'devil/gosu'
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+
+        @img = Gosu::Image.new(self, "tank.png")
+        @img2 = @img.dup
+        @img.circle 100, 100, 50, :color => :purple, :filled => true
+    end
+    
+    def draw
+        @img.draw 100, 50,1
+        @img.draw 300, 50, 1
+        @img2.draw 300, 400, 1
+    end
+
+    def update
+        if button_down?(Gosu::KbEscape)
+            screenshot.rotate(45).save("screenshot.png")
+            exit
+        end
+    end
+end
+
+w = W.new
+w.show
+        

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devil
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: x86-mswin32-60
 authors: 
 - Jaroslaw Tworek, John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 +13:00
+date: 2009-10-16 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -21,7 +21,6 @@ extensions: []
 
 extra_rdoc_files: 
 - README
-- lib/devil/gosu.rb
 files: 
 - Rakefile
 - README
@@ -40,11 +39,9 @@ files:
 - test/test_new_api.rb
 - test/test_screenshot.rb
 - test/test_thumbnail.rb
-- test/texture.jpg
-- test/screenshot.png
-- test/tank-modified.png
 - test/tank.png
 - test/texture.png
+- test/texture.jpg
 - lib/1.8/devil.so
 - lib/1.9/devil.so
 has_rdoc: true